Merge main to features/required-members#59971
Merged
dotnet-bot merged 134 commits intofeatures/required-membersfrom Mar 15, 2022
Merged
Merge main to features/required-members#59971dotnet-bot merged 134 commits intofeatures/required-membersfrom
dotnet-bot merged 134 commits intofeatures/required-membersfrom
Conversation
… back to old UI for now.
This adds the most basic implementation of the new rename UI. This PR is mostly to move code around and start a very ugly but workable demo. None of the behavior in the new UI is final, but it should make subsequent code reviews easier to parse in chunks as we modify the behavior.
Update features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
Features/rename_UI_rework Merge Main
…ui_rework Merge main to features/rename_ui_rework
Merge main into feature branch
…merges/main-to-features/rename_ui_rework
…ui_rework Merge main to features/rename_ui_rework
This was removed in #59567, just before the vscode API went stable and O# could finally take advantage of it. This adds the EA back. I also added Joey and I to the codeowners file so we can be aware of any future changes. Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
Avoid deadlock while loading ExtensionManagerPackage for integration tests
[main] Update dependencies from dotnet/source-build-externals
Collaborator
Author
|
⚠ This PR has merge conflicts. @333fred |
* Change root namespaces * AddImport * AutomaticCompletion * BraceMatching * ChangeSignature * Classification * CodeActions * CodeDefinitionWindow * CodeRefactorings * CommentSelection * Interactive * CommentSelection fixes * Fix
* Annotate BreakpointSpans and fix NREs * Fixes
[main] Update dependencies from dotnet/roslyn
…om-ref-structs Exclude object's methods from ref struct completion list
…ures/required-members * upstream/main: (78 commits) [main] Update dependencies from dotnet/roslyn (#59792) Annotate BreakpointSpans and fix NREs (#59846) Editor namespaces refactoring - part 1 (#59907) [main] Update dependencies from dotnet/source-build-externals (#59845) Update PublishData.json (#59952) ...and the comment Revert the last change in the compiler layer Force SVsExtensionManager to load before InProcComponent creation Handle nameof situation, moved logic back to workspaces layer Add back OmniSharpInlineHints (#59941) Initialize AsyncCompletionTracker in a fire-and-forget manner Try to load the extension manager from the main thread as well Use the correct GUID for SVsUserNotificationsService Update CodeStyle/format/SDK versions (#59903) Create attribute default arguments during binding (#59750) Undo refactoring part 2 Undo refactoring Move logic of symbol filtering to compiling layer. Refactoring Clean up diagnostic and solution crawler options - take 2 (#59233) Add quotes in string for clarity ...
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
13 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/required-members.
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/main-to-features/required-members git reset --hard upstream/features/required-members git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/required-members --force