From 52d4db2ee66215d9482c9ba76908052df9a9af46 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 22 May 2024 15:54:44 -0700 Subject: [PATCH] Update Roslyn and .NET SDK versions --- .github/workflows/build.yml | 6 +++--- .github/workflows/tests-net6.yml | 6 +++--- .github/workflows/tests.yml | 6 +++--- .pipelines/init.yml | 6 +++--- Directory.Packages.props | 4 ++-- azure-pipelines.yml | 2 +- build.json | 8 ++++---- global.json | 4 ++-- src/OmniSharp.Abstractions/Configuration.cs | 2 +- test-assets/test-projects/Net70Project/global.json | 4 ++-- test-assets/test-projects/Net80Project/global.json | 4 ++-- test-assets/test-projects/Net90Project/global.json | 4 ++-- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 6 +++--- tests/OmniSharp.Tests/DotNetCliServiceFacts.cs | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c72e32c07e..d020a75d06 100644 --- 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 index 2672d41098..589ba995a7 100644 --- 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 index b7f5d7ea1f..e58db455ef 100644 --- 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 index 8adcb81d47..b3ee6508de 100644 --- 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 index ee9fe8fafb..2f7e3d0c7e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,8 +8,8 @@ 8.0.0 17.8.0 17.3.2 - 6.10.0-preview.1.18 - 4.10.0-2.24112.8 + 6.11.0-preview.1.35 + 4.11.0-2.24266.3 2.6.1 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a10f46cdf5..edfc52352a 100644 --- 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 index 988db58b03..e52e9c5784 100644 --- 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" ] -} \ No newline at end of file +} diff --git a/global.json b/global.json index 054010bf22..f78c53a21c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.201", + "version": "8.0.300", "rollForward": "latestMinor" } -} \ No newline at end of file +} diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs index 51031d62b4..623fdb63ce 100644 --- 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 index 7575cd33e5..a7f9a5bf4a 100644 --- 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" } -} \ No newline at end of file +} diff --git a/test-assets/test-projects/Net80Project/global.json b/test-assets/test-projects/Net80Project/global.json index 215edb91a5..d68ee8382e 100644 --- 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" } -} \ No newline at end of file +} diff --git a/test-assets/test-projects/Net90Project/global.json b/test-assets/test-projects/Net90Project/global.json index d96cd4631a..f4f0e4b619 100644 --- 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" } -} \ No newline at end of file +} diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index 098f32e58d..6494d8797e 100644 --- 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 index ddf0e4d245..3082c69bd6 100644 --- 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; }