Merge master to master-vs-deps#51176
Merged
JoeRobich merged 47 commits intomaster-vs-depsfrom Feb 12, 2021
Merged
Conversation
We are responsible for filling out the contents under the Analyzers node where we put the list of analyzers, generators, and information about them. To do this we have to go from an IVsHierarchy and item in the Solution Explorer to a Roslyn project. Our code was trying to take the IVsHierarchy and item to get a project path and TFM, and then trying to walk through our projects to find a project associated with the same project path and TFM. This code however was written back when there was a wrapper hierarchy for each project in a multi-targeted project which hasn't been the case for some time. The project system is now passing us what is roughly a TFM through IWorkspaceProjectContext which we can use to match up and select the correct Roslyn Project in the multitargeting case. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1275676
The equality fo a DocumentId is defined by comparing the GUID of the DocumentId and the GUID of the ProjectId, so it's already the case that if we have two generated documents with the same hint path we'll end up with different DocumentIds. However, if anybody tries getting 'clever' with the GUID of the DocumentId (or are just inspecting it in a debugger) it might get confusing. This ensures they're different. Fixes #50714
…ulti-targeting-handling Fix source generator multi-targeting handling
Now that tree edits are computed for statement syntax, there is no guarantee nodes will be labelled
Fix suggestion mode when triggered with delete
EnC - Add rude edits for local functions attributes and type parameters
…-them-all lock down the MEF types that we can
Add database path to connection string for shared-memory correctness
Merge release/dev16.9 to master
Update authoring for sqlitepcl 2.0.4
af31ddd to
7d3f07c
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.
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