Skip to content

Commit

Permalink
Merge pull request #3266 from sharwell/update-references
Browse files Browse the repository at this point in the history
Update references
sharwell authored Dec 7, 2020

Partially verified

This commit is signed with the committer’s verified signature.
targos’s contribution has been verified via GPG key.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
2 parents bc00245 + e30b94c commit b17a349
Showing 10 changed files with 22 additions and 15 deletions.
6 changes: 3 additions & 3 deletions StyleCop.Analyzers/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -45,14 +45,14 @@
<ItemGroup>
<PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="all" />
<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.46" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.304" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0-5.final" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0" PrivateAssets="all" />
</ItemGroup>

<!-- C# Compiler -->
<ItemGroup>
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0-5.final" PrivateAssets="all" />
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0" PrivateAssets="all" />
</ItemGroup>

<!-- Public API -->
Original file line number Diff line number Diff line change
@@ -55,7 +55,8 @@ public static async Task<ImmutableDictionary<Document, ImmutableArray<Diagnostic
{
var projectDiagnostics = await GetAllDiagnosticsAsync(fixAllContext, projectToFix).ConfigureAwait(false);
diagnostics.TryAdd(projectToFix.Id, projectDiagnostics);
}, fixAllContext.CancellationToken);
},
fixAllContext.CancellationToken);
}

await Task.WhenAll(tasks).ConfigureAwait(false);
Original file line number Diff line number Diff line change
@@ -50,7 +50,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
CodeAction.Create(
MaintainabilityResources.SA1404CodeFix,
token => AddJustificationToAttributeAsync(context.Document, root, attribute),
nameof(SA1404CodeFixProvider) + "-Add"), diagnostic);
nameof(SA1404CodeFixProvider) + "-Add"),
diagnostic);
return;
}

@@ -60,7 +61,8 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
CodeAction.Create(
MaintainabilityResources.SA1404CodeFix,
token => UpdateValueOfArgumentAsync(context.Document, root, argument),
nameof(SA1404CodeFixProvider) + "-Update"), diagnostic);
nameof(SA1404CodeFixProvider) + "-Update"),
diagnostic);
return;
}
}
Original file line number Diff line number Diff line change
@@ -95,7 +95,8 @@ private static SyntaxTokenList FullySortModifiers(SyntaxTokenList modifiers)
return AdjustTrivia(
accessModifiers
.Concat(staticModifiers)
.Concat(otherModifiers), modifiers);
.Concat(otherModifiers),
modifiers);
}

/// <summary>
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-5.final" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
<PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.160" PrivateAssets="all" />
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[3.1.0]" />
</ItemGroup>
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.8.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
</ItemGroup>
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.6.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
</ItemGroup>
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.8.0-5.final" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="all" />
</ItemGroup>
Original file line number Diff line number Diff line change
@@ -259,7 +259,8 @@ public async Task TestClosingBracketFollowedByNoSpaceAndIncrementOrDecrementOper
{
string validStatament = string.Format(
@"var i = new int[1];
i[0]{0};", operatorText);
i[0]{0};",
operatorText);

await this.TestWhitespaceInStatementOrDeclAsync(validStatament, null, DiagnosticResult.EmptyDiagnosticResults).ConfigureAwait(false);
}
@@ -271,11 +272,13 @@ public async Task TestClosingBracketFollowedBySpaceAndIncrementOrDecrementOperat
{
string invalidStatament = string.Format(
@"var i = new int[1];
i[0] {0};", operatorText);
i[0] {0};",
operatorText);

string fixedStatament = string.Format(
@"var i = new int[1];
i[0]{0};", operatorText);
i[0]{0};",
operatorText);

DiagnosticResult expected = Diagnostic().WithLocation(8, 16).WithArguments(" not", "followed");

Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="1.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="1.3.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.20559.1" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.1.8" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />

0 comments on commit b17a349

Please sign in to comment.