Skip to content
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

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

Merged
merged 23 commits into from
Aug 17, 2024

Conversation

github-actions[bot]
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
  • stmoor
  • WardenGnaw
  • JoeRobich
  • dotnet-bot
  • etvorun

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.

git checkout -b merge/main-to-prerelease 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 checkout -b merge/main-to-prerelease 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 23 commits August 9, 2024 22:33
…6a5b2fb6a4a9b3ff4ba6d

Localization result based on 74ca6c9
…cf2c15bda9182f3d9fd8a

Localization result based on 5b82247
[automated] Merge branch 'prerelease' => 'main'
…9ef2ad9e4cb098a890f2f

Localization result based on 4b726e7
This updates making the `stackTrace.startFrame` DAP be optional and mscoredbi version bump.
[automated] Merge branch 'prerelease' => 'main'
Bump Roslyn to 4.12.0-2.24416.3 and update changelog
@github-actions github-actions bot requested a review from a team as a code owner August 17, 2024 00:27
@dibarbet dibarbet merged commit a953d8f into prerelease Aug 17, 2024
15 checks passed
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.

6 participants