Merge master to master-vs-deps #48835
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
This change ensures the main thread is not blocked by high-priority continuations while low priority operations are pending without an explicit event processing action.
This change ensures asynchronous operations in "earlier" stages which are triggered by later stages still cause the test to wait for full completion. The wait is complete when reaching a state where no pending tasks are in any category of interest. Fixes #48671
…orImplicitObjectCreation
Use an iterative wait in DiagnosticTaggerWrapper
Move to thread pool after yield in WaitAllAsync
Fix official build in dnceng
* Restore retry on integration tests The retry mechanism on integration tests is predicated on not having the `--html` option passed to RunTests. PR #48686 changed it to be unconditionally passed which ended up breaking retry. Undoing the unconditional passing of `--html` to fix retry.
Move VisualStudioTaskSchedulerProvider to the EditorFeatures layer
Run integration tests on scouting queue
Simplify generate-constructor logic for delegated constructors.
Remove inline tags when edits intersect them.
[LSP] Disable signature help in cloud scenario
|
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
|
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 (
|
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 master 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/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-master-vs-deps --force