diff --git a/.github/skills/update-roslyn-version/SKILL.md b/.github/skills/update-roslyn-version/SKILL.md index 0689eed340..0aa6d55f76 100644 --- a/.github/skills/update-roslyn-version/SKILL.md +++ b/.github/skills/update-roslyn-version/SKILL.md @@ -176,21 +176,29 @@ Note: Leave the PR number blank initially (just `[#]`) - it will be updated afte ### Step 8: Filter Changelog Entries -Review the changelog entries in `CHANGELOG.md` and remove any PRs that obviously don't affect VS Code. Remove entries that are: +Treat the changelog as a concise list of user-facing VS Code editor and language server changes, not a list of all production changes in Roslyn. Review the PR title and, when its impact is ambiguous, its changed files or description. + +Remove entries that are: - **Infrastructure/Build changes**: CI/CD pipelines, build scripts, Azure DevOps configurations - **Visual Studio-only changes**: Features or fixes specific to Visual Studio IDE (not VS Code) - **Test-only changes**: Test infrastructure, test fixes that don't affect production code - **Internal tooling**: Changes to internal tools not used by the language server - **Documentation-only**: README updates, internal docs (unless they document user-facing features) +- **Compiler-only changes**: Language implementation, parsing, lowering, emit, code generation, compiler APIs, or compiler performance changes without direct editor or language server impact +- **Razor compiler internals**: Razor parsing, lowering, code generation, or compiler architecture changes that do not directly change the VS Code editing experience +- **Internal refactoring and dependencies**: Architectural refactors, implementation details, package updates, or internal performance work unless they have a clear user-visible effect in VS Code Keep entries that are: - Language server protocol (LSP) changes -- Code analysis/diagnostics improvements +- Code analysis or diagnostics improvements visible in the editor - Completion, navigation, refactoring features -- Performance improvements +- Performance improvements specifically affecting editor or language server responsiveness - Bug fixes that affect language server behavior -- API changes that could affect VS Code extension +- Razor changes that directly affect editing features such as formatting, completion, navigation, or code actions +- API changes consumed by the VS Code extension or language server + +When uncertain, omit the entry from `CHANGELOG.md`; the complete unfiltered list remains available in the pull request description. ### Step 9: Commit and Push diff --git a/CHANGELOG.md b/CHANGELOG.md index f79d78c218..32abf71fbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.150.x +* Update Roslyn to 5.11.0-1.26424.9 (PR: [#9701](https://github.com/dotnet/vscode-csharp/pull/9701)) + * Support loading cached project data from .lscache files (PR: [#84790](https://github.com/dotnet/roslyn/pull/84790)) + * Fix rename conflict for source generated partial members (PR: [#84951](https://github.com/dotnet/roslyn/pull/84951)) + * Fix IDE0046 code fix throwing on top-level statements (PR: [#84966](https://github.com/dotnet/roslyn/pull/84966)) + * Fix/84847 source generated rename conflict (PR: [#84849](https://github.com/dotnet/roslyn/pull/84849)) + * Do not offer introduce parameter for incomplete calls (PR: [#84769](https://github.com/dotnet/roslyn/pull/84769)) + * Always pass C# formatting options to Razor functions (PR: [#84795](https://github.com/dotnet/roslyn/pull/84795)) + * Fix formatting error when Roslyn adds an extra blank line (PR: [#84751](https://github.com/dotnet/roslyn/pull/84751)) # 2.149.x * Bump fast-uri from 3.1.4 to 3.1.5 (PR: [#9658](https://github.com/dotnet/vscode-csharp/pull/9658)) diff --git a/package.json b/package.json index 075024a318..eb0af21b47 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "workspace" ], "defaults": { - "roslyn": "5.11.0-1.26405.8", + "roslyn": "5.11.0-1.26424.9", "omniSharp": "1.39.14", "razorOmnisharp": "7.0.0-preview.23363.1", "xamlTools": "18.10.12014.341", diff --git a/test/razor/razorIntegrationTests/rename.integration.test.ts b/test/razor/razorIntegrationTests/rename.integration.test.ts index cfcf51c37f..4af28f2bde 100644 --- a/test/razor/razorIntegrationTests/rename.integration.test.ts +++ b/test/razor/razorIntegrationTests/rename.integration.test.ts @@ -64,6 +64,9 @@ describe(`Razor Rename ${testAssetWorkspace.description}`, function () { expect(uri.path).toStrictEqual(activeDocument.path); expect(edits.length).toBe(3); + // Rename edits can come from multiple generated documents, so their order is not guaranteed. + edits.sort((a, b) => a.range.start.compareTo(b.range.start)); + const edit1 = edits[0]; expect(edit1.range).toStrictEqual( new vscode.Range(new vscode.Position(6, 33), new vscode.Position(6, 45))