From 668ecb7e051f0858e8189671858270aad3a56802 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 29 Jul 2026 09:53:29 -0700 Subject: [PATCH 1/6] Update Roslyn to 5.11.0-1.26379.2 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd50c4c3..f10bc058d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.147.x +* Update Roslyn to 5.11.0-1.26379.2 (PR: [#](https://github.com/dotnet/vscode-csharp/pull/)) + * Unsafe evolution: ensure diagnostics are picked up by IDE (PR: [#84603](https://github.com/dotnet/roslyn/pull/84603)) + * Fix daemon relay exit classification (PR: [#84666](https://github.com/dotnet/roslyn/pull/84666)) + * Ensure we don't log errors when we are cancelling loading (PR: [#84622](https://github.com/dotnet/roslyn/pull/84622)) + * Report LSP daemon lifecycle telemetry (PR: [#84652](https://github.com/dotnet/roslyn/pull/84652)) + * Unions: cache TryGetValue methods on NamedTypeSymbol representing a union type (PR: [#84645](https://github.com/dotnet/roslyn/pull/84645)) + * Trim lsp dispatch allocations (PR: [#84651](https://github.com/dotnet/roslyn/pull/84651)) + * Reduce LSP request handling allocations (PR: [#84623](https://github.com/dotnet/roslyn/pull/84623)) + * Preserve line breaks after collapsed Razor blocks (PR: [#84630](https://github.com/dotnet/roslyn/pull/84630)) + * Honour C# new line settings in Razor auto insert (PR: [#84632](https://github.com/dotnet/roslyn/pull/84632)) + * Provide access to SymbolKey for TestDiscovery (PR: [#84643](https://github.com/dotnet/roslyn/pull/84643)) + * Unions: cache some calculated results on NamedTypeSymbol representing a union type (PR: [#84589](https://github.com/dotnet/roslyn/pull/84589)) + * Fix IL3000: guard Assembly.Location access behind RuntimeFeature.IsDynamicCodeSupported (PR: [#84599](https://github.com/dotnet/roslyn/pull/84599)) + * Fix typo in OverloadResolution.PairedExtensionOperatorSignatureComparer.Equals (PR: [#84639](https://github.com/dotnet/roslyn/pull/84639)) + * Fix duplicate `SyntaxNodeAction`s for union declarations and its members (PR: [#84604](https://github.com/dotnet/roslyn/pull/84604)) * Update Roslyn to 5.10.0-1.26376.1 (PR: [#9584](https://github.com/dotnet/vscode-csharp/pull/9584)) * Don't throw exceptions for nested, prefixed, tag helpers (PR: [#84611](https://github.com/dotnet/roslyn/pull/84611)) * File-based apps: avoid running a few irrelevant editor features (PR: [#84575](https://github.com/dotnet/roslyn/pull/84575)) diff --git a/package.json b/package.json index 259332cf1..3739452a9 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "workspace" ], "defaults": { - "roslyn": "5.10.0-1.26376.1", + "roslyn": "5.11.0-1.26379.2", "omniSharp": "1.39.14", "razorOmnisharp": "7.0.0-preview.23363.1", "xamlTools": "18.10.12014.341", From 8332aee6faf4153202779be953812c8540e297ec Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 29 Jul 2026 09:53:50 -0700 Subject: [PATCH 2/6] Update changelog with PR number Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f10bc058d..c3d58a85e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.147.x -* Update Roslyn to 5.11.0-1.26379.2 (PR: [#](https://github.com/dotnet/vscode-csharp/pull/)) +* Update Roslyn to 5.11.0-1.26379.2 (PR: [#9592](https://github.com/dotnet/vscode-csharp/pull/9592)) * Unsafe evolution: ensure diagnostics are picked up by IDE (PR: [#84603](https://github.com/dotnet/roslyn/pull/84603)) * Fix daemon relay exit classification (PR: [#84666](https://github.com/dotnet/roslyn/pull/84666)) * Ensure we don't log errors when we are cancelling loading (PR: [#84622](https://github.com/dotnet/roslyn/pull/84622)) From 996c32f2d766ced150c64220e2c2125b0e6d323b Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 29 Jul 2026 11:05:51 -0700 Subject: [PATCH 3/6] Update CHANGELOG.md Co-authored-by: David Barbet --- CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3d58a85e..2a7d8303e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,19 +6,11 @@ # 2.147.x * Update Roslyn to 5.11.0-1.26379.2 (PR: [#9592](https://github.com/dotnet/vscode-csharp/pull/9592)) * Unsafe evolution: ensure diagnostics are picked up by IDE (PR: [#84603](https://github.com/dotnet/roslyn/pull/84603)) - * Fix daemon relay exit classification (PR: [#84666](https://github.com/dotnet/roslyn/pull/84666)) * Ensure we don't log errors when we are cancelling loading (PR: [#84622](https://github.com/dotnet/roslyn/pull/84622)) - * Report LSP daemon lifecycle telemetry (PR: [#84652](https://github.com/dotnet/roslyn/pull/84652)) - * Unions: cache TryGetValue methods on NamedTypeSymbol representing a union type (PR: [#84645](https://github.com/dotnet/roslyn/pull/84645)) * Trim lsp dispatch allocations (PR: [#84651](https://github.com/dotnet/roslyn/pull/84651)) * Reduce LSP request handling allocations (PR: [#84623](https://github.com/dotnet/roslyn/pull/84623)) * Preserve line breaks after collapsed Razor blocks (PR: [#84630](https://github.com/dotnet/roslyn/pull/84630)) * Honour C# new line settings in Razor auto insert (PR: [#84632](https://github.com/dotnet/roslyn/pull/84632)) - * Provide access to SymbolKey for TestDiscovery (PR: [#84643](https://github.com/dotnet/roslyn/pull/84643)) - * Unions: cache some calculated results on NamedTypeSymbol representing a union type (PR: [#84589](https://github.com/dotnet/roslyn/pull/84589)) - * Fix IL3000: guard Assembly.Location access behind RuntimeFeature.IsDynamicCodeSupported (PR: [#84599](https://github.com/dotnet/roslyn/pull/84599)) - * Fix typo in OverloadResolution.PairedExtensionOperatorSignatureComparer.Equals (PR: [#84639](https://github.com/dotnet/roslyn/pull/84639)) - * Fix duplicate `SyntaxNodeAction`s for union declarations and its members (PR: [#84604](https://github.com/dotnet/roslyn/pull/84604)) * Update Roslyn to 5.10.0-1.26376.1 (PR: [#9584](https://github.com/dotnet/vscode-csharp/pull/9584)) * Don't throw exceptions for nested, prefixed, tag helpers (PR: [#84611](https://github.com/dotnet/roslyn/pull/84611)) * File-based apps: avoid running a few irrelevant editor features (PR: [#84575](https://github.com/dotnet/roslyn/pull/84575)) From 611880a6835484bf6186c74b73a97b7d0795e1a6 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 29 Jul 2026 11:21:02 -0700 Subject: [PATCH 4/6] Pin integration tests to VS Code 1.130 --- test/vscodeLauncher.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/vscodeLauncher.ts b/test/vscodeLauncher.ts index 639925b8d..23214ac66 100644 --- a/test/vscodeLauncher.ts +++ b/test/vscodeLauncher.ts @@ -15,7 +15,9 @@ export async function prepareVSCodeAndExecuteTests( userDataDir: string, env: NodeJS.ProcessEnv ): Promise { - let vscodeVersion = 'insiders'; + // Normally we test against 'insiders' but have pinned to a previous release due to + // issues in the MacOS test legs. + let vscodeVersion = '1.130'; if (process.env.CODE_VERSION) { console.log(`VSCode version overriden to ${process.env.CODE_VERSION}.`); vscodeVersion = process.env.CODE_VERSION; From b61e974672a573433557c0848776941aa8bbb647 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 29 Jul 2026 11:33:24 -0700 Subject: [PATCH 5/6] Update @vscode/test-electron to 3.1.0 --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- test/vscodeLauncher.ts | 4 +--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c179477d..b8192302b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@typescript-eslint/eslint-plugin": "^8.19.0", "@typescript-eslint/parser": "^8.19.0", "@vscode/l10n-dev": "^0.0.35", - "@vscode/test-electron": "^2.5.2", + "@vscode/test-electron": "^3.1.0", "@vscode/vsce": "3.7.0", "esbuild": "^0.28.1", "eslint": "^8.43.0", @@ -3475,9 +3475,9 @@ } }, "node_modules/@vscode/test-electron": { - "version": "2.5.2", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@vscode/test-electron/-/test-electron-2.5.2.tgz", - "integrity": "sha1-99QHjoIwzpyUMi8qKcwWwXlUCF0=", + "version": "3.1.0", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@vscode/test-electron/-/test-electron-3.1.0.tgz", + "integrity": "sha1-Rrk9EY3NOzyJyq4pahP5p/XrY8U=", "dev": true, "license": "MIT", "dependencies": { @@ -3488,7 +3488,7 @@ "semver": "^7.6.2" }, "engines": { - "node": ">=16" + "node": ">=22" } }, "node_modules/@vscode/test-electron/node_modules/http-proxy-agent": { @@ -15200,9 +15200,9 @@ } }, "@vscode/test-electron": { - "version": "2.5.2", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@vscode/test-electron/-/test-electron-2.5.2.tgz", - "integrity": "sha1-99QHjoIwzpyUMi8qKcwWwXlUCF0=", + "version": "3.1.0", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@vscode/test-electron/-/test-electron-3.1.0.tgz", + "integrity": "sha1-Rrk9EY3NOzyJyq4pahP5p/XrY8U=", "dev": true, "requires": { "http-proxy-agent": "^7.0.2", diff --git a/package.json b/package.json index 3739452a9..3947ebe39 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "@typescript-eslint/eslint-plugin": "^8.19.0", "@typescript-eslint/parser": "^8.19.0", "@vscode/l10n-dev": "^0.0.35", - "@vscode/test-electron": "^2.5.2", + "@vscode/test-electron": "^3.1.0", "@vscode/vsce": "3.7.0", "esbuild": "^0.28.1", "eslint": "^8.43.0", @@ -5784,4 +5784,4 @@ } } } -} \ No newline at end of file +} diff --git a/test/vscodeLauncher.ts b/test/vscodeLauncher.ts index 23214ac66..639925b8d 100644 --- a/test/vscodeLauncher.ts +++ b/test/vscodeLauncher.ts @@ -15,9 +15,7 @@ export async function prepareVSCodeAndExecuteTests( userDataDir: string, env: NodeJS.ProcessEnv ): Promise { - // Normally we test against 'insiders' but have pinned to a previous release due to - // issues in the MacOS test legs. - let vscodeVersion = '1.130'; + let vscodeVersion = 'insiders'; if (process.env.CODE_VERSION) { console.log(`VSCode version overriden to ${process.env.CODE_VERSION}.`); vscodeVersion = process.env.CODE_VERSION; From 87046b2300a74a790eeac938368b8292f2726667 Mon Sep 17 00:00:00 2001 From: Peter Waldschmidt Date: Wed, 29 Jul 2026 15:00:53 -0400 Subject: [PATCH 6/6] Add test discovery insertion. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3947ebe39..e1f2c31f7 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "omniSharp": "1.39.14", "razorOmnisharp": "7.0.0-preview.23363.1", "xamlTools": "18.10.12014.341", - "testDiscovery": "9.9.179-gc20357" + "testDiscovery": "9.9.223-ge3811b" }, "main": "./dist/extension", "l10n": "./l10n",