Skip to content

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

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.

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

Merged
merged 129 commits into from
May 10, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 9, 2025

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:

  • dibarbet
  • genlu
  • JoeRobich
  • ryzngard
  • davidwengier
  • invalid-email-address
  • dotnet-policy-service[bot]
  • dotnet-bot
  • dependabot[bot]
  • spadapet
  • WardenGnaw
  • DianaSoltani

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.

dibarbet and others added 30 commits March 29, 2025 01:45
The C# extension requires access to the workspace files in order to run design-time builds.
Changes:

- Bug fixes to bring the debugger up to date with Visual Studio 17.14
- A partial fix for Debug Console reports "Evaluation timed out" when lambda expressions are used with large collections #8014 -- long evaluations from the Debug Console will now trigger a progress dialog instead of using a timeout, as well as some performance improvements to the debugger's IL interpreter
- Updated mono debugger
@github-actions github-actions bot requested review from a team as code owners May 9, 2025 23:06
@dotnet-policy-service dotnet-policy-service bot enabled auto-merge May 9, 2025 23:06
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

@dibarbet dibarbet disabled auto-merge May 10, 2025 03:16
@dibarbet dibarbet merged commit 3368f98 into release May 10, 2025
21 of 24 checks passed
@dibarbet dibarbet deleted the merge/prerelease-to-release branch May 10, 2025 03:16
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