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' #7758

Merged
merged 36 commits into from
Nov 9, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 9, 2024

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
  • ryzngard
  • etvorun
  • dotnet-bot
  • JoeRobich
  • Cosifne
  • WardenGnaw

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.

WardenGnaw and others added 30 commits October 30, 2024 18:19
Disable server restart command with devkit
…a69780d43a57c1d5be6aa

Localization result based on 802be73
[automated] Merge branch 'prerelease' => 'main'
…6feb01ad2a3f9a5d4ace6

Localization result based on ccfca2b
Localize all the string passed into CreateOutputChannel
…8b0d3415ed11f6d5cf6d9

Localization result based on c51b3c7
[automated] Merge branch 'prerelease' => 'main'
Adds a new rename test and updates the test project to be more modern and target net6. Makes razor integration tests run on windows only until issues with linux/mac are identified and fixed
…d51deeffbbbae7a5f652d

Localization result based on 850affd
Update Debugger Packages for v2.55.0
…4d269fef5594ef974fc15

Localization result based on a9cf04f
Update Roslyn to 4.13.0-2.24557.5
…5f4ec1767ca6e7cd82ea7

Localization result based on d1af62b
@github-actions github-actions bot requested review from a team as code owners November 9, 2024 00:02
@dibarbet dibarbet enabled auto-merge November 9, 2024 00:04
@dibarbet dibarbet disabled auto-merge November 9, 2024 00:21
@dibarbet dibarbet merged commit ae70dac into prerelease Nov 9, 2024
13 of 16 checks passed
@dibarbet dibarbet deleted the merge/main-to-prerelease branch November 9, 2024 00:21
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.

7 participants