Skip to content

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:

  • dotnet-policy-service[bot]
  • siramvikram
  • WardenGnaw
  • dibarbet
  • Copilot
  • davidwengier
  • JoeRobich
  • dotnet-maestro-bot
  • dotnet-bot

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.

dotnet-bot and others added 30 commits October 8, 2025 17:54
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Copilot AI and others added 22 commits October 15, 2025 20:14
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
…operty

Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Co-authored-by: dibarbet <5749229+dibarbet@users.noreply.github.com>
This updates to a new version of the debugger with the following changes:

- Updates the underlying managed<->native marshalling technology that the debugger is implemented with to use COM Wrapper, which includes this potential breaking change to Concord extensions: microsoft/ConcordExtensibilitySamples#124
- Numerous bug fixes to match what is shipping with Visual Studio 18.0
@github-actions github-actions bot requested review from a team as code owners October 22, 2025 18:41
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 c32ee9a into prerelease Oct 22, 2025
28 checks passed
@dotnet-policy-service dotnet-policy-service bot deleted the merge/main-to-prerelease branch October 22, 2025 19:01
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.

8 participants