Merge pull request #2458 from bjorkstromm/feature/update-net-sdk

Update .NET SDK and Roslyn
OmniSharp · Oct 14, 2022 · 3aed3b0 · 3aed3b0
2 parents d598ebe + 547015b
commit 3aed3b0
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 
 name: 'Build'
 env:
-  DotNetVersion: "7.0.100-preview.7.22377.5"
+  DotNetVersion: "7.0.100-rc.1.22431.12"
   DotNetVersion2: "3.1.422"
   NuGetVersion: "5.7.0"
   MonoVersion: "6.12.0"

diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
@@ -1,7 +1,7 @@
 
 name: 'Tests net6.0'
 env:
-  DotNetVersion: "7.0.100-preview.7.22377.5"
+  DotNetVersion: "7.0.100-rc.1.22431.12"
   DotNetVersion2: "3.1.422"
   NuGetVersion: "5.7.0"
   MonoVersion: "6.12.0"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,7 +1,7 @@
 
 name: 'Tests'
 env:
-  DotNetVersion: "7.0.100-preview.7.22377.5"
+  DotNetVersion: "7.0.100-rc.1.22431.12"
   DotNetVersion2: "3.1.422"
   NuGetVersion: "5.7.0"
   MonoVersion: "6.12.0"

diff --git a/.pipelines/init.yml b/.pipelines/init.yml
@@ -1,7 +1,7 @@
 parameters:
   # Configuration: Release
   Verbosity: Normal
-  DotNetVersion: "7.0.100-preview.7.22377.5"
+  DotNetVersion: "7.0.100-rc.1.22431.12"
   DotNetVersion2: "3.1.422"
   CakeVersion: "1.1.0"
   NuGetVersion: "5.7.0"

diff --git a/build.json b/build.json
@@ -4,7 +4,7 @@
     "DotNetVersions": [
         "3.1.422",
         "6.0.400",
-        "7.0.100-preview.7.22377.5"
+        "7.0.100-rc.1.22431.12"
     ],
     "RequiredMonoVersion": "6.6.0",
     "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",

diff --git a/build/Packages.props b/build/Packages.props
@@ -5,8 +5,8 @@
         <MicrosoftExtensionPackageVersion>6.0.0</MicrosoftExtensionPackageVersion>
         <MicrosoftTestPackageVersion>17.3.0</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>17.3.1</MSBuildPackageVersion>
-        <NuGetPackageVersion>6.3.0-rc.128</NuGetPackageVersion>
-        <RoslynPackageVersion>4.4.0-1.22369.1</RoslynPackageVersion>
+        <NuGetPackageVersion>6.4.0-preview.1.53</NuGetPackageVersion>
+        <RoslynPackageVersion>4.4.0-3.22429.3</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
     </PropertyGroup>
 

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "7.0.100-preview.7.22377.5",
+        "version": "7.0.100-rc.1.22431.12",
         "rollForward": "patch"
     }
 }
diff --git a/test-assets/test-projects/Net70Project/global.json b/test-assets/test-projects/Net70Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "7.0.100-preview.7.22377.5"
+        "version": "7.0.100-rc.1.22431.12"
     }
 }
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -242,7 +242,7 @@ public async Task The_correct_sdk_version_is_emitted_NET7()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net70Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("7.0.100-preview.7.22377.5"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("7.0.100-rc.1.22431.12"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         private string GetHashedFileExtension(string fileExtension)

diff --git a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs
@@ -7,7 +7,7 @@ namespace OmniSharp.Tests
 {
     public class DotNetCliServiceFacts : AbstractTestFixture
     {
-        private const string DotNetVersion = "7.0.100-preview.7.22377.5";
+        private const string DotNetVersion = "7.0.100-rc.1.22431.12";
         private int Major { get; }
         private int Minor { get; }
         private int Patch { get; }

diff --git a/tests/OmniSharp.Tests/DotNetVersionFacts.cs b/tests/OmniSharp.Tests/DotNetVersionFacts.cs
@@ -46,7 +46,7 @@ public void ParseErrorMessage()
                 "6.0.105 [/usr/local/share/dotnet/sdk]",
                 "6.0.202 [/usr/local/share/dotnet/sdk]",
                 "6.0.400 [/usr/local/share/dotnet/sdk]",
-                "7.0.100-preview.7.22377.5 [/usr/local/share/dotnet/sdk]",
+                "7.0.100-rc.1.22431.12 [/usr/local/share/dotnet/sdk]",
                 "",
                 $"Install the [{RequestedSdkVersion}] .NET SDK or update [{GlobalJsonFile}] to match an installed SDK.",
                 "",