From b4568895296baf10d3ebfb22d35859b43db86539 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Wed, 27 Nov 2024 15:04:08 -0800 Subject: [PATCH 1/2] Update roslyn to 4.13.0-3.24577.4 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acf6df0fe..ff374e679 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.59.x +* Update Roslyn to 4.13.0-3.24577.4 (PR: [#7833](https://github.com/dotnet/vscode-csharp/pull/7833)) + * Fix issue where suppressors could not correctly suppress built in analyzers (PR: [#75684](https://github.com/dotnet/roslyn/pull/75684)) + * Implement find all references to preprocessing symbols (PR: [#66425](https://github.com/dotnet/roslyn/pull/66425)) + * Postpone respecting the code-style analysis config rule until NET10 (PR: [#75978](https://github.com/dotnet/roslyn/pull/75978)) * Delete `dotnet.dotnetPath` setting and support automatic migration to replacements (PR: [#7825](https://github.com/dotnet/vscode-csharp/pull/7825)) * Existing `dotnet.dotnetPath` values will be migrated to the .NET Install Tool extension's `dotnetAcquisitionExtension.existingDotnetPath` setting. See [this page](https://github.com/dotnet/vscode-dotnet-runtime/blob/main/vscode-dotnet-runtime-extension/README.md#i-already-have-a-net-runtime-or-sdk-installed-and-i-want-to-use-it) for more details on configuring the .NET Install Tool. * The OmniSharp version of `dotnet.dotnetPath` has been migrated to `omnisharp.dotnetPath` diff --git a/package.json b/package.json index 290de9ce9..872b217e4 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ } }, "defaults": { - "roslyn": "4.13.0-2.24569.1", + "roslyn": "4.13.0-3.24577.4", "omniSharp": "1.39.11", "razor": "9.0.0-preview.24569.4", "razorOmnisharp": "7.0.0-preview.23363.1", From 782294a123273c2dfe3da0d127dc9080df5fe949 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Wed, 27 Nov 2024 15:27:41 -0800 Subject: [PATCH 2/2] update test to account for code action behavior change --- .../integrationTests/codeactions.integration.test.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/lsptoolshost/integrationTests/codeactions.integration.test.ts b/test/lsptoolshost/integrationTests/codeactions.integration.test.ts index a9ec6091c..f0fc3c611 100644 --- a/test/lsptoolshost/integrationTests/codeactions.integration.test.ts +++ b/test/lsptoolshost/integrationTests/codeactions.integration.test.ts @@ -120,7 +120,6 @@ describe(`Code Actions Tests`, () => { 'internal class CodeActions', '{', ' private static void Do() { Method(); }', - '', ' private static void Method()', ' {', ' var x = 1;', @@ -149,7 +148,6 @@ describe(`Code Actions Tests`, () => { 'internal class CodeActions', '{', ' private static void Do() { Method(); }', - '', ' private static void Method()', ' {', ' var x = 1;', @@ -190,7 +188,6 @@ describe(`Code Actions Tests`, () => { 'internal class CodeActions', '{', ' private static void Do() { Method(); }', - '', ' private static void Method()', ' {', ' var x = 1;',