Merge release/dev16.6 to release/dev16.6-vs-deps #43244
Merged
Conversation
This file contains hidden or 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
…hrow We had a race where if you were adding a project's output path, that could potentially convert metadata references in other projects to project references, and in the process we would stop watching for file changes any of the converted references. If at the same time you removed the project that contained the reference being converted, we might end up stopping watching file watches twice, and the second would throw. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/957715
Fix override completion to preserve added imports
…her-race Fix race where updating an output path and removing a project could throw
Restrict whitespace collapse between methods to Metadata As Source
dotnet-bot
added
Area-Infrastructure
auto-merge
Merge Conflicts
dibarbet
removed
the
Merge Conflicts
ghost
merged commit
dotnet-bot
restored the
merges/release/dev16.6-to-release/dev16.6-vs-deps
branch
dotnet-bot
deleted the
merges/release/dev16.6-to-release/dev16.6-vs-deps
branch
dotnet-bot
restored the
merges/release/dev16.6-to-release/dev16.6-vs-deps
branch
dotnet-bot
deleted the
merges/release/dev16.6-to-release/dev16.6-vs-deps
branch
dotnet-bot
restored the
merges/release/dev16.6-to-release/dev16.6-vs-deps
branch
dotnet-bot
deleted the
merges/release/dev16.6-to-release/dev16.6-vs-deps
branch
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.6 into release/dev16.6-vs-deps.
git fetch --all git checkout merges/release/dev16.6-to-release/dev16.6-vs-deps git reset --hard upstream/release/dev16.6-vs-deps git merge upstream/release/dev16.6 # Fix merge conflicts git commit git push upstream merges/release/dev16.6-to-release/dev16.6-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.