Skip to content

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

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 183 commits into from
Mar 15, 2025

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:

  • ryzngard
  • dotnet-policy-service[bot]
  • JoeRobich
  • invalid-email-address
  • DianaSoltani
  • dibarbet
  • anchimna
  • davidwengier
  • dotnet-bot
  • gregg-miskelly
  • Navid-JL

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 [email protected]: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 [email protected]:dotnet/vscode-csharp merge/prerelease-to-release
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]: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.

Navid-JL and others added 30 commits May 16, 2023 18:50
DianaSoltani and others added 24 commits March 5, 2025 11:30
Co-authored-by: Ankita Khera <[email protected]>
* Don't use an implicit-object if the lang version doesn't support it (PR: [#77437](dotnet/roslyn#77437))
* Fix issue where we were changing semantics when converting to a collection expr. (PR: [#77417](dotnet/roslyn#77417))
* Detect and emit more idiomatic null check patterns (PR: [#77412](dotnet/roslyn#77412))
* Partial events and constructors: IDE (PR: [#77337](dotnet/roslyn#77337))
* Simplify keyword recommenders. (PR: [#77396](dotnet/roslyn#77396))
* Remove async/await (PR: [#77397](dotnet/roslyn#77397))
* Preserve encoding during DocumentState updates (PR: [#77354](dotnet/roslyn#77354))
* Don't realize the SourceText in SyntaxTree.OverlapsHiddenPosition if not needed (PR: [#77334](dotnet/roslyn#77334))
* Handle ModuleCancellationTokenExpression in AbstractFlow visitor (PR: [#77310](dotnet/roslyn#77310))
* PERF: Reduce the number of nodes walked during import completion commit. (PR: [#77305](dotnet/roslyn#77305))
* Allow expression body refactorings on non empty selections (PR: [#76969](dotnet/roslyn#76969))
* Partial events and constructors: public API (PR: [#77202](dotnet/roslyn#77202))
* Refresh diagnostics when fading options change (PR: [#77322](dotnet/roslyn#77322))
* Reduce allocations during completion in FilterToVisibleAndBrowsableSymbols (PR: [#77315](dotnet/roslyn#77315))
* Change override completion to select text after updating the buffer. (PR: [#76983](dotnet/roslyn#76983))
* Fix false positive 'Unnecessary assignment of a value' (PR: [#77297](dotnet/roslyn#77297))
This reverts commit 80d18a9.
@github-actions github-actions bot requested review from a team as code owners March 14, 2025 23:48
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

@dotnet-policy-service dotnet-policy-service bot merged commit 2e60cf1 into release Mar 15, 2025
28 checks passed
@dotnet-policy-service dotnet-policy-service bot deleted the merge/prerelease-to-release branch March 15, 2025 00:01
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