Merge main to features/MoveStaticMembers#55628
Merged
dotnet-bot merged 530 commits intofeatures/MoveStaticMembersfrom Aug 25, 2021
Merged
Merge main to features/MoveStaticMembers#55628dotnet-bot merged 530 commits intofeatures/MoveStaticMembersfrom
dotnet-bot merged 530 commits intofeatures/MoveStaticMembersfrom
Conversation
…806.11 (#55506) [main] Update dependencies from dotnet/roslyn
This is a hack to temporarily unblock further investigations
…/roslyn into bug/44214_extractmethod
* Create new document formatting provider for namespace declarations * Rename test
Try to fix the analyzer path when loading in OOP
* Remove unused obsolete APIs * Remove references to Microsoft.CodeAnalysis.Remote.Razor.ServiceHub
Switch to installing/uninstalling nuget packages in the BG instead of the UI thread
More changes from running dotnet-format on Roslyn. Version of dotnet-format run: 6.0.240501
…amespaces Fix generate type with file-scoped namespaces
🐇 Ensure recoverable syntax trees are pushed to temporary storage
…ttings Change preview pane to hide unusable options
Directly reference theme keys
Add a preview option for ServiceHub Core host
bdcecf2 to
9f6960a
Compare
… merges/main-to-features/MoveStaticMembers
* Remove CallerArgumentExpression feature flag
Consider MatchPriority when comparing CompletionItems when filter text is lowercase only
Update Build_Linux job to run on CoreEng build pool
…es/MoveStaticMembers
Contributor
|
Tests are failing because of a change in how Extract type helpers now formats new documents, from #55522. One of the changes is that it will automatically add a default accessibility modifier to a new class name based on .editorconfig preferences, which I think is a good change (although it's a shame that it doesn't happen in VB as well). I'll change the tests to be consistent with this change. |
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
20 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/MoveStaticMembers.
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/MoveStaticMembers git reset --hard upstream/features/MoveStaticMembers git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/MoveStaticMembers --force