diff --git a/CHANGELOG.md b/CHANGELOG.md index a7a6955900..fef25e8680 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,30 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.134.x +* Add setting `dotnet.fileBasedApps.enableAutomaticDiscovery` (PR: [#9096](https://github.com/dotnet/vscode-csharp/pull/9096)) +* Update Roslyn to 5.7.0-1.26203.6 (PR: [#9096](https://github.com/dotnet/vscode-csharp/pull/9096)) + * File-based apps automatic discovery (PR: [#82863](https://github.com/dotnet/roslyn/pull/82863)) + * Fix evaluations inside ref-returning methods (PR: [#83037](https://github.com/dotnet/roslyn/pull/83037)) + * Fix with-element indentation in collection expressions on multiple lines (PR: [#83030](https://github.com/dotnet/roslyn/pull/83030)) + * Do not crash if URI not parseable and no default handler exists (PR: [#83024](https://github.com/dotnet/roslyn/pull/83024)) + * Allow generate method to run on Razor documents (PR: [#83028](https://github.com/dotnet/roslyn/pull/83028)) + * Preserve #: file-based app directives during formatting (PR: [#82996](https://github.com/dotnet/roslyn/pull/82996)) + * Move inheritance margin logic to a features service (PR: [#83001](https://github.com/dotnet/roslyn/pull/83001)) + * Don't format plain blocks as member declaration blocks in top level code (PR: [#82976](https://github.com/dotnet/roslyn/pull/82976)) + * Add LSP CallHierarchy support (PR: [#82865](https://github.com/dotnet/roslyn/pull/82865)) + * Move CallHierarchy logic to the Features layer (PR: [#82864](https://github.com/dotnet/roslyn/pull/82864)) + * Handle misc project having an AdditionalDocument and not a Document (PR: [#82956](https://github.com/dotnet/roslyn/pull/82956)) + * Fix structure guideline anchor for initializer expressions with multi-line argument lists (PR: [#82946](https://github.com/dotnet/roslyn/pull/82946)) + * Navigate to position instead of span for Go to Implementation (PR: [#82906](https://github.com/dotnet/roslyn/pull/82906)) + * Only cache diagnostics for legacy projects (PR: [#82643](https://github.com/dotnet/roslyn/pull/82643)) + * Improve classification of file-based app directives (PR: [#82627](https://github.com/dotnet/roslyn/pull/82627)) + * Add support for skipping analyzing banned API analysis in generated files (PR: [#82713](https://github.com/dotnet/roslyn/pull/82713)) + * Add regex search support to NavigateTo (PR: [#82706](https://github.com/dotnet/roslyn/pull/82706)) + * Add completion provider for `#:include` directives (PR: [#82625](https://github.com/dotnet/roslyn/pull/82625)) + * Modify SyntaxNode trivia search/walk methods to utilize green node checks (PR: [#82893](https://github.com/dotnet/roslyn/pull/82893)) + * Fix handling of added import trivia (PR: [#82788](https://github.com/dotnet/roslyn/pull/82788)) + * DeterministicKeyBuilder: deduplicate ParseOptions across SyntaxTrees (PR: [#82895](https://github.com/dotnet/roslyn/pull/82895)) + * Fix InvalidCastException in split-if refactoring for top-level statements (PR: [#82807](https://github.com/dotnet/roslyn/pull/82807)) # 2.133.x diff --git a/package.json b/package.json index 927cce6573..2216190c84 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "workspace" ], "defaults": { - "roslyn": "5.6.0-2.26173.1", + "roslyn": "5.7.0-1.26203.6", "omniSharp": "1.39.14", "razor": "10.0.0-preview.26179.2", "razorOmnisharp": "7.0.0-preview.23363.1", @@ -1561,6 +1561,14 @@ "tags": [ "preview" ] + }, + "dotnet.fileBasedApps.enableAutomaticDiscovery": { + "type": "boolean", + "default": true, + "description": "%configuration.dotnet.fileBasedApps.enableAutomaticDiscovery%", + "tags": [ + "preview" + ] } } }, diff --git a/package.nls.json b/package.nls.json index 593bf39f64..b3fc53033c 100644 --- a/package.nls.json +++ b/package.nls.json @@ -49,6 +49,7 @@ "configuration.dotnet.projects.enableAutomaticRestore": "Enables automatic NuGet restore if the extension detects assets are missing.", "configuration.dotnet.projects.enableFileBasedPrograms": "Enables the \"file-based programs\" (dotnet run app.cs) experience.", "configuration.dotnet.projects.enableFileBasedProgramsWhenAmbiguous": "Enables the \"file-based programs\" (dotnet run app.cs) experience in files where the editor is unable to determine with certainty whether the file is a file-based program. Only respected when `dotnet.projects.enableFileBasedPrograms` is `true`.", + "configuration.dotnet.fileBasedApps.enableAutomaticDiscovery": "Enables automatic discovery of C# file-based apps in the workspace.", "configuration.dotnet.projects.binaryLogPath": "Sets a path where MSBuild binary logs are written to when loading projects, to help diagnose loading errors.", "configuration.dotnet.server.sourceGeneratorExecution": "Controls when source generators are executed. (Requires extension restart)", "configuration.dotnet.server.sourceGeneratorExecution.balanced": "Source generators are executed after an explicit user action, including save, build, or the [Rerun source generators](command:csharp.rerunSourceGenerators) command.", diff --git a/test/lsptoolshost/integrationTests/gotoImplementation.integration.test.ts b/test/lsptoolshost/integrationTests/gotoImplementation.integration.test.ts index a1bfa8d1f0..f62d694932 100644 --- a/test/lsptoolshost/integrationTests/gotoImplementation.integration.test.ts +++ b/test/lsptoolshost/integrationTests/gotoImplementation.integration.test.ts @@ -38,10 +38,10 @@ describe(`Go To Implementation Tests`, () => { expect(implementationList).toHaveLength(2); expect(implementationList[0].uri.path).toContain('BaseClassImplementation.cs'); - expect(implementationList[0].range).toStrictEqual(new vscode.Range(2, 17, 2, 40)); + expect(implementationList[0].range).toStrictEqual(new vscode.Range(2, 17, 2, 17)); expect(implementationList[1].uri.path).toContain('implementation.cs'); - expect(implementationList[1].range).toStrictEqual(new vscode.Range(5, 17, 5, 26)); + expect(implementationList[1].range).toStrictEqual(new vscode.Range(5, 17, 5, 17)); }); }); diff --git a/test/razor/razorIntegrationTests/reference.integration.test.ts b/test/razor/razorIntegrationTests/reference.integration.test.ts index 5a15c3794d..db16443eb2 100644 --- a/test/razor/razorIntegrationTests/reference.integration.test.ts +++ b/test/razor/razorIntegrationTests/reference.integration.test.ts @@ -121,7 +121,7 @@ describe(`Razor References ${testAssetWorkspace.description}`, function () { expect(definitionLocation.range.start.line).toBe(23); expect(definitionLocation.range.start.character).toBe(10); expect(definitionLocation.range.end.line).toBe(23); - expect(definitionLocation.range.end.character).toBe(19); + expect(definitionLocation.range.end.character).toBe(10); } ); });