diff --git a/.github/skills/update-xamltools-version/SKILL.md b/.github/skills/update-xamltools-version/SKILL.md index adf324cbf..bbcfb80ba 100644 --- a/.github/skills/update-xamltools-version/SKILL.md +++ b/.github/skills/update-xamltools-version/SKILL.md @@ -39,11 +39,27 @@ This is normally the user's responsibility, but here is the full process to loca ## Process +### Step 0: Sync With Upstream Repos (do this first) + +Before computing anything, make sure both local clones are fully synced with their upstreams. This is critical: the changelog delta is computed from `main`'s **current** xamlTools version, so a stale `main` produces the wrong range (and may re-do an already-merged bump). + +1. **vscode-csharp**: fetch the `dotnet/vscode-csharp` mainline and base your work on it. The upstream remote may be named `origin` or differently — pick whichever points at `github.com/dotnet/vscode-csharp`. + ```powershell + git fetch main + # start the update branch (Step 1) from the freshly-fetched upstream main + ``` + Confirm the current `defaults.xamlTools` in `package.json` on that upstream `main` — that value is the **old version** for the changelog delta, not whatever your local branch happened to have. +2. **VS source repo** (the one hosting `src/Xaml`): pull `main` so the AzDO REST/enlistment history in Step 4 sees all commits. + ```powershell + git -C checkout main + git -C pull --ff-only + ``` + ### Step 1: Create a New Branch -Create a new git branch for the update: +Create a new git branch for the update, based on the freshly-fetched upstream `main`: ```powershell -git checkout -B update/xamltools- +git checkout -B update/xamltools- /main ``` Replace `` with the new xamlTools version, using dashes instead of dots for the branch name (e.g., `update/xamltools-18-9-11921-35`). diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dd50c4c3..520c9a7e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.147.x +* Update xamlTools to 18.10.12021.405 (PR: [#9567](https://github.com/dotnet/vscode-csharp/pull/9567)) + * Fix two MAUI Hot Reload E2E minor telemetry issues (PR: AzDO#759404) * 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)) @@ -20,7 +22,6 @@ * Allow try/catch/finally blocks to collapse independently (PR: [#84507](https://github.com/dotnet/roslyn/pull/84507)) * Don't fail when formatting blank lines in string literals (PR: [#84461](https://github.com/dotnet/roslyn/pull/84461)) * Fix NullReferenceException parsing an incomplete switch expression (PR: [#84456](https://github.com/dotnet/roslyn/pull/84456)) - * Update xamlTools to 18.10.12014.341 (PR: [#9531](https://github.com/dotnet/vscode-csharp/pull/9531)) * Fix Hot Reload XmlException in CoreCLR MAUI apps (PR: AzDO#757560) * Fix UI deadlock in GetDeclarations completion handling (PR: AzDO#751965) @@ -29,7 +30,6 @@ * Fix DLL loading exceptions on extension initialization (PR: AzDO#754847) * Report Maui.Controls version for E2E diagnostics (PR: AzDO#752606) * Rework MAUI Hot Reload E2E reporting to fix duplicate events (PR: AzDO#751623) - * Update Roslyn to 5.10.0-1.26359.5 (PR: [#9519](https://github.com/dotnet/vscode-csharp/pull/9519)) * Fix Razor Find All References displaying lines inconsistently when directives span Razor/C# mapping boundaries (PR: [#84353](https://github.com/dotnet/roslyn/pull/84353)) * Fix Razor parsing for adjacent comment delimiters in code blocks (PR: [#84277](https://github.com/dotnet/roslyn/pull/84277)) @@ -69,7 +69,6 @@ * Don't assume documents being saved are documents (PR: [#84146](https://github.com/dotnet/roslyn/pull/84146)) * Don't warn about no additional files if the project is still loading (PR: [#84147](https://github.com/dotnet/roslyn/pull/84147)) - # 2.144.x * Update Roslyn to 5.9.0-1.26314.1 (PR: [#9430](https://github.com/dotnet/vscode-csharp/pull/9430)) * Fix multiline lambda formatting in non-directive attributes (PR: [#84121](https://github.com/dotnet/roslyn/pull/84121)) @@ -103,7 +102,6 @@ * Hot Reload E2E diagnostics fundamentals (PR: AzDO#731599) * Fix MetadataUpdateHandlers were not called in some cases in MAUI apps (PR: AzDO#731599) * XAML Language server telemetry (PR: AzDO#733556) - * Update Roslyn to 5.8.0-1.26267.2 (PR: [#9321](https://github.com/dotnet/vscode-csharp/pull/9321)) * Fix racecondition on UnsuedDirectiveCache.Set (PR: [#83693](https://github.com/dotnet/roslyn/pull/83693)) * Fix single line script tag formatting (PR: [#83721](https://github.com/dotnet/roslyn/pull/83721)) @@ -164,7 +162,6 @@ * Update xamlTools to 18.7.11727.258 (PR: [#9261](https://github.com/dotnet/vscode-csharp/pull/9261)) * XAML C# Expressions (XEXPR) full support (PR: AzDO#728266, AzDO#730837) - # 2.136.x * Update Roslyn to 5.7.0-1.26220.12 (PR: [#](https://github.com/dotnet/vscode-csharp/pull/)) * File-based apps: Adjust heuristics to properly handle transitive directives (PR: [#83185](https://github.com/dotnet/roslyn/pull/83185)) @@ -188,7 +185,6 @@ * Fix SslStream disposal crash (Issues: [9146](https://github.com/dotnet/vscode-csharp/issues/9146), [9183](https://github.com/dotnet/vscode-csharp/issues/9183), [9175](https://github.com/dotnet/vscode-csharp/issues/9175), PR: AzDO#728722) * Fix XAML Hot Reload error reporting when exceptions originate from indirectly-loaded views (PR: AzDO#729745) * XAML C# Expressions (XEXPR) limited support (PR: AzDO#721767) - # 2.135.x * Bump lodash from 4.17.23 to 4.18.1 (PR: [#9152](https://github.com/dotnet/vscode-csharp/pull/9152)) diff --git a/package.json b/package.json index 259332cf1..7da897710 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "roslyn": "5.10.0-1.26376.1", "omniSharp": "1.39.14", "razorOmnisharp": "7.0.0-preview.23363.1", - "xamlTools": "18.10.12014.341", + "xamlTools": "18.10.12021.405", "testDiscovery": "9.9.179-gc20357" }, "main": "./dist/extension",