Merge 9713201c0b into 844f5b44c2

Directory.Packages.props

@@ -14,8 +14,8 @@
     <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
     <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25364.13" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="5.0.0-2.25364.13" />
     <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" />

ICSharpCode.Decompiler.Tests/Helpers/RoslynToolset.cs

@@ -41,6 +41,9 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
 		readonly SourceCacheContext cache;
 		readonly SourceRepository repository;
 		readonly FindPackageByIdResource resource;
+		readonly SourceRepository repository5;
+		readonly FindPackageByIdResource resource5;
+
 		protected readonly string baseDir;
 
 		public AbstractToolset(string baseDir)
@@ -48,6 +51,8 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
 			this.cache = new SourceCacheContext();
 			this.repository = Repository.Factory.GetCoreV3("https://api.nuget.org/v3/index.json");
 			this.resource = repository.GetResource<FindPackageByIdResource>();
+			this.repository5 = Repository.Factory.GetCoreV3("https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json");
+			this.resource5 = repository5.GetResource<FindPackageByIdResource>();
 			this.baseDir = baseDir;
 		}
 
@@ -68,13 +73,26 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
 			{
 				packageStream = new MemoryStream();
 
-				await resource.CopyNupkgToStreamAsync(
-					packageName,
-					NuGetVersion.Parse(version),
-					packageStream,
-					cache,
-					logger,
-					cancellationToken).ConfigureAwait(false);
+				if (version.StartsWith("5"))
+				{
+					await resource5.CopyNupkgToStreamAsync(
+						packageName,
+						NuGetVersion.Parse(version),
+						packageStream,
+						cache,
+						logger,
+						cancellationToken).ConfigureAwait(false);
+				}
+				else
+				{
+					await resource.CopyNupkgToStreamAsync(
+						packageName,
+						NuGetVersion.Parse(version),
+						packageStream,
+						cache,
+						logger,
+						cancellationToken).ConfigureAwait(false);
+				}
 
 				packageStream.Position = 0;
 			}

ILSpy.sln

@@ -42,6 +42,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
+		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
 Global

NuGet.config

@@ -19,6 +19,7 @@
     <packageSource key="dotnet-tools">
       <package pattern="Microsoft.DiaSymReader.Converter.Xml" />
       <package pattern="Microsoft.DiaSymReader.PortablePdb" />
+      <package pattern="Microsoft.CodeAnalysis.*" />
     </packageSource>
   </packageSourceMapping>
 </configuration>