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 'prerelease' => 'release' #7499

Merged
merged 165 commits into from
Aug 30, 2024

Conversation

github-actions[bot]
Copy link
Contributor

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
  • stmoor
  • ryzngard
  • JoeRobich
  • dotnet-bot
  • jordi1215
  • WardenGnaw
  • etvorun
  • mgoertz-msft
  • arkalyanms
  • github-actions[bot]
  • lizharems
  • phil-allen-msft
  • davidwengier
  • tmat
  • Cosifne

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.

git checkout -b merge/prerelease-to-release 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 checkout -b merge/prerelease-to-release 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.

JoeRobich and others added 30 commits July 12, 2024 15:32
…d765bb3592eeb88968b28

Localization result based on a3d678e
Update main version in branch snap github action
- Sets the workspace status item to the Warning state to display an indicator that there has been an issue.
- Provides easy access to restart the LSP server.
Update the workspace status bar when the server is stopped.
…55f3b4fc806a1cd1a52e6

Localization result based on 353ebcf
Add github action for scheduled branch merge
…30094f7c75ce4ba6400c5

Localization result based on 2882247
Fix gotodef integration test failures throwing cancellation
dibarbet and others added 24 commits August 16, 2024 16:39
Bump Roslyn to 4.12.0-2.24416.3 and update changelog
[automated] Merge branch 'main' => 'prerelease'
[automated] Merge branch 'prerelease' => 'main'
Add option to disable completion in argument lists
* provide provisional completion for razor

* temporarily adding provision dot for both completion and resolve completion requests

* used vscode.workspace.onDidChangeTextDocument to ensure virtual doc changes
Update to commit: da79940a3af779e3dc973baa1e4e6ebfa100abe1
…4705dfb6bcb136c1448ab

Localization result based on b091d86
Update Roslyn to 4.12.0-2.24422.6
[automated] Merge branch 'main' => 'prerelease'
@github-actions github-actions bot requested review from a team as code owners August 30, 2024 23:22
@dibarbet dibarbet merged commit 78a4dcf into release Aug 30, 2024
16 checks passed
@dibarbet dibarbet deleted the merge/prerelease-to-release branch August 30, 2024 23:45
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.