Merge main with conflicts #57278
Merged
Merge main with conflicts #57278
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
…-release/dev17.0-vs-deps Merge release/dev17.0 to release/dev17.0-vs-deps
Use document options to create a correct EOL in file header code fix
Use bulk unsubscribe operations in FileChangeWatcher
…mplification/Simplifiers/CastSimplifier.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
…mplification/Simplifiers/CastSimplifier.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
…mabadi/roslyn into removeUnnecessaryCastV2
…mplification/Simplifiers/CastSimplifier.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
…mabadi/roslyn into removeUnnecessaryCastV2
Async lightbulb performance improvement for compiler analyzer execution
…re-status-2 Update Language Feature Status.md
Completion: Suggest "await" after dot of awaitable expression
Remove unnecessary Symbol type checks
…-main Merge release/dev17.0 to main
…-main Merge release/dev17.0 to main
Fix ServiceHub Core host option
…-main Merge release/dev17.0 to main
* Enable named mutex workaround when running on .NET using Mono runtime * Re-implement file locking logic to ensure intra- and inter-process mutual exclusion, and no longer leak lock files * Use mutex abstraction throughout test suite * Fix async race in ServerFailsWithLongTempPathUnix test case * Fixes dotnet#57002
Member
|
Rubber stamp asked for, rubber stamp delivered |
jaredpar
approved these changes
Oct 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
23 participants
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.
Related to #36024
Straight merge of 'main' to the param-nullchecking feature branch. All the conflict markers are left in and will be resolved in a follow-up PR.
I started to try and do some tricks with merging to a merges/ branch first, and PRing the conflict resolutions to the merges/ branch, but I think makign the squashing work how we want to avoid conflict markers in "real" commits is going to be harder than anticipated and not worth the hassle.