Merge main to features/required-members#61447
Merged
dotnet-bot merged 113 commits intofeatures/required-membersfrom May 23, 2022
Merged
Merge main to features/required-members#61447dotnet-bot merged 113 commits intofeatures/required-membersfrom
dotnet-bot merged 113 commits intofeatures/required-membersfrom
Conversation
…on_101 Merge 'main' into 'DefaultInterfaceImplementation'
…61134) https://github.com/dotnet/csharplang/blob/main/proposals/static-abstracts-in-interfaces.md Test plan: #60968 Tests in DefaultInterfaceImplementationTests.cs are adjusted only for methods. Tests for other members will be adjusted separately.
Use proper variable group for generating insertions
…-to-release/dev17.0-vs-deps Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps
…CompilationTracker.cs
…reated as identifiers
Avoid logging work when no logger is specified
* Small logging cleanup on pull diagnostics code * Update tests to account for lsp diagnostics throwing when mismatch in diagnostic mode
Previously text was bound to properties on the control type using x:Name. This restores that
Add FixAll support for UseExpressionBody/BlockBody refactoring
Merge "numeric IntPtr" feature
…mentation' into DefaultInterfaceImplementation_115
Collaborator
Author
|
⚠ This PR has merge conflicts. @333fred |
…ures/required-members * upstream/main: (73 commits) Allow source link, embedded or decompiled source in Peek Definition (#61427) More instrumentation for ReferenceCachingCS (#61402) Fix build Fix binding for checkbox text in rename dialogs (#61430) Address feedback from numeric IntPtr feature review (#61418) [LSP] Small cleanup for pull diagnostics logging (#61417) Avoid logging work when no logger is specified Wait for async operations to complete before proceeding Fix function id (#61400) More correctly respect background analysis scope (#61392) Add new collapsing option for metadata files that contain source (#61205) Fix typo (#61380) Use AspNetCoreKey to external access assembly Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Update src/Features/Core/Portable/InheritanceMargin/AbstractInheritanceMarginService_Helpers.cs Parse `unchecked` gracefully in operators (#61309) Add lambda parameters in scope in nameof using proper binder (#61382) Verify classification on var pattern (#61376) Verifying interpolation escaping of curlies in content (#61387) Fix ...
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
18 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