Merge branch 'master' into feature/ReferenceAssemblyOverly

icsharpcode · Dec 29, 2023 · b58dd69 · b58dd69
2 parents e72b1f9 + 123da88
commit b58dd69
Show file tree

Hide file tree

Showing 126 changed files with 3,057 additions and 2,216 deletions.
diff --git a/.github/workflows/build-frontends.yml b/.github/workflows/build-frontends.yml
@@ -14,10 +14,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: '8.0.x'
+        dotnet-quality: 'ga'
 
     - name: Install dependencies
       run: dotnet restore ILSpy.XPlat.slnf

diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml
@@ -26,6 +26,11 @@ jobs:
         submodules: true
         fetch-depth: 0
 
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
+        dotnet-quality: 'ga'
+
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
 
@@ -48,9 +53,9 @@ jobs:
     - name: Execute unit tests
       run: dotnet test --logger "junit;LogFileName=${{ matrix.configuration }}.xml" --results-directory test-results $env:Tests1 $env:Tests2 $env:Tests3
       env:
-        Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\win-x64\ICSharpCode.Decompiler.Tests.dll
-        Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ILSpy.Tests.dll
-        Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\win-x64\ILSpy.BamlDecompiler.Tests.dll
+        Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net8.0-windows\win-x64\ICSharpCode.Decompiler.Tests.dll
+        Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net8.0-windows\ILSpy.Tests.dll
+        Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net8.0-windows\win-x64\ILSpy.BamlDecompiler.Tests.dll
 
     - name: Upload Test Logs
       uses: actions/upload-artifact@v3
@@ -76,19 +81,19 @@ jobs:
         git diff --exit-code
     
     - name: Zip ILSpy (framework-dependent)
-      run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.exe .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.config .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.json .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.resources.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.ReadyToRun.Plugin.resources.dll
+      run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.dll .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.exe .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.config .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.json .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*\ILSpy.resources.dll .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*\ILSpy.ReadyToRun.Plugin.resources.dll
 
     - name: Publish x64/arm64 framework-dependent/self-contained
       shell: pwsh
       run: .\publish.ps1
 
     - name: Zip ILSpy Release (x64 self-contained)
       if: matrix.configuration == 'release'    
-      run: 7z a -tzip $env:StagingDirectory\ILSpy_selfcontained_x64.zip .\ILSpy\bin\Release\net6.0-windows\win-x64\publish\selfcontained\*  
+      run: 7z a -tzip $env:StagingDirectory\ILSpy_selfcontained_x64.zip .\ILSpy\bin\Release\net8.0-windows\win-x64\publish\selfcontained\*  
 
     - name: Zip ILSpy Release (arm64 framework-dependent)
       if: matrix.configuration == 'release'    
-      run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries_arm64.zip .\ILSpy\bin\Release\net6.0-windows\win-arm64\publish\fwdependent\*
+      run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries_arm64.zip .\ILSpy\bin\Release\net8.0-windows\win-arm64\publish\fwdependent\*
 
     - name: Build Installer (x64 and arm64, framework-dependent)
       if: matrix.configuration == 'release'  

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,17 +23,17 @@ jobs:
         fetch-depth: 0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: '8.0.x'
+        dotnet-quality: 'ga'
 
     - name: Build
       run: dotnet build ILSpy.XPlat.slnf --configuration Release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4.0.1
