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

Merged
merged 18 commits into from
Oct 7, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 7, 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
  • genlu

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.

dibarbet and others added 18 commits September 27, 2024 23:00
[automated] Merge branch 'prerelease' => 'main'
Co-authored-by: David Barbet <dibarbet@gmail.com>
Update changelog based on last roslyn update
Update registerRelatedFilesProvider API
This allows the Roslyn LSP to return document references with a
roslyn-source-generated URI, and we'll turn around and ask the LSP
for those files when they're opened.

For now we don't worry about refreshing files if they've changed,
just to keep this simple.
Add a TextDocumentContentProvider for source-generated files
@github-actions github-actions bot requested review from a team as code owners October 7, 2024 16:52
@dibarbet dibarbet enabled auto-merge October 7, 2024 16:53
@dibarbet dibarbet disabled auto-merge October 7, 2024 17:14
@dibarbet dibarbet merged commit 17c9cbb into prerelease Oct 7, 2024
16 of 18 checks passed
@dibarbet dibarbet deleted the merge/main-to-prerelease branch October 7, 2024 17:14
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.

4 participants