Consolidation before release (#1144)

Author: josefpihrt

.editorconfig

@@ -195,3 +195,7 @@ dotnet_diagnostic.IDE1006.severity = suggestion
 dotnet_diagnostic.RS1024.severity = none # Compare symbols correctly
 dotnet_diagnostic.RS1025.severity = none
 dotnet_diagnostic.RS1026.severity = none
+
+dotnet_diagnostic.CA1806.severity = none
+dotnet_diagnostic.CA1826.severity = none
+dotnet_diagnostic.CA2231.severity = none

ChangeLog.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [CLI] Bump Roslyn to 4.6.0 ([#1106](https://github.com/josefpihrt/roslynator/pull/1106)).
 - Bump Roslyn to 4.4.0 ([#1116](https://github.com/josefpihrt/roslynator/pull/1116)).
 - Migrate documentation to [Docusaurus](https://josefpihrt.github.io/docs/roslynator) ([#922](https://github.com/josefpihrt/roslynator/pull/922)).
+- [Testing Framework] Bump Roslyn to 4.6.0 ([#1144](https://github.com/josefpihrt/roslynator/pull/1144)).
 
 ### Fixed
 

src/Analyzers.CodeFixes/Analyzers.CodeFixes.csproj

@@ -20,11 +20,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(RoslynAnalyzersVersion)">
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(RoslynatorRoslynAnalyzersVersion)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynatorRoslynVersion)" />
   </ItemGroup>
 
   <ItemGroup>

src/Analyzers.CodeFixes/CSharp/CodeFixes/BinaryExpressionCodeFixProvider.cs

@@ -323,7 +323,7 @@ private static async Task<Document> RemoveUnnecessaryNullCheckAsync(
 
         SemanticModel semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
 
-        NullCheckExpressionInfo nullCheck = SyntaxInfo.NullCheckExpressionInfo(binaryExpressionInfo.Left, semanticModel, NullCheckStyles.HasValue | NullCheckStyles.NotEqualsToNull);
+        NullCheckExpressionInfo nullCheck = SyntaxInfo.NullCheckExpressionInfo(binaryExpressionInfo.Left, semanticModel, NullCheckStyles.HasValue | NullCheckStyles.NotEqualsToNull, cancellationToken: cancellationToken);
 
         var binaryExpression = right as BinaryExpressionSyntax;
 

src/Analyzers.CodeFixes/CSharp/CodeFixes/DirectiveTriviaCodeFixProvider.cs

@@ -79,9 +79,9 @@ private static Task<Document> RefactorAsync(
                 && disableOrRestoreKind == directive2.DisableOrRestoreKeyword.Kind())
             {
                 if (addComma)
-                    sb.Append(",");
+                    sb.Append(',');
 
-                sb.Append(" ");
+                sb.Append(' ');
 
                 SeparatedSyntaxList<ExpressionSyntax> errorCodes = directive2.ErrorCodes;
                 sb.Append(errorCodes.ToString());

src/Analyzers.CodeFixes/CSharp/CodeFixes/EnumDeclarationCodeFixProvider.cs

@@ -119,7 +119,7 @@ private static async Task<Document> SortEnumMembersAsync(
         CancellationToken cancellationToken)
     {
         SemanticModel semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-        SpecialType enumSpecialType = semanticModel.GetDeclaredSymbol(enumDeclaration).EnumUnderlyingType.SpecialType;
+        SpecialType enumSpecialType = semanticModel.GetDeclaredSymbol(enumDeclaration, cancellationToken).EnumUnderlyingType.SpecialType;
         SeparatedSyntaxList<EnumMemberDeclarationSyntax> members = enumDeclaration.Members;
 
         List<EnumMemberDeclarationSyntax> sortedList = members

src/Analyzers.CodeFixes/CSharp/CodeFixes/IfStatementCodeFixProvider.cs

@@ -237,7 +237,7 @@ private static IfStatementSyntax GetNewIfStatement(IfStatementSyntax ifStatement
         }
     }
 
-    private Task<Document> CallArgumentNullExceptionThrowIfNullAsync(
+    private static Task<Document> CallArgumentNullExceptionThrowIfNullAsync(
         Document document,
         IfStatementSyntax ifStatement,
         CancellationToken cancellationToken)

src/Analyzers.CodeFixes/CSharp/CodeFixes/ImplementNonGenericCounterpartCodeFixProvider.cs

@@ -190,7 +190,7 @@ private static async Task<Document> RefactorAsync(
         bool explicitImplementation,
         CancellationToken cancellationToken)
     {
-        SemanticModel semanticModel = await document.GetSemanticModelAsync().ConfigureAwait(false);
+        SemanticModel semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
 
         INamedTypeSymbol symbol = semanticModel.GetDeclaredSymbol(typeDeclaration, cancellationToken);
 

src/Analyzers.CodeFixes/CSharp/CodeFixes/RemoveRedundantBooleanLiteralCodeFixProvider.cs

@@ -86,7 +86,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
         }
     }
 
-    private void RegisterCodeFix(CodeFixContext context, string textToRemove, Func<CancellationToken, Task<Document>> createChangedDocument)
+    private static void RegisterCodeFix(CodeFixContext context, string textToRemove, Func<CancellationToken, Task<Document>> createChangedDocument)
     {
         CodeAction codeAction = CodeAction.Create(
             $"Remove redundant '{textToRemove}'",

src/Analyzers.CodeFixes/CSharp/CodeFixes/ReturnCompletedTaskInsteadOfNullCodeFixProvider2.cs

@@ -56,7 +56,7 @@ private static async Task<Document> RefactorAsync(
 
         int position = conditionalAccess.SpanStart;
 
-        string localName = NameGenerator.Default.EnsureUniqueLocalName(DefaultNames.Variable, semanticModel, position);
+        string localName = NameGenerator.Default.EnsureUniqueLocalName(DefaultNames.Variable, semanticModel, position, cancellationToken: cancellationToken);
 
         ITypeSymbol typeSymbol = semanticModel.GetTypeSymbol(expression, cancellationToken);