Merge pull request #2187 from JoeRobich/update-build-tools6

Update included Build Tools to match .NET SDK 6 Preview 6
OmniSharp · Jul 10, 2021 · f99caff · f99caff
2 parents 9b9d66a + b945b6a
commit f99caff
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/build/Packages.props b/build/Packages.props
@@ -7,7 +7,7 @@
         <MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
         <NuGetPackageVersion>5.2.0</NuGetPackageVersion>
-        <RoslynPackageVersion>4.0.0-2.21322.50</RoslynPackageVersion>
+        <RoslynPackageVersion>4.0.0-2.21358.2</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
     </PropertyGroup>
 

diff --git a/tests/OmniSharp.Script.Tests/ScriptProjectProviderTests.cs b/tests/OmniSharp.Script.Tests/ScriptProjectProviderTests.cs
@@ -17,7 +17,7 @@ public void DefaultLanguageVersionShouldBeLatest()
             var scriptProjectProvider = new ScriptProjectProvider(new ScriptOptions(), new OmniSharpEnvironment(), new LoggerFactory(), true, false);
             var scriptProjectInfo = scriptProjectProvider.CreateProject("test.csx", Enumerable.Empty<MetadataReference>(), Path.GetTempPath(), typeof(CommandLineScriptGlobals));
             Assert.Equal(LanguageVersion.Latest, ((CSharpParseOptions)scriptProjectInfo.ParseOptions).SpecifiedLanguageVersion);
-            Assert.Equal(LanguageVersion.CSharp9, ((CSharpParseOptions)scriptProjectInfo.ParseOptions).LanguageVersion);
+            Assert.Equal(LanguageVersion.CSharp10, ((CSharpParseOptions)scriptProjectInfo.ParseOptions).LanguageVersion);
         }
     }
 }
diff --git a/tools/packages.config b/tools/packages.config
@@ -9,43 +9,43 @@
     <!--
         The version for these packages can be found in the dotnet/installer eng/Versions.props file in
         the branch that corresponds with the SDK Toolset being modeled.
-        ex. https://github.com/dotnet/installer/blob/release/6.0.1xx-preview3/eng/Versions.props
+        ex. https://github.com/dotnet/installer/blob/release/6.0.1xx-preview6/eng/Versions.props
     -->
 
     <!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
-    <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" />
+    <package id="Microsoft.NET.Sdk" version="6.0.100-preview.6.21358.20" />
+    <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.6.21358.20" />
 
     <!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
-    <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" />
+    <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.6.21352.12" />
+    <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.6.21352.12" />
+    <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.6.21352.12" />
+    <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.6.21352.12" />
+    <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.6.21352.12" />
 
     <!--
         The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
         the branch that corresponds with the "Microsoft.NET.Sdk package" being referenced.
-        ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx-preview3/eng/Versions.props
+        ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx-preview6/eng/Versions.props
     -->
 
     <!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
-    <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" />
+    <package id="Microsoft.Build" version="17.0.0-preview-21359-01" />
+    <package id="Microsoft.Build.Framework" version="17.0.0-preview-21359-01" />
+    <package id="Microsoft.Build.Runtime" version="17.0.0-preview-21359-01" />
+    <package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21359-01" />
+    <package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21359-01" />
     <!-- 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-21307-02" />
+    <package id="Microsoft.NET.StringTools" version="1.0.0-preview-21359-01" />
 
     <!-- This package should match the "MicrosoftNetCompilersToolsetPackageVersion" property-->
-    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-1.21304.5" />
+    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-2.21358.2" />
 
     <!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
-    <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" />
+    <package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-preview.2.129" />
+    <package id="NuGet.Build.Tasks" version="6.0.0-preview.2.129" />
+    <package id="NuGet.Commands" version="6.0.0-preview.2.129" />
+    <package id="NuGet.Credentials" version="6.0.0-preview.2.129" />
 
     <!-- This package should match the "NewtonsoftJsonPackageVersion" property-->
     <package id="Newtonsoft.Json" version="12.0.3" />
@@ -56,7 +56,7 @@
     <!--
         The version for these packages can be found in the Roslyn release branch that corresponds with the
         "Microsoft.NET.Compilers.Toolset" being referenced.
-        ex. https://github.com/dotnet/roslyn/blob/release/dev16.10-vs-deps/eng/Versions.props
+        ex. https://github.com/dotnet/roslyn/blob/release/dev17.0-vs-deps/eng/Versions.props
     -->
 
     <!-- This package should match the "SystemThreadingTasksDataflowVersion" property-->