Merge release/dev17.1-vs-deps to main #58934
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
Spelling fixes
Assert compiler diagnostics in param-null checking test
Update CompilerNuGetCheckerUtil.cs
…mpletion don't include implicit/explicit keywords when completing explicit interface operator
Export VSTypeScriptFormattingService using a factory instead of directly
We had a test that looks like it was trying to test how our default container was created, but because it was testing with our VS MEF test infrastructure, it wasn't actually creating a workspace or MEF host like our public APIs would. This broke a lot of things, so now we have a test for it.
Co-authored-by: Andrew Hall <andrha@microsoft.com>
…ng-withanalyzerreferences Correctly update the list of generators for a call to WithAnalyzerReferences
…se/dev17.1-vs-deps Merge release/dev17.1 to release/dev17.1-vs-deps
…se/dev17.1-vs-deps Merge release/dev17.1 to release/dev17.1-vs-deps
Handle AdditiveSpans in either order
…se/dev17.1-vs-deps Merge release/dev17.1 to release/dev17.1-vs-deps
Introduce Parameter Should Not Try to Introduce on a Parameter
…-creation-failure Update tests to catch the MEF v2 creation failure
…merges/release/dev17.1-vs-deps-to-main * upstream/release/dev17.1-vs-deps: Cleanup missed suggestion Update src/Workspaces/Core/Portable/Classification/ClassifierHelper.cs SpillSequenceSpiller.Spill - ensure sequences under ref assignments are spilled. (#58657) (#58788) Correctly update the list of generators for a call to WithAnalyzerReferences Rename parameter for what it's actually doing Handle AdditiveSpans in either order Reduce Stack Trace Explorer automatic open behavior scope (#58819) Revert 58892 (#58930) Mark APIs as shipped (#58776) Revert "Merge pull request #57132 from CyrusNajmabadi/branchId3" Fix race in WorkCoordinator when handling document reanalysis Remove unnecessary lock access setting UIContexts in the workspace
Cosifne
removed
the
Merge Conflicts
ghost
added this to the 
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/dev17.1-vs-deps into main.
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 -t upstream/merges/release/dev17.1-vs-deps-to-main git reset --hard upstream/main git merge upstream/release/dev17.1-vs-deps # Fix merge conflicts git commit git push upstream merges/release/dev17.1-vs-deps-to-main --force