Skip to content

Update xamlTools to 18.10.12021.405 #9567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
noiseonwires wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −3
Draft

Update xamlTools to 18.10.12021.405 #9567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions .github/skills/update-xamltools-version/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <upstream-remote> 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 <vs-repo-path> checkout main
git -C <vs-repo-path> pull --ff-only
```
Comment thread
noiseonwires marked this conversation as resolved.

### 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-<version>
git checkout -B update/xamltools-<version> <upstream-remote>/main
```
Replace `<version>` with the new xamlTools version, using dashes instead of dots for the branch name (e.g., `update/xamltools-18-9-11921-35`).

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 Debugger and MonowebAssemblyBridge (PR: [#9543](https://github.com/dotnet/vscode-csharp/pull/9543))
* Add one-time feedback survey for Copilot Chat users (PR: [#9551](https://github.com/dotnet/vscode-csharp/pull/9551))
* Optional source based test discovery support in C# Dev Kit. (PR: [#9426](https://github.com/dotnet/vscode-csharp/pull/9426))
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"roslyn": "5.10.0-1.26367.9",
"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",
Expand Down
Loading