Merge master to features/UsedAssemblyReferences#42434
Merged
1179 commits merged intofeatures/UsedAssemblyReferencesfrom Mar 18, 2020
Merged
Merge master to features/UsedAssemblyReferences#424341179 commits merged intofeatures/UsedAssemblyReferencesfrom
1179 commits merged intofeatures/UsedAssemblyReferencesfrom
Conversation
…ualStudioDesignerAttributeService.cs
…into designerOOP
Port QualifyMemberAccess analyzer and fixer to shared layer
… in the changed options keys for the solution snapshot. Also updated the newly added unit test to explicitly test this scenario that was caught by integration tests.
Track changed option keys in global option service so the serializabl…
Move the project telemetry collection out of process.
Fix #42259 caused by use of incorrect binder when checking ref return type.
…ion of the result and shouldn't report any diagnostics for it if the type it is called for doesn't implement the interface, unless the mentioned operations affect resulting symbol. (#42405) ComputeImplementationForInterfaceMember shouldn't perform any validation of the result and shouldn't report any diagnostics for it if the type it is called for doesn't implement the interface, unless the mentioned operations affect resulting symbol. Fixes #42340.
* Fix crash when compiling internal attribute constructor * PR feedback * Add new rule to refout.md
Show <remarks> documentation in Quick Info
Introduce explicit downcast refactoring if a variable requires a cast to compile
Enable file header analyzer (IDE0073) in build
…opup C# Completion Popup in Argument Lists
Tweak how we generate the IDisposable.Dispose pattern.
* Improve error recovery when parsing incomplete base lists. * Add tests * Fix test * Test added
bug fix for #41371
…316.3 (#42494) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20166.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Contributor
|
I am working on the merge resolution. |
This pull request was closed.
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
15 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 features/UsedAssemblyReferences.
git fetch --all git checkout merges/master-to-features/UsedAssemblyReferences git reset --hard upstream/features/UsedAssemblyReferences git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/UsedAssemblyReferences --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.