From f2cada069abddeed61e5ad510047a3f98fd7362f Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 26 Jul 2024 10:39:23 -0700 Subject: [PATCH 1/2] Update .NET SDKs --- .github/workflows/build.yml | 6 +++--- .github/workflows/tests-net6.yml | 6 +++--- .github/workflows/tests.yml | 6 +++--- azure-pipelines.yml | 2 +- build.json | 6 +++--- global.json | 2 +- test-assets/test-projects/Net70Project/global.json | 4 ++-- test-assets/test-projects/Net80Project/global.json | 2 +- test-assets/test-projects/Net90Project/global.json | 2 +- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 6 +++--- .../OmniSharp.Roslyn.CSharp.Tests/QuickInfoProviderFacts.cs | 2 +- tests/OmniSharp.Tests/DotNetCliServiceFacts.cs | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96c7bcfbfd..103608c881 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.6.24328.19" + DotNetVersion2: "8.0.303" + DotNetVersion3: "7.0.410" 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 14d69d51a5..dd1abc62ab 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.6.24328.19" + DotNetVersion2: "8.0.303" + DotNetVersion3: "7.0.410" 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 017dafdb25..97ff146410 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.6.24328.19" + DotNetVersion2: "8.0.303" + DotNetVersion3: "7.0.410" 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/azure-pipelines.yml b/azure-pipelines.yml index c95a660671..f9c32044cd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,7 +32,7 @@ resources: variables: Verbosity: Diagnostic - DotNetVersion: "8.0.201" + DotNetVersion: "8.0.303" CakeVersion: "3.0.0" NuGetVersion: "6.5.0" GitVersionVersion: "5.0.1" diff --git a/build.json b/build.json index bceb92eab2..380e357bfc 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.410", + "8.0.303", + "9.0.100-preview.6.24328.19" ], "RequiredMonoVersion": "6.6.0", "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext", diff --git a/global.json b/global.json index 054010bf22..7ec84ad344 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.201", + "version": "8.0.303", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/test-assets/test-projects/Net70Project/global.json b/test-assets/test-projects/Net70Project/global.json index 7575cd33e5..f86bc2f847 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.410" } -} \ 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..4ce8f1ee66 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.303" } } \ 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..d2da1deed6 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.6.24328.19" } } \ No newline at end of file diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index 098f32e58d..2736647e7e 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.410"), 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.303"), 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.6.24328.19"), emitter.ReceivedMessages[0].SdkVersion); } private string GetHashedFileExtension(string fileExtension) diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/QuickInfoProviderFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/QuickInfoProviderFacts.cs index 28863d82f9..f0526bbeea 100644 --- a/tests/OmniSharp.Roslyn.CSharp.Tests/QuickInfoProviderFacts.cs +++ b/tests/OmniSharp.Roslyn.CSharp.Tests/QuickInfoProviderFacts.cs @@ -196,7 +196,7 @@ public async Task DisplayFormatForMethodSymbol_Invocation() var response = await GetTypeLookUpResponse(line: 6, column: 35); #if NETCOREAPP - Assert.Equal("```csharp\nvoid Console.WriteLine(string? value) (+ 17 overloads)\n```", response.Markdown); + Assert.Equal("```csharp\nvoid Console.WriteLine(string? value) (+ 18 overloads)\n```", response.Markdown); #else Assert.Equal("```csharp\nvoid Console.WriteLine(string value) (+ 18 overloads)\n```", response.Markdown); #endif diff --git a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs index ddf0e4d245..ef5c41f2ef 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.303"; private int Major { get; } private int Minor { get; } private int Patch { get; } From 1c0ccbddd53108a3c72415a3e8da576eb3ae9c68 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 26 Jul 2024 10:47:03 -0700 Subject: [PATCH 2/2] Update Changelog for 1.39.12 release --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81f56468f2..895af7e839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,14 @@ # Changelog All changes to the project will be documented in this file. -## [1.39.12] - Not Released -* Update SDKs and Roslyn ([#2603](https://github.com/OmniSharp/omnisharp-roslyn/pull/2603)) +## [1.39.12] - 2024-07-26 +* Update .NET SDKs (PR: [#2621](https://github.com/OmniSharp/omnisharp-roslyn/pull/2621)) +* Update Roslyn to 4.12.0-1.24358.3 (PR: [#2619](https://github.com/OmniSharp/omnisharp-roslyn/pull/2619)) +* Fix code fix construction (PR: [#2620](https://github.com/OmniSharp/omnisharp-roslyn/pull/2620)) +* Remove NuGet.Packaging.Core, as it's an assembly that only contains forwarders (PR: [#2610](https://github.com/OmniSharp/omnisharp-roslyn/pull/2610)) +* Fix inlay hints lambdas parameter type null reference exception (PR: [#2604](https://github.com/OmniSharp/omnisharp-roslyn/pull/2604)) +* Update SDKs and Roslyn (PR: [#2603](https://github.com/OmniSharp/omnisharp-roslyn/pull/2603)) +* Pass project path when performing a restore (PR: [#2593](https://github.com/OmniSharp/omnisharp-roslyn/pull/2593)) ## [1.39.11] - 2023-12-19 * Update changelog (PR: [#2591](https://github.com/OmniSharp/omnisharp-roslyn/pull/2591))