Update Roslyn and .NET SDK versions

OmniSharp · May 22, 2024 · 52d4db2 · 52d4db2
1 parent ac7b9b8
commit 52d4db2
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,9 +1,9 @@
 
 name: 'Build'
 env:
-  DotNetVersion: "9.0.100-preview.1.24101.2"
-  DotNetVersion2: "8.0.201"
-  DotNetVersion3: "7.0.406"
+  DotNetVersion: "9.0.100-preview.4.24267.66"
+  DotNetVersion2: "8.0.300"
+  DotNetVersion3: "7.0.409"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
   MonoVersion: "6.12.0"

diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
@@ -1,9 +1,9 @@
 
 name: 'Tests net6.0'
 env:
-  DotNetVersion: "9.0.100-preview.1.24101.2"
-  DotNetVersion2: "8.0.201"
-  DotNetVersion3: "7.0.406"
+  DotNetVersion: "9.0.100-preview.4.24267.66"
+  DotNetVersion2: "8.0.300"
+  DotNetVersion3: "7.0.409"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
   MonoVersion: "6.12.0"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,9 +1,9 @@
 
 name: 'Tests'
 env:
-  DotNetVersion: "9.0.100-preview.1.24101.2"
-  DotNetVersion2: "8.0.201"
-  DotNetVersion3: "7.0.406"
+  DotNetVersion: "9.0.100-preview.4.24267.66"
+  DotNetVersion2: "8.0.300"
+  DotNetVersion3: "7.0.409"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   NuGetVersion: "6.5.0"
   MonoVersion: "6.12.0"

diff --git a/.pipelines/init.yml b/.pipelines/init.yml
@@ -1,9 +1,9 @@
 parameters:
   # Configuration: Release
   Verbosity: Normal
-  DotNetVersion: "9.0.100-preview.1.24101.2"
-  DotNetVersion2: "8.0.201"
-  DotNetVersion3: "7.0.406"
+  DotNetVersion: "9.0.100-preview.4.24267.66"
+  DotNetVersion2: "8.0.300"
+  DotNetVersion3: "7.0.409"
   DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
   CakeVersion: "1.1.0"
   NuGetVersion: "5.7.0"

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,8 +8,8 @@
         <MicrosoftExtensionPackageVersion>8.0.0</MicrosoftExtensionPackageVersion>
         <MicrosoftTestPackageVersion>17.8.0</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
-        <NuGetPackageVersion>6.10.0-preview.1.18</NuGetPackageVersion>
-        <RoslynPackageVersion>4.10.0-2.24112.8</RoslynPackageVersion>
+        <NuGetPackageVersion>6.11.0-preview.1.35</NuGetPackageVersion>
+        <RoslynPackageVersion>4.11.0-2.24266.3</RoslynPackageVersion>
         <XunitPackageVersion>2.6.1</XunitPackageVersion>
     </PropertyGroup>
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -32,7 +32,7 @@ resources:
 
 variables:
   Verbosity: Diagnostic
-  DotNetVersion: "8.0.201"
+  DotNetVersion: "8.0.300"
   CakeVersion: "3.0.0"
   NuGetVersion: "6.5.0"
   GitVersionVersion: "5.0.1"

diff --git a/build.json b/build.json
@@ -3,9 +3,9 @@
     "DotNetChannel": "Preview",
     "DotNetVersions": [
         "6.0.203",
-        "7.0.406",
-        "8.0.201",
-        "9.0.100-preview.1.24101.2"
+        "7.0.409",
+        "8.0.300",
+        "9.0.100-preview.4.24267.66"
     ],
     "RequiredMonoVersion": "6.6.0",
     "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
@@ -55,4 +55,4 @@
     "RestoreOnlyTestAssets": [
         "ProjectWithMissingType"
     ]
-}
+}
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.201",
+        "version": "8.0.300",
         "rollForward": "latestMinor"
     }
-}
+}
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 = "4.10.0.0";
+        public const string RoslynVersion = "4.11.0.0";
         public const string RoslynPublicKeyToken = "31bf3856ad364e35";
 
         public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

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.406"
+        "version": "7.0.409"
     }
-}
+}
diff --git a/test-assets/test-projects/Net80Project/global.json b/test-assets/test-projects/Net80Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.201"
+        "version": "8.0.300"
     }
-}
+}
diff --git a/test-assets/test-projects/Net90Project/global.json b/test-assets/test-projects/Net90Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.100-preview.1.24101.2"
+        "version": "9.0.100-preview.4.24267.66"
     }
-}
+}
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -231,7 +231,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.406"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("7.0.409"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [ConditionalFact(typeof(DotnetRuntimeOnly))]
@@ -243,7 +243,7 @@ public async Task The_correct_sdk_version_is_emitted_NET8()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net80Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("8.0.201"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("8.0.300"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [ConditionalFact(typeof(DotnetRuntimeOnly))]
@@ -255,7 +255,7 @@ public async Task The_correct_sdk_version_is_emitted_NET9()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net90Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("9.0.100-preview.1.24101.2"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("9.0.100-preview.4.24267.66"), 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 = "8.0.201";
+        private const string DotNetVersion = "8.0.300";
         private int Major { get; }
         private int Minor { get; }
         private int Patch { get; }