Merge pull request #2175 from JoeRobich/update-build-tools3

Update build tools to match NET 6 Preview 5
OmniSharp · Jun 18, 2021 · 580b2b6 · 580b2b6
2 parents da1e65b + 913eaff
commit 580b2b6
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 50 deletions.
diff --git a/build/Packages.props b/build/Packages.props
@@ -2,11 +2,12 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-        <AspNetCorePackageVersion>2.1.1</AspNetCorePackageVersion>
-        <MicrosoftExtensionPackageVersion>3.1.12</MicrosoftExtensionPackageVersion>
-        <MSBuildPackageVersion>16.9.0</MSBuildPackageVersion>
+        <AspNetCorePackageVersion>2.2.0</AspNetCorePackageVersion>
+        <MicrosoftExtensionPackageVersion>5.0.0</MicrosoftExtensionPackageVersion>
+        <MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
+        <MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
         <NuGetPackageVersion>5.2.0</NuGetPackageVersion>
-        <RoslynPackageVersion>3.11.0-1.21262.10</RoslynPackageVersion>
+        <RoslynPackageVersion>4.0.0-2.21314.7</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
     </PropertyGroup>
 
@@ -15,7 +16,7 @@
 
         <PackageReference Update="Dotnet.Script.DependencyModel" Version="1.1.0" />
         <PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="1.1.0" />
-        <PackageReference Update="ICSharpCode.Decompiler" Version="7.0.0.6488" />
+        <PackageReference Update="ICSharpCode.Decompiler" Version="7.1.0.6543" />
 
         <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.2.4" />
 
@@ -45,7 +46,7 @@
         <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionPackageVersion)" />
-        <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
+        <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageReference Update="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionPackageVersion)" />
         <PackageReference Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionPackageVersion)" />
@@ -54,8 +55,10 @@
         <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionPackageVersion)" />
 
         <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-        <PackageReference Update="Microsoft.TestPlatform.TranslationLayer" Version="16.6.1" />
+
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestPackageVersion)" />
+        <PackageReference Update="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftTestPackageVersion)" />
+
         <PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.14.114" />
         <PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />
 

diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs
@@ -4,7 +4,7 @@ internal static class Configuration
     {
         public static bool ZeroBasedIndices = false;
 
-        public const string RoslynVersion = "3.11.0.0";
+        public const string RoslynVersion = "4.0.0.0";
         public const string RoslynPublicKeyToken = "31bf3856ad364e35";
 
         public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

diff --git a/src/OmniSharp.Http.Driver/app.config b/src/OmniSharp.Http.Driver/app.config
@@ -7,23 +7,23 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

diff --git a/src/OmniSharp.LanguageServerProtocol/app.config b/src/OmniSharp.LanguageServerProtocol/app.config
@@ -7,23 +7,23 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

diff --git a/src/OmniSharp.Stdio.Driver/app.config b/src/OmniSharp.Stdio.Driver/app.config
@@ -7,23 +7,23 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/AbstractGoToDefinitionFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/AbstractGoToDefinitionFacts.cs
@@ -160,13 +160,13 @@ public static void main()
         public async Task ReturnsPartialMethodDefinitionWithBody(string filename)
         {
             var testFile = new TestFile(filename, @"
-    public partial class MyClass 
+    public partial class MyClass
     {
         public MyClass()
         {
             Met$$hod();
         }
-        
+
         partial void {|def:Method|}()
         {
             //do stuff
@@ -468,7 +468,7 @@ public void Baz() {
             // second comment should indicate we have decompiled
             var comments = compilationUnit.DescendantTrivia().Where(t => t.Kind() == SyntaxKind.SingleLineCommentTrivia).ToArray();
             Assert.NotNull(comments);
-            Assert.Equal("// Decompiled with ICSharpCode.Decompiler 7.0.0.6488", comments[1].ToString());
+            Assert.Equal("// Decompiled with ICSharpCode.Decompiler 7.1.0.6543", comments[1].ToString());
 
             // contrary to regular metadata, we should have methods with full bodies
             // this condition would fail if decompilation wouldn't work

diff --git a/tests/app.config b/tests/app.config
@@ -7,23 +7,23 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

diff --git a/tools/packages.config b/tools/packages.config
@@ -13,15 +13,15 @@
     -->
 
     <!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
-    <package id="Microsoft.NET.Sdk" version="6.0.100-preview.4.21262.19" />
-    <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.4.21262.19" />
+    <package id="Microsoft.NET.Sdk" version="6.0.100-preview.5.21308.18" />
+    <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.5.21308.18" />
 
     <!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
-    <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
-    <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
-    <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
-    <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
-    <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
+    <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
+    <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
+    <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
+    <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
+    <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
 
     <!--
         The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
@@ -30,22 +30,22 @@
     -->
 
     <!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
-    <package id="Microsoft.Build" version="16.11.0-preview-21254-21" />
-    <package id="Microsoft.Build.Framework" version="16.11.0-preview-21254-21" />
-    <package id="Microsoft.Build.Runtime" version="16.11.0-preview-21254-21" />
-    <package id="Microsoft.Build.Tasks.Core" version="16.11.0-preview-21254-21" />
-    <package id="Microsoft.Build.Utilities.Core" version="16.11.0-preview-21254-21" />
+    <package id="Microsoft.Build" version="17.0.0-preview-21307-02" />
+    <package id="Microsoft.Build.Framework" version="17.0.0-preview-21307-02" />
+    <package id="Microsoft.Build.Runtime" version="17.0.0-preview-21307-02" />
+    <package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21307-02" />
+    <package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21307-02" />
     <!-- This package should match as well except the Major & Minor version are set to 1.0 -->
-    <package id="Microsoft.NET.StringTools" version="1.0.0-preview-21254-21" />
+    <package id="Microsoft.NET.StringTools" version="1.0.0-preview-21307-02" />
 
     <!-- This package should match the "MicrosoftNetCompilersToolsetPackageVersion" property-->
-    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-2.21254.26" />
+    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-1.21304.5" />
 
     <!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
-    <package id="Microsoft.Build.NuGetSdkResolver" version="5.10.0-rc.7240" />
-    <package id="NuGet.Build.Tasks" version="5.10.0-rc.7240" />
-    <package id="NuGet.Commands" version="5.10.0-rc.7240" />
-    <package id="NuGet.Credentials" version="5.10.0-rc.7240" />
+    <package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-preview.1.66" />
+    <package id="NuGet.Build.Tasks" version="6.0.0-preview.1.66" />
+    <package id="NuGet.Commands" version="6.0.0-preview.1.66" />
+    <package id="NuGet.Credentials" version="6.0.0-preview.1.66" />
 
     <!-- This package should match the "NewtonsoftJsonPackageVersion" property-->
     <package id="Newtonsoft.Json" version="12.0.3" />