+      - uses: dessant/lock-threads@v5.0.1
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '90'

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,46 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+	<PackageVersion Include="AvalonEdit" Version="6.3.0.90" />
+	<PackageVersion Include="CliWrap" Version="3.4.4" />
+	<PackageVersion Include="DataGridExtensions" Version="2.5.15" />
+	<PackageVersion Include="DiffLib" Version="2017.7.26.1241" />
+	<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
+	<PackageVersion Include="FluentAssertions" Version="6.12.0" />
+	<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="8.0.0-rc.2.23471.30" />
+	<PackageVersion Include="Iced" Version="1.18.0" />
+	<PackageVersion Include="JunitXml.TestLogger" Version="3.0.134" />
+	<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.6" />
+	<PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.0" />
+	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+	<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
+	<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" />
+	<PackageVersion Include="Microsoft.DiaSymReader" Version="1.4.0" />
+	<PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" />
+	<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+	<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+	<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="8.0.0" />
+	<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="8.0.0" />
+	<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+	<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.7.26" />
+	<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+	<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
+	<PackageVersion Include="NSubstitute" Version="5.0.0" />
+	<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.16" />
+	<PackageVersion Include="NUnit" Version="4.0.1" />
+	<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+	<PackageVersion Include="NuGet.Protocol" Version="6.8.0" />
+	<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
+	<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
+	<PackageVersion Include="System.Composition" Version="8.0.0" />
+	<PackageVersion Include="System.Memory" Version="4.5.5" />
+	<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
+	<PackageVersion Include="System.Resources.Extensions" Version="6.0.0" />
+	<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+	<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.10.0" />
+	<PackageVersion Include="coverlet.collector" Version="6.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj b/ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj
@@ -8,11 +8,9 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
-  <Import Project="..\packages.props" />
-
   <ItemGroup>
-    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
-    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
+    <PackageReference Include="PowerShellStandard.Library" />
+    <PackageReference Include="Mono.Cecil" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ICSharpCode.Decompiler.TestRunner/ICSharpCode.Decompiler.TestRunner.csproj b/ICSharpCode.Decompiler.TestRunner/ICSharpCode.Decompiler.TestRunner.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs
@@ -46,7 +46,7 @@ public void AllFilesHaveTests()
 				if (file.Extension == ".txt" || file.Extension == ".exe" || file.Extension == ".config")
 					continue;
 				var testName = Path.GetFileNameWithoutExtension(file.Name);
-				Assert.Contains(testName, testNames);
+				Assert.That(testNames, Has.Member(testName));
 			}
 		}
 
@@ -486,7 +486,7 @@ async Task RunIL(string testFileName, CompilerOptions options = CompilerOptions.
 			bool optionsForce32Bit = options.HasFlag(CompilerOptions.Force32Bit);
 			bool asmOptionsForce32Bit = asmOptions.HasFlag(AssemblerOptions.Force32Bit);
 
-			Assert.AreEqual(optionsForce32Bit, asmOptionsForce32Bit, "Inconsistent architecture.");
+			Assert.That(asmOptionsForce32Bit, Is.EqualTo(optionsForce32Bit), "Inconsistent architecture.");
 
 			try
 			{

diff --git a/ICSharpCode.Decompiler.Tests/DataFlowTest.cs b/ICSharpCode.Decompiler.Tests/DataFlowTest.cs
@@ -45,11 +45,11 @@ public RDTest(ILFunction f, ILVariable v) : base(f, _ => true, CancellationToken
 
 			protected internal override void VisitTryFinally(TryFinally inst)
 			{
-				Assert.IsTrue(IsPotentiallyUninitialized(state, v));
+				Assert.That(IsPotentiallyUninitialized(state, v));
 				base.VisitTryFinally(inst);
-				Assert.IsTrue(state.IsReachable);
-				Assert.AreEqual(1, GetStores(state, v).Count());
-				Assert.IsFalse(IsPotentiallyUninitialized(state, v));
+				Assert.That(state.IsReachable);
+				Assert.That(GetStores(state, v).Count(), Is.EqualTo(1));
+				Assert.That(!IsPotentiallyUninitialized(state, v));
 			}
 		}
 

diff --git a/ICSharpCode.Decompiler.Tests/DisassemblerPrettyTestRunner.cs b/ICSharpCode.Decompiler.Tests/DisassemblerPrettyTestRunner.cs
@@ -47,7 +47,7 @@ public void AllFilesHaveTests()
 				if (file.Extension.Equals(".il", StringComparison.OrdinalIgnoreCase))
 				{
 					var testName = file.Name.Split('.')[0];
-					Assert.Contains(testName, testNames);
+					Assert.That(testNames, Has.Member(testName));
 				}
 			}
 		}

diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.VB.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.VB.cs
@@ -133,7 +133,7 @@ public static async Task<CompilerResults> CompileVB(string sourceFileName, Compi
 				{
 					Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 				}
-				Assert.AreEqual(0, result.ExitCode, "vbc failed");
+				Assert.That(result.ExitCode, Is.EqualTo(0), "vbc failed");
 
 				return results;
 			}

diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
@@ -105,12 +105,19 @@ static Tester()
 			TesterPath = Path.GetDirectoryName(typeof(Tester).Assembly.Location);
 			TestCasePath = Path.Combine(TesterPath, "../../../../TestCases");
 #if DEBUG
-			testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Debug/net7.0");
+			testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Debug/net8.0");
 #else
-			testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Release/net7.0");
+			testRunnerBasePath = Path.Combine(TesterPath, "../../../../../ICSharpCode.Decompiler.TestRunner/bin/Release/net8.0");
 #endif
-			packagesPropsFile = Path.Combine(TesterPath, "../../../../../packages.props");
-			roslynLatestVersion = XDocument.Load(packagesPropsFile).XPathSelectElement("//RoslynVersion").Value;
+			// To parse: <Project><ItemGroup><PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.final" />
+			packagesPropsFile = Path.Combine(TesterPath, "../../../../../Directory.Packages.props");
+			roslynLatestVersion = ((IEnumerable<object>)(XDocument
+				.Load(packagesPropsFile)
+				.XPathEvaluate("//Project//ItemGroup//PackageVersion[@Include='Microsoft.CodeAnalysis.CSharp']/@Version")))
+				.OfType<XAttribute>()
+				.Single()
+				.Value;
+
 			roslynToolset = new RoslynToolset();
 			vswhereToolset = new VsWhereToolset();
 		}
@@ -191,7 +198,7 @@ public static async Task<string> AssembleIL(string sourceFileName, AssemblerOpti
 			{
 				Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 			}
-			Assert.AreEqual(0, result.ExitCode, "ilasm failed");
+			Assert.That(result.ExitCode, Is.EqualTo(0), "ilasm failed");
 
 			return outputFile;
 		}
@@ -244,7 +251,7 @@ public static async Task<string> Disassemble(string sourceFileName, string outpu
 			{
 				Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 			}
-			Assert.AreEqual(0, result.ExitCode, "ildasm failed");
+			Assert.That(result.ExitCode, Is.EqualTo(0), "ildasm failed");
 
 			// Unlike the .imagebase directive (which is a fixed value when compiling with /deterministic),
 			// the image base comment still varies... ildasm putting a random number here?
@@ -270,8 +277,8 @@ private static string ReplacePrivImplDetails(string il)
 		}
 
 		static readonly string coreRefAsmPath = new DotNetCorePathFinder(TargetFrameworkIdentifier.NET,
-			new Version(7, 0), "Microsoft.NETCore.App")
-				.GetReferenceAssemblyPath(".NETCoreApp,Version=v7.0");
+			new Version(8, 0), "Microsoft.NETCore.App")
+				.GetReferenceAssemblyPath(".NETCoreApp,Version=v8.0");
 
 		public static readonly string RefAsmPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86),
 			@"Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2");
@@ -309,7 +316,7 @@ private static string ReplacePrivImplDetails(string il)
 
 		const string targetFrameworkAttributeSnippet = @"
 
-[assembly: System.Runtime.Versioning.TargetFramework("".NETCoreApp,Version=v7.0"", FrameworkDisplayName = """")]
+[assembly: System.Runtime.Versioning.TargetFramework("".NETCoreApp,Version=v8.0"", FrameworkDisplayName = """")]
 
 ";
 
@@ -345,6 +352,7 @@ public static List<string> GetPreprocessorSymbols(CompilerOptions flags)
 					preprocessorSymbols.Add("NETCORE");
 					preprocessorSymbols.Add("NET60");
 					preprocessorSymbols.Add("NET70");
+					preprocessorSymbols.Add("NET80");
 				}
 				preprocessorSymbols.Add("ROSLYN");
 				preprocessorSymbols.Add("CS60");
@@ -374,6 +382,7 @@ public static List<string> GetPreprocessorSymbols(CompilerOptions flags)
 					preprocessorSymbols.Add("ROSLYN4");
 					preprocessorSymbols.Add("CS100");
 					preprocessorSymbols.Add("CS110");
+					preprocessorSymbols.Add("CS120");
 				}
 			}
 			else if ((flags & CompilerOptions.UseMcsMask) != 0)
@@ -511,7 +520,7 @@ public static async Task<CompilerResults> CompileCSharp(string sourceFileName, C
 					Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 				}
 
-				Assert.AreEqual(0, result.ExitCode, "csc failed");
+				Assert.That(result.ExitCode, Is.EqualTo(0), "csc failed");
 
 				return results;
 			}
@@ -573,7 +582,7 @@ public static async Task<CompilerResults> CompileCSharp(string sourceFileName, C
 				{
 					Console.WriteLine("errors:" + Environment.NewLine + result.StandardError);
 				}
-				Assert.AreEqual(0, result.ExitCode, "mcs failed");
+				Assert.That(result.ExitCode, Is.EqualTo(0), "mcs failed");
 
 				return results;
 			}
@@ -755,8 +764,8 @@ public static async Task RunAndCompareOutput(string testFileName, string outputF
 				(result2, output2, error2) = await Run(decompiledOutputFile).ConfigureAwait(false);
 			}
 
-			Assert.AreEqual(0, result1, "Exit code != 0; did the test case crash?" + Environment.NewLine + error1);
-			Assert.AreEqual(0, result2, "Exit code != 0; did the decompiled code crash?" + Environment.NewLine + error2);
+			Assert.That(result1, Is.EqualTo(0), "Exit code != 0; did the test case crash?" + Environment.NewLine + error1);
+			Assert.That(result2, Is.EqualTo(0), "Exit code != 0; did the decompiled code crash?" + Environment.NewLine + error2);
 
 			if (output1 != output2 || error1 != error2)
 			{
@@ -842,7 +851,7 @@ public static async Task SignAssembly(string assemblyPath, string keyFilePath)
 				.WithValidation(CommandResultValidation.None);
 
 			var result = await command.ExecuteBufferedAsync().ConfigureAwait(false);
-			Assert.AreEqual(0, result.ExitCode, "sn failed");
+			Assert.That(result.ExitCode, Is.EqualTo(0), "sn failed");
 
 			if (!string.IsNullOrWhiteSpace(result.StandardOutput))
 			{

diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <IsPackable>false</IsPackable>
     <StartupObject>AutoGeneratedProgram</StartupObject>
@@ -17,7 +17,6 @@
     <EnableDefaultItems>false</EnableDefaultItems>
 
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
-    <EnableUnsafeBinaryFormatterSerialization>True</EnableUnsafeBinaryFormatterSerialization>
 
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
@@ -41,28 +40,28 @@
     <DefineConstants>TRACE;ROSLYN;NET60;CS60;CS70;CS71;CS72;CS73;CS80;CS90;CS100</DefineConstants>
   </PropertyGroup>
 
-  <Import Project="..\packages.props" />
-
   <ItemGroup>
-    <PackageReference Include="DiffLib" Version="$(DiffLibVersion)" />
-    <PackageReference Include="CliWrap" Version="3.4.4" />
-    <PackageReference Include="NuGet.Protocol" Version="6.2.4" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynVersion)" />
-    <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="$(DSRConverterXmlVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitAdapterVersion)" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
-    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <!-- used for xml test result files -->
-    <PackageReference Include="JunitXml.TestLogger" Version="$(JUnitXmlTestLoggerVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
-    <PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(ILAsmVersion)" />
-    <PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(ILDAsmVersion)" />
-    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
+    <PackageReference Include="DiffLib" />
+    <PackageReference Include="CliWrap" />
+    <PackageReference Include="NuGet.Protocol" />
+    <PackageReference Include="System.Collections.Immutable" />
+    <PackageReference Include="System.Reflection.Metadata" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" />
+    <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" />
+	<PackageReference Include="Microsoft.DiaSymReader" />
+	<PackageReference Include="Microsoft.DiaSymReader.Native" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="JunitXml.TestLogger" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="System.Memory" />
+    <PackageReference Include="Mono.Cecil" />
+    <PackageReference Include="Microsoft.NETCore.ILAsm" />
+    <PackageReference Include="Microsoft.NETCore.ILDAsm" />
+    <PackageReference Include="System.Resources.Extensions" />
   </ItemGroup>
 
   <ItemGroup>