Merge main to features/list-patterns#56201
Merged
dotnet-bot merged 83 commits intofeatures/list-patternsfrom Sep 14, 2021
Merged
Merge main to features/list-patterns#56201dotnet-bot merged 83 commits intofeatures/list-patternsfrom
dotnet-bot merged 83 commits intofeatures/list-patternsfrom
Conversation
Remove OneLoc job from dev16.11
…o-release/dev17.0
…-to-release/dev17.0 Merge release/dev16.11-vs-deps to release/dev17.0
This was a method that was supposed to produce a Solution that was functionally identical to the original one, but didn't share any trees or compilations; the idea was if you were going to create a lot of allocations analyzing a part of the Solution that isn't needed to be kept around, you don't want those trees/compilations being held by the same Solution object everybody else is holding onto. At this point, almost nobody uses this. We don't even have a single test ensuring it actually works. It also seems at this point it only would have isolated compilations: text and trees would have been shared anyways. I searched across GitHub and several internal Microsoft repositories and the only uses I could come across were two uses in ASP.NET Razor unit tests, which call it on an empty Solution snapshot which doesn't make sense anyways.
esnure path to global config file is correctly cased
Update publish data for P4 and change main to draft until VS snaps
Remove use of WaitAndGetResult from FAR
remove WaitAndGetResult from Preview generation code.
…ialization Wait for the workspace to be initialized
Remove dead code in the compilation tracker.
Merge release/dev17.0 to main
…Search Remove legacy progression search
… 20210902.1 (#56166) [main] Update dependencies from dotnet/source-build
* Add logging event source * Track timing information in the generator driver - Expose via runrunresult and ETW - Extract out helper from event source - Add extension methods to create a start/stop pair of events the driver can use
…eatures-in-generated-documents Wire up the feature flag properly for opening source generated files
EditorFeatures.Wpf is supposed to be independent of the VS Shell, the idea is this layer can be hosted in other applications using the VS editor but not VS itself. This re-adds indirection for fetching the dashboard colors, but now only does it when the dashboard is opened. While I was here I ended up renaming CodeAnalysisColors to DashboardColors which is a bit clearer what it is.
Merge release/dev17.0 to main
…-layering Don't reference VS Shell binaries in EditorFeatures.Wpf
277c621 to
c8deeaa
Compare
JoeRobich
approved these changes
Sep 14, 2021
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
16 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 main into features/list-patterns.
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/main-to-features/list-patterns git reset --hard upstream/features/list-patterns git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/list-patterns --force