Merge release/dev16.8-vs-deps to master-vs-deps #48181
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We weren't rewriting arguments during local rewrite, meaning that steps like out var discards and in refkind adjustment weren't occuring. We now do that. Fixes #47487.
Expands #47903 to other calls to GetProxyAsync.
Ensure IServiceBroker is used on a background thread
Mark all APIs as shipped for the 16.8 release.
…se/dev16.8-vs-deps Merge release/dev16.8 to release/dev16.8-vs-deps
* Prevent potential deadlocks when reading/writing assets * Fix * Handle cancellation during reading version bytes * Fix * Make sure to complete the pipe reader/writer even when canceling * Fix * Feedback * Always complete reader, complete writer on error * Fix comment * Reorder conditions in exception handler * Feedback * Only treat OCE triggred by incorrect token as critical error in debug builds * Feedback * Logging
…se/dev16.8-vs-deps Merge release/dev16.8 to release/dev16.8-vs-deps
Delete unused method
Update TypeImportCompletionProviderTests with records
Rewrite function pointer arguments during local rewrite
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
|
Hello @dotnet-bot! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉 p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
…se/dev16.8-vs-deps Merge release/dev16.8 to release/dev16.8-vs-deps
Merge master to master-vs-deps
…se/dev16.8-vs-deps Merge release/dev16.8 to release/dev16.8-vs-deps
|
@tmat |
…merges/release/dev16.8-vs-deps-to-master-vs-deps
ghost
merged commit 
ghost
added this to the
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from release/dev16.8-vs-deps into master-vs-deps.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout merges/release/dev16.8-vs-deps-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/release/dev16.8-vs-deps # Fix merge conflicts git commit git push upstream merges/release/dev16.8-vs-deps-to-master-vs-deps --force