Merge master to features/param-nullchecking#36077
Merged
176 commits merged intofeatures/param-nullcheckingfrom Jun 4, 2019
Merged
Merge master to features/param-nullchecking#36077176 commits merged intofeatures/param-nullcheckingfrom
176 commits merged intofeatures/param-nullcheckingfrom
Conversation
# Conflicts: # src/Features/CSharp/Portable/CSharpFeaturesResources.resx # src/Features/Core/Portable/Diagnostics/Analyzers/IDEDiagnosticIds.cs
…ionDiagnosticAnalyzer Fixes #36086
Avoid renaming methods that don't change return type
Respect code style option severity in ConvertSwitchStatementToExpress…
Use diagnostichelper and properly pass along severity.
* Use IVsSolution to look up IVsHierarchy by project GUID * Fix * Fix mocks * Add missing file * Fix bad merge * Fix merge
Fix import completion telemetry
Additionally, we do not mark the package reference to in Features.csproj as PrivateAsset as this leads to the assembly not getting included in the Features NuGet package and causes Omnisharp's analyzer execution to throw missing dependency assembly load errors. Also update ExpectedDependency in DevDivInsertionFiles.csproj
Upgrade Microsoft.CodeAnalysis.FlowAnalysis.Utilities PackageReference to latest version
Don't offer 'convert if to conditional' if it crosses a preprocessor directive.
…o merges/master-to-features/param-nullchecking
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
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 master into features/param-nullchecking.
git fetch --all git checkout merges/master-to-features/param-nullchecking git reset --hard upstream/features/param-nullchecking git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/param-nullchecking --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.