Skip to content

[automated] Merge branch 'main' => 'prerelease'#9070

Merged
dotnet-policy-service[bot] merged 107 commits intoprereleasefrom
merge/main-to-prerelease
Mar 17, 2026
Merged

[automated] Merge branch 'main' => 'prerelease'#9070
dotnet-policy-service[bot] merged 107 commits intoprereleasefrom
merge/main-to-prerelease

Conversation

@github-actions
Copy link
Contributor

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

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

  • dibarbet
  • JoeRobich
  • Copilot
  • JakeRadMSFT
  • davidwengier
  • dotnet-policy-service[bot]
  • dependabot[bot]
  • dotnet-bot
  • WardenGnaw
  • RikkiGibson
  • invalid-email-address
  • siramvikram

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 main
git pull --ff-only
git checkout prerelease
git pull --ff-only
git merge --no-ff main

# 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/main-to-prerelease
or if you are using SSH
git push git@github.com:dotnet/vscode-csharp HEAD:merge/main-to-prerelease

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/main-to-prerelease'. 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/main-to-prerelease origin/prerelease
git pull https://github.com/dotnet/vscode-csharp merge/main-to-prerelease
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/vscode-csharp HEAD:merge/main-to-prerelease
or if you are using SSH
git fetch
git checkout -b merge/main-to-prerelease origin/prerelease
git pull git@github.com:dotnet/vscode-csharp merge/main-to-prerelease
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/vscode-csharp HEAD:merge/main-to-prerelease

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.

JoeRobich and others added 30 commits February 17, 2026 21:17
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
davidwengier and others added 22 commits March 9, 2026 13:43
Co-authored-by: dibarbet <5749229+dibarbet@users.noreply.github.com>
…ptions in all nls files

Co-authored-by: dibarbet <5749229+dibarbet@users.noreply.github.com>
…l nls files

Co-authored-by: dibarbet <5749229+dibarbet@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions github-actions bot requested a review from a team as a code owner March 17, 2026 16:45
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

Copy link
Member

@dibarbet dibarbet left a comment

Choose a reason for hiding this comment

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

need to make sure prerelease snaps to release first, otherwise these changes will overwrite the next release

Copy link
Member

@dibarbet dibarbet left a comment

Choose a reason for hiding this comment

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

release snap here - #9073

@dotnet-policy-service dotnet-policy-service bot merged commit 1f83645 into prerelease Mar 17, 2026
34 checks passed
@dotnet-policy-service dotnet-policy-service bot deleted the merge/main-to-prerelease branch March 17, 2026 18:50
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