From d7dba749b7b33254559cc384b967c9e509090837 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 5 Dec 2025 09:09:43 -0800 Subject: [PATCH 1/5] Use .NET 10 release version in CI --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3063669d4..62f00b16c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -119,7 +119,7 @@ stages: pool: name: NetCore-Public demands: ImageOverride -equals build.ubuntu.2204.amd64.open - containerName: mcr.microsoft.com/dotnet/sdk:10.0.100-rc.2-noble + containerName: mcr.microsoft.com/dotnet/sdk:10.0-noble - stage: Test_Windows_Stage displayName: Test Windows From eba3bef8f47a4303d635a6beab8b255ae3867701 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 5 Dec 2025 09:11:40 -0800 Subject: [PATCH 2/5] Use the .NET 10 runtime --- .../dotnetRuntime/dotnetRuntimeExtensionResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionResolver.ts b/src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionResolver.ts index d8dddd17f..3a0451492 100644 --- a/src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionResolver.ts +++ b/src/lsptoolshost/dotnetRuntime/dotnetRuntimeExtensionResolver.ts @@ -21,9 +21,9 @@ import { import { DotNetRuntimeExtensionId } from '../../checkDotNetRuntimeExtensionVersion'; import { getCSharpDevKit } from '../../utils/getCSharpDevKit'; -const DotNetMajorVersion = '9'; +const DotNetMajorVersion = '10'; const DotNetMinorVersion = '0'; -const DotNetPatchVersion = '1'; +const DotNetPatchVersion = '0'; export const DotNetRuntimeVersion = `${DotNetMajorVersion}.${DotNetMinorVersion}.${DotNetPatchVersion}`; /** From c62d6cc12a701c1f99a5edea9aad2175a2b99034 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 5 Dec 2025 09:11:55 -0800 Subject: [PATCH 3/5] Update Roslyn to 5.3.0-2.25604.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a7b707a44..8a5a0831b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "workspace" ], "defaults": { - "roslyn": "5.3.0-2.25603.1", + "roslyn": "5.3.0-2.25604.5", "omniSharp": "1.39.14", "razor": "10.0.0-preview.25577.1", "razorOmnisharp": "7.0.0-preview.23363.1", From ae0814655e863f8ecc0c5ed9ac6666f4978e2759 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 5 Dec 2025 09:12:43 -0800 Subject: [PATCH 4/5] Update LowestSupportedTargetFramework to net8.0 --- Directory.Build.props | 4 ++-- .../integrationTests/sourceGenerator.integration.test.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3720f4d06..d5fcd2bdc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,6 +5,6 @@ Defines the lowest supported target framework for the extension. Used by server download / integration tests to ensure they run when only this SDK is installed. --> - net6.0 + net8.0 - \ No newline at end of file + diff --git a/test/lsptoolshost/integrationTests/sourceGenerator.integration.test.ts b/test/lsptoolshost/integrationTests/sourceGenerator.integration.test.ts index bf21c3672..3acd32e37 100644 --- a/test/lsptoolshost/integrationTests/sourceGenerator.integration.test.ts +++ b/test/lsptoolshost/integrationTests/sourceGenerator.integration.test.ts @@ -50,11 +50,11 @@ describe(`Source Generator Tests`, () => { requestPosition ) ); - expect(referencesList.length).toEqual(8); + expect(referencesList.length).toEqual(5); const referencesInGeneratedFiles = sortLocations( referencesList.filter((r) => r.uri.scheme === 'roslyn-source-generated') ); - expect(referencesInGeneratedFiles.length).toEqual(7); + expect(referencesInGeneratedFiles.length).toEqual(4); const firstPath = referencesInGeneratedFiles[0].uri.path; expect(firstPath).toEqual('/SourceGenerationContext.g.cs'); From 03adbc2c30eb9689a6614bfa649d32a07c41ddba Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 5 Dec 2025 09:20:08 -0800 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d38a6f26..c53c87c74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,12 @@ - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951) - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) -# 2.104.x +# 2.111.x +* Update extension to run on .NET 10 (PR: [#8839](https://github.com/dotnet/vscode-csharp/pull/8839)) +* Update Roslyn to 5.3.0-2.25604.5 (PR: [#8839](https://github.com/dotnet/vscode-csharp/pull/)) + * Build our libraries against net10.0 (PR: [#81545](https://github.com/dotnet/roslyn/pull/81545)) + * Update Roslyn LSP server to .net10 (PR: [#81508](https://github.com/dotnet/roslyn/pull/81508)) + * Fix InvalidCastException in ConvertForToForEach with tuples (PR: [#81531](https://github.com/dotnet/roslyn/pull/81531)) # 2.103.x * include roslyn event source configs in profiling command (PR: [#8808](https://github.com/dotnet/vscode-csharp/pull/8808))