Consolidation before release (#1144)

dotnet · Jul 31, 2023 · 3228b9a · 3228b9a
1 parent 5ebe544
commit 3228b9a
Show file tree

Hide file tree

Showing 120 changed files with 233 additions and 284 deletions.
diff --git a/.editorconfig b/.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
diff --git a/ChangeLog.md b/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
 

diff --git a/src/Analyzers.CodeFixes/Analyzers.CodeFixes.csproj b/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>

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/BinaryExpressionCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/BinaryExpressionCodeFixProvider.cs
@@ -323,7 +323,7 @@ private static ConditionalAccessExpressionSyntax CreateConditionalAccess(Express
 
         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;
 

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/DirectiveTriviaCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/DirectiveTriviaCodeFixProvider.cs
@@ -79,9 +79,9 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                 && disableOrRestoreKind == directive2.DisableOrRestoreKeyword.Kind())
             {
                 if (addComma)
-                    sb.Append(",");
+                    sb.Append(',');
 
-                sb.Append(" ");
+                sb.Append(' ');
 
                 SeparatedSyntaxList<ExpressionSyntax> errorCodes = directive2.ErrorCodes;
                 sb.Append(errorCodes.ToString());

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/EnumDeclarationCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/EnumDeclarationCodeFixProvider.cs
@@ -119,7 +119,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
         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

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/IfStatementCodeFixProvider.cs b/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)

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/ImplementNonGenericCounterpartCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/ImplementNonGenericCounterpartCodeFixProvider.cs
@@ -190,7 +190,7 @@ private static MethodDeclarationSyntax CreateMethodDeclaration(string text, bool
         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);
 

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/RemoveRedundantBooleanLiteralCodeFixProvider.cs b/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}'",

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/ReturnCompletedTaskInsteadOfNullCodeFixProvider2.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/ReturnCompletedTaskInsteadOfNullCodeFixProvider2.cs
@@ -56,7 +56,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 
         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);
 

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/UseExplicitTypeInsteadOfVarCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/UseExplicitTypeInsteadOfVarCodeFixProvider.cs
@@ -82,7 +82,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
         }
     }
 
-    private void RegisterCodeFix(CodeFixContext context, TypeSyntax type, ITypeSymbol typeSymbol, SemanticModel semanticModel)
+    private static void RegisterCodeFix(CodeFixContext context, TypeSyntax type, ITypeSymbol typeSymbol, SemanticModel semanticModel)
     {
         foreach (Diagnostic diagnostic in context.Diagnostics)
         {

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/UseHasFlagMethodOrBitwiseOperatorCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/UseHasFlagMethodOrBitwiseOperatorCodeFixProvider.cs
@@ -57,7 +57,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
         }
     }
 
-    private async Task<Document> ConvertBitwiseOperationToHasFlagCallAsync(
+    private static async Task<Document> ConvertBitwiseOperationToHasFlagCallAsync(
         Document document,
         BinaryExpressionSyntax equalsOrNotEquals,
         CancellationToken cancellationToken)

diff --git a/...alyzers.CodeFixes/CSharp/CodeFixes/UsePatternMatchingInsteadOfIsAndCastCodeFixProvider.cs b/...alyzers.CodeFixes/CSharp/CodeFixes/UsePatternMatchingInsteadOfIsAndCastCodeFixProvider.cs
@@ -111,7 +111,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
 
         string name = NameGenerator.CreateName(typeSymbol, firstCharToLower: true) ?? DefaultNames.Variable;
 
-        name = CSharpNameGenerator.Default.EnsureUniqueLocalName(name, semanticModel, node.SpanStart, cancellationToken: cancellationToken) ?? DefaultNames.Variable;
+        name = CSharpNameGenerator.EnsureUniqueLocalName(name, semanticModel, node.SpanStart, cancellationToken: cancellationToken) ?? DefaultNames.Variable;
 
         IsPatternExpressionSyntax isPatternExpression = IsPatternExpression(
             isInfo.Expression,

diff --git a/src/Analyzers.CodeFixes/CSharp/CodeFixes/UseStringComparisonCodeFixProvider.cs b/src/Analyzers.CodeFixes/CSharp/CodeFixes/UseStringComparisonCodeFixProvider.cs
@@ -109,7 +109,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
         }
     }
 
-    private bool RegisterCodeFix(
+    private static bool RegisterCodeFix(
         CodeFixContext context,
         Diagnostic diagnostic,
         BinaryExpressionSyntax binaryExpression,
@@ -155,7 +155,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
         return document.ReplaceNodeAsync(binaryExpression, newNode, cancellationToken);
     }
 
-    private bool RegisterCodeFix(
+    private static bool RegisterCodeFix(
         CodeFixContext context,
         Diagnostic diagnostic,
         SimpleMemberInvocationExpressionInfo invocationInfo,

diff --git a/...nalyzers.CodeFixes/CSharp/Refactorings/Documentation/DocumentationCommentRefactoring`1.cs b/...nalyzers.CodeFixes/CSharp/Refactorings/Documentation/DocumentationCommentRefactoring`1.cs
@@ -91,7 +91,7 @@ internal abstract class DocumentationCommentRefactoring<TNode> where TNode : Syn
                     .Append(elementInfo.Name)
                     .Append("\"></")
                     .Append(elementName)
-                    .Append(">");
+                    .Append('>');
 
                 if (elementInfo.NewLinePosition == NewLinePosition.End)
                     sb.AppendLine();

diff --git a/src/Analyzers.CodeFixes/CSharp/Refactorings/FormatEachStatementOnSeparateLineRefactoring.cs b/src/Analyzers.CodeFixes/CSharp/Refactorings/FormatEachStatementOnSeparateLineRefactoring.cs
@@ -23,7 +23,7 @@ internal static class AddNewLineBeforeStatementRefactoring
         {
             var block = (BlockSyntax)statement.Parent;
 
-            if (block.IsSingleLine(includeExteriorTrivia: false))
+            if (block.IsSingleLine(includeExteriorTrivia: false, cancellationToken: cancellationToken))
             {
                 SyntaxTriviaList triviaList = block.CloseBraceToken.LeadingTrivia
                     .Add(CSharpFactory.NewLine());

diff --git a/src/Analyzers.CodeFixes/CSharp/Refactorings/SimplifyNullCheckRefactoring.cs b/src/Analyzers.CodeFixes/CSharp/Refactorings/SimplifyNullCheckRefactoring.cs
@@ -46,9 +46,9 @@ internal static class SimplifyNullCheckRefactoring
             coalesce = true;
 
             // If the types are polymorphic then the LHS of the null coalesce must be cast to the base type.
-            ITypeSymbol newNodeType = semanticModel.GetTypeSymbol(newNode);
-            ITypeSymbol whenNullType = semanticModel.GetTypeSymbol(whenNull);
-            ITypeSymbol overallType = semanticModel.GetTypeInfo(conditionalExpression).ConvertedType;
+            ITypeSymbol newNodeType = semanticModel.GetTypeSymbol(newNode, cancellationToken);
+            ITypeSymbol whenNullType = semanticModel.GetTypeSymbol(whenNull, cancellationToken);
+            ITypeSymbol overallType = semanticModel.GetTypeInfo(conditionalExpression, cancellationToken).ConvertedType;
 
             if (overallType?.SupportsExplicitDeclaration() == true
                 && !SymbolEqualityComparer.Default.Equals(newNodeType, whenNullType))

diff --git a/src/Analyzers/Analyzers.csproj b/src/Analyzers/Analyzers.csproj
@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <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" Version="$(RoslynVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynatorRoslynVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Analyzers/CSharp/Analysis/BinaryOperatorAnalyzer.cs b/src/Analyzers/CSharp/Analysis/BinaryOperatorAnalyzer.cs
@@ -69,7 +69,7 @@ public override void Initialize(AnalysisContext context)
 
     // x == double.NaN >>> double.IsNaN(x)
     // x != double.NaN >>> !double.IsNaN(x)
-    private void AnalyzeSimpleMemberAccessExpression(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeSimpleMemberAccessExpression(SyntaxNodeAnalysisContext context)
     {
         var simpleMemberAccess = (MemberAccessExpressionSyntax)context.Node;
 

diff --git a/src/Analyzers/CSharp/Analysis/NormalizeFormatOfEnumFlagValueAnalyzer.cs b/src/Analyzers/CSharp/Analysis/NormalizeFormatOfEnumFlagValueAnalyzer.cs
@@ -33,7 +33,7 @@ public override void Initialize(AnalysisContext context)
         context.RegisterSyntaxNodeAction(f => AnalyzeEnumDeclaration(f), SyntaxKind.EnumDeclaration);
     }
 
-    private void AnalyzeEnumDeclaration(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeEnumDeclaration(SyntaxNodeAnalysisContext context)
     {
         var enumDeclaration = (EnumDeclarationSyntax)context.Node;
 

diff --git a/src/Analyzers/CSharp/Analysis/NormalizeUsageOfInfiniteLoopAnalyzer.cs b/src/Analyzers/CSharp/Analysis/NormalizeUsageOfInfiniteLoopAnalyzer.cs
@@ -36,7 +36,7 @@ public override void Initialize(AnalysisContext context)
         context.RegisterSyntaxNodeAction(f => AnalyzeDoStatement(f), SyntaxKind.DoStatement);
     }
 
-    private void AnalyzeForStatement(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeForStatement(SyntaxNodeAnalysisContext context)
     {
         InfiniteLoopStyle style = context.GetInfiniteLoopStyle();
 
@@ -62,7 +62,7 @@ private void AnalyzeForStatement(SyntaxNodeAnalysisContext context)
         }
     }
 
-    private void AnalyzeWhileStatement(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeWhileStatement(SyntaxNodeAnalysisContext context)
     {
         InfiniteLoopStyle style = context.GetInfiniteLoopStyle();
 
@@ -90,7 +90,7 @@ private void AnalyzeWhileStatement(SyntaxNodeAnalysisContext context)
         }
     }
 
-    private void AnalyzeDoStatement(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeDoStatement(SyntaxNodeAnalysisContext context)
     {
         var doStatement = (DoStatementSyntax)context.Node;
 

diff --git a/src/Analyzers/CSharp/Analysis/RemovePartialModifierFromTypeWithSinglePartAnalyzer.cs b/src/Analyzers/CSharp/Analysis/RemovePartialModifierFromTypeWithSinglePartAnalyzer.cs
@@ -37,7 +37,7 @@ public override void Initialize(AnalysisContext context)
             SyntaxKind.InterfaceDeclaration);
     }
 
-    private void AnalyzeTypeDeclaration(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeTypeDeclaration(SyntaxNodeAnalysisContext context)
     {
         var typeDeclaration = (TypeDeclarationSyntax)context.Node;
 

diff --git a/src/Analyzers/CSharp/Analysis/RemoveUnnecessaryBlankLineAnalyzer.cs b/src/Analyzers/CSharp/Analysis/RemoveUnnecessaryBlankLineAnalyzer.cs
@@ -526,7 +526,7 @@ private static void AnalyzeAccessorList(SyntaxNodeAnalysisContext context)
         }
     }
 
-    private void AnalyzeCompilationUnit(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeCompilationUnit(SyntaxNodeAnalysisContext context)
     {
         var compilationUnit = (CompilationUnitSyntax)context.Node;
 

diff --git a/src/Analyzers/CSharp/Analysis/UseConditionalAccessAnalyzer.cs b/src/Analyzers/CSharp/Analysis/UseConditionalAccessAnalyzer.cs
@@ -274,7 +274,7 @@ static bool ExistsImplicitConversionToBoolean(INamedTypeSymbol typeSymbol)
                 case SyntaxKind.GreaterThanOrEqualExpression:
                 case SyntaxKind.EqualsExpression:
                     {
-                        ITypeSymbol leftTypeSymbol = semanticModel.GetTypeSymbol(((BinaryExpressionSyntax)expression).Left);
+                        ITypeSymbol leftTypeSymbol = semanticModel.GetTypeSymbol(((BinaryExpressionSyntax)expression).Left, cancellationToken);
 
                         if (leftTypeSymbol.IsErrorType())
                             return false;

diff --git a/src/Analyzers/CSharp/Analysis/UseImplicitOrExplicitObjectCreationAnalyzer.cs b/src/Analyzers/CSharp/Analysis/UseImplicitOrExplicitObjectCreationAnalyzer.cs
@@ -271,7 +271,7 @@ private static void AnalyzeObjectCreationExpression(SyntaxNodeAnalysisContext co
         }
     }
 
-    private void AnalyzeImplicitObjectCreationExpression(SyntaxNodeAnalysisContext context)
+    private static void AnalyzeImplicitObjectCreationExpression(SyntaxNodeAnalysisContext context)
     {
         var implicitObjectCreation = (ImplicitObjectCreationExpressionSyntax)context.Node;
 

diff --git a/src/CSharp.Workspaces/CSharp.Workspaces.csproj b/src/CSharp.Workspaces/CSharp.Workspaces.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\Roslynator.CSharp.Workspaces.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -38,11 +38,11 @@ Roslynator.NameGenerator</Description>
   </PropertyGroup>
 
   <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>

diff --git a/src/CSharp.Workspaces/CSharp/Extensions/WorkspaceExtensions.cs b/src/CSharp.Workspaces/CSharp/Extensions/WorkspaceExtensions.cs
@@ -286,7 +286,7 @@ IEnumerable<TextChange> GetTextChanges()
 
             foreach (DirectiveTriviaSyntax directive in directives)
             {
-                int startLine = directive.GetSpanStartLine();
+                int startLine = directive.GetSpanStartLine(cancellationToken: cancellationToken);
 
                 yield return new TextChange(lines[startLine].SpanIncludingLineBreak, "");
             }
@@ -381,8 +381,8 @@ bool ShouldRemoveDirective(DirectiveTriviaSyntax directive)
 
         SourceText sourceText = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
 
-        int startLine = region.Directive.GetSpanStartLine();
-        int endLine = region.EndDirective.GetSpanEndLine();
+        int startLine = region.Directive.GetSpanStartLine(cancellationToken: cancellationToken);
+        int endLine = region.EndDirective.GetSpanEndLine(cancellationToken: cancellationToken);
 
         TextLineCollection lines = sourceText.Lines;
 

diff --git a/src/CSharp.Workspaces/CSharp/SyntaxFormatter.cs b/src/CSharp.Workspaces/CSharp/SyntaxFormatter.cs
@@ -218,7 +218,7 @@ public static ConditionalExpressionSyntax ToMultiLine(ConditionalExpressionSynta
         ParameterListSyntax parameterList,
         CancellationToken cancellationToken = default)
     {
-        ParameterListSyntax newNode = WrapParameters(parameterList);
+        ParameterListSyntax newNode = WrapParameters(parameterList, cancellationToken);
 
         return document.ReplaceNodeAsync(parameterList, newNode, cancellationToken);
     }
@@ -256,7 +256,7 @@ public static ParameterListSyntax WrapParameters(ParameterListSyntax parameterLi
         BracketedParameterListSyntax parameterList,
         CancellationToken cancellationToken = default)
     {
-        BracketedParameterListSyntax newNode = WrapParameters(parameterList);
+        BracketedParameterListSyntax newNode = WrapParameters(parameterList, cancellationToken);
 
         return document.ReplaceNodeAsync(parameterList, newNode, cancellationToken);
     }
@@ -335,7 +335,7 @@ public static InitializerExpressionSyntax ToMultiLine(InitializerExpressionSynta
         ArgumentListSyntax argumentList,
         CancellationToken cancellationToken = default)
     {
-        ArgumentListSyntax newNode = ToMultiLine(argumentList);
+        ArgumentListSyntax newNode = ToMultiLine(argumentList, cancellationToken);
 
         return document.ReplaceNodeAsync(argumentList, newNode, cancellationToken);
     }

diff --git a/src/CSharp.Workspaces/CSharp/SyntaxLogicalInverter.cs b/src/CSharp.Workspaces/CSharp/SyntaxLogicalInverter.cs
@@ -336,6 +336,7 @@ private static ExpressionSyntax TryCreateExpressionWithoutConditionalAccess(Cond
         return null;
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static")]
     internal BinaryExpressionSyntax InvertBinaryExpression(BinaryExpressionSyntax binaryExpression)
     {
         SyntaxToken operatorToken = InvertBinaryOperatorToken(binaryExpression.OperatorToken);

diff --git a/src/CSharp/CSharp.csproj b/src/CSharp/CSharp.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\Roslynator.CSharp.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -38,11 +38,11 @@ Roslynator.NameGenerator</Description>
   </PropertyGroup>
 
   <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" Version="$(RoslynVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynatorRoslynVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CSharp/CSharp/CSharpFactory.cs b/src/CSharp/CSharp/CSharpFactory.cs
@@ -1874,9 +1874,11 @@ public static VariableDeclarationSyntax VariableDeclaration(TypeSyntax type, Var
     public static UsingDirectiveSyntax UsingStaticDirective(NameSyntax name)
     {
         return UsingDirective(
+            Token(SyntaxKind.UsingKeyword),
             Token(SyntaxKind.StaticKeyword),
             default(NameEqualsSyntax),
-            name);
+            name,
+            SemicolonToken());
     }
 
     public static UsingDirectiveSyntax UsingStaticDirective(SyntaxToken usingKeyword, SyntaxToken staticKeyword, NameSyntax name, SyntaxToken semicolonToken)