Skip to content

[automated] Merge branch 'prerelease' => 'release'#8952

Merged
dotnet-policy-service[bot] merged 221 commits intoreleasefrom
merge/prerelease-to-release
Feb 4, 2026
Merged

[automated] Merge branch 'prerelease' => 'release'#8952
dotnet-policy-service[bot] merged 221 commits intoreleasefrom
merge/prerelease-to-release

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Feb 4, 2026

I detected changes in the prerelease branch which have not been merged yet to release. I'm a robot and am configured to help you automatically keep release up to date, so I've opened this PR.

This PR merges commits made on prerelease by the following committers:

  • JoeRobich
  • dibarbet
  • RikkiGibson
  • dotnet-policy-service[bot]
  • dotnet-bot
  • noiseonwires
  • invalid-email-address
  • siramvikram
  • davidwengier
  • Copilot
  • dependabot[bot]
  • phil-allen-msft

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout prerelease
git pull --ff-only
git checkout release
git pull --ff-only
git merge --no-ff prerelease

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/vscode-csharp HEAD:merge/prerelease-to-release
or if you are using SSH
git push git@github.com:dotnet/vscode-csharp HEAD:merge/prerelease-to-release

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/prerelease-to-release'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/prerelease-to-release origin/release
git pull https://github.com/dotnet/vscode-csharp merge/prerelease-to-release
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/vscode-csharp HEAD:merge/prerelease-to-release
or if you are using SSH
git fetch
git checkout -b merge/prerelease-to-release origin/release
git pull git@github.com:dotnet/vscode-csharp merge/prerelease-to-release
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/vscode-csharp HEAD:merge/prerelease-to-release

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

Copilot AI and others added 30 commits November 27, 2025 10:36
…plates

Added inline template patterns (@<tag>...</tag>) that properly switch
to HTML parsing mode when encountered inside C# contexts. This ensures
that attribute values like `class="..."` and `onclick='...'` are
tokenized as HTML attributes rather than C# strings.

Key changes:
- Added injection for source.cs scope to handle @<tag> patterns
- Added inline-template, inline-template-void-tag, and inline-template-non-void-tag patterns
- Updated razor-codeblock-body to include inline-template
- Updated test snapshots to reflect correct HTML tokenization

Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com>
Added 10 new test cases to razorTemplate.ts:
- Simple template with attribute
- Template with multiple attributes
- Template compared to normal HTML
- Void tag templates (input, hr, br, img, meta)
- Template with data attributes
- Template with event handler attributes

These tests provide coverage for the inline template grammar changes
and verify that attribute values are correctly tokenized as HTML.

Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com>
- Updated 'Template compared to normal HTML' test to include @Name.Length
  in attribute values, validating C# tokens in attribute contexts
- Added new test for directive attributes (@OnClick, @onmouseover)
  in inline templates

Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com>
Format long test strings by wrapping assertMatchesSnapshot arguments
across multiple lines to comply with line length limits.

Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com>
Added test for multi-line templates with attributes spanning multiple
lines, validating proper tokenization of HTML attributes and C# expressions
like @name within the template content.

Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com>
Added test case "Multi-line template with C# in attribute on second line"
that validates @Name.Length in a data-length attribute on a nested <span>
element that appears on the second line of a multi-line template.

Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com>
Bumps  and [jws](https://github.com/brianloveswords/node-jws). These dependencies needed to be updated together.

Updates `jws` from 3.2.2 to 3.2.3
- [Release notes](https://github.com/brianloveswords/node-jws/releases)
- [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md)
- [Commits](auth0/node-jws@v3.2.2...v3.2.3)

Updates `jws` from 4.0.0 to 4.0.1
- [Release notes](https://github.com/brianloveswords/node-jws/releases)
- [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md)
- [Commits](auth0/node-jws@v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: jws
  dependency-version: 3.2.3
  dependency-type: indirect
- dependency-name: jws
  dependency-version: 4.0.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
C# and C#DK are updating to run on .NET 10 runtime.
@github-actions github-actions bot requested review from a team as code owners February 4, 2026 19:19
Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approve

@dotnet-policy-service dotnet-policy-service bot merged commit 6cfd43a into release Feb 4, 2026
34 checks passed
@dotnet-policy-service dotnet-policy-service bot deleted the merge/prerelease-to-release branch February 4, 2026 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants