From 2206fbff1cc3eb8f66c6c12f50c12849ab8d1b9d Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sat, 24 Apr 2021 09:31:25 +0200 Subject: [PATCH 01/17] Use AnalyzerConfigFiles instead of AnalyzerConfigDocument --- .../MarkMembersAsStaticTests.cs | 14 +++++--- .../ValidateArgumentsOfPublicMethodsTests.cs | 7 ++-- .../AvoidAssemblyLocationInSingleFileTests.cs | 14 +++++--- .../DisposableFieldsShouldBeDisposedTests.cs | 14 +++++--- .../DisposeObjectsBeforeLosingScopeTests.cs | 35 +++++++++++++------ ...tPassLiteralsAsLocalizedParametersTests.cs | 7 ++-- .../Runtime/SpecifyCultureInfoTests.cs | 14 +++++--- .../DeclarePublicApiAnalyzerTests.cs | 2 +- .../CSharpCodeFixVerifier`2+Test.cs | 17 --------- 9 files changed, 74 insertions(+), 50 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs index 995cfe1c96..fbfab47b58 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs @@ -860,8 +860,11 @@ protected void Application_End() { } await new VerifyCS.Test() { - TestCode = csSource, - AnalyzerConfigDocument = editorConfigText, + TestState = + { + Sources = { csSource}, + AnalyzerConfigFiles = { ("/.editorconfig", editorConfigText) } + } }.RunAsync(); var vbSource = @" @@ -1157,8 +1160,11 @@ public class Test }"; await new VerifyCS.Test() { - TestCode = csSource, - AnalyzerConfigDocument = editorConfigText, + TestState = + { + Sources = { csSource }, + AnalyzerConfigFiles = { ("/.editorconfig", editorConfigText) }, + } }.RunAsync(); var vbSource = @" diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs index 735d2ca753..f8984b887d 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs @@ -742,8 +742,11 @@ public void M2(C c) }"; var csTest = new VerifyCS.Test() { - TestCode = csCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { csCode }, + AnalyzerConfigFiles = { ("/.editorconfig", editorConfig) } + } }; if (pointsToAnalysisKind == PointsToAnalysisKind.Complete) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs index 780cb653cc..2bb7edfb57 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs @@ -38,8 +38,11 @@ class C var test = new VerifyCS.Test { - TestCode = source, - AnalyzerConfigDocument = analyzerConfig + TestState = + { + Sources = { source }, + AnalyzerConfigFiles = { ("/.editorconfig", analyzerConfig) } + } }; DiagnosticResult[] diagnostics; @@ -156,8 +159,11 @@ private Task VerifyDiagnosticsAsync(string source, params DiagnosticResult[] exp var test = new VerifyCS.Test { - TestCode = source, - AnalyzerConfigDocument = singleFilePublishConfig + TestState = + { + Sources = { source }, + AnalyzerConfigFiles = { ("/.editorconfig", singleFilePublishConfig) } + } }; test.ExpectedDiagnostics.AddRange(expected); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs index a6c3d6e134..8dd534ea87 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs @@ -1010,8 +1010,11 @@ class C "; var csTest = new VerifyCS.Test() { - TestCode = csCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { csCode }, + AnalyzerConfigFiles = { ("/.editorconfig", editorConfig)} + } }; await csTest.RunAsync(); @@ -1094,8 +1097,11 @@ class C "; var csTest = new VerifyCS.Test() { - TestCode = csCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { csCode }, + AnalyzerConfigFiles = { ("/.editorconfig", editorConfig) } + } }; await csTest.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs index 4bcdf94b53..4b1ae8ca98 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs @@ -8196,10 +8196,7 @@ End Function [InlineData(PointsToAnalysisKind.Complete)] public async Task MemberReferenceInQueryFromClause_Disposed_NoDiagnostic(PointsToAnalysisKind? analysisKind) { - await new VerifyCS.Test() - { - AnalyzerConfigDocument = GetEditorConfigContent(analysisKind), - TestCode = @" + var source = @" using System; using System.Collections.Immutable; using System.Linq; @@ -8237,7 +8234,14 @@ from a in b.C.ArrayOfA y.Dispose(); } } -", +"; + await new VerifyCS.Test() + { + TestState = + { + Sources = { source }, + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(analysisKind)) } + } }.RunAsync(); } @@ -8877,8 +8881,11 @@ A M5() "; var test = new VerifyCS.Test() { - TestCode = source, - AnalyzerConfigDocument = GetEditorConfigContent(pointsToAnalysisKind) + TestState = + { + Sources = { source }, + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + } }; if (pointsToAnalysisKind != PointsToAnalysisKind.None) @@ -9015,8 +9022,11 @@ void M4(out (A, A) arg) var csTest = new VerifyCS.Test() { - TestCode = csCode, - AnalyzerConfigDocument = GetEditorConfigContent(pointsToAnalysisKind) + TestState = + { + Sources = { csCode }, + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + } }; if (pointsToAnalysisKind != PointsToAnalysisKind.None) @@ -9077,8 +9087,11 @@ void M2() }"; var csTest = new VerifyCS.Test() { - TestCode = csCode, - AnalyzerConfigDocument = GetEditorConfigContent(pointsToAnalysisKind) + TestState = + { + Sources = { csCode }, + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + } }; if (pointsToAnalysisKind != PointsToAnalysisKind.None) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs index 023b0a4fd2..0a42da36e1 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs @@ -1871,8 +1871,11 @@ public void M1(C c) ".NormalizeLineEndings(); var csTest = new VerifyCS.Test() { - TestCode = csCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { csCode }, + AnalyzerConfigFiles = { ("/.editorconfig", editorConfig) } + } }; if (pointsToAnalysisKind == PointsToAnalysisKind.Complete) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs index dda6453238..4f512250c1 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs @@ -21,9 +21,7 @@ public class SpecifyCultureInfoTests [InlineData("build_property.InvariantGlobalization = true", @"""aaa"".ToLower()")] public async Task CA1304_PlainString_CSharp_InvariantGlobalization(string property, string returnExpression) { - await new VerifyCS.Test - { - TestCode = $@" + var source = $@" using System; using System.Globalization; @@ -33,8 +31,14 @@ public string SpecifyCultureInfo01() {{ return {returnExpression}; }} -}}", - AnalyzerConfigDocument = property, +}}"; + await new VerifyCS.Test + { + TestState = + { + Sources = { source }, + AnalyzerConfigFiles = { ("/.editorconfig", property) } + } }.RunAsync(); } diff --git a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs index e7ce02222e..4cc1def6c0 100644 --- a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs +++ b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs @@ -104,8 +104,8 @@ private async Task VerifyCSharpAsync(string source, string? shippedApiText, stri { Sources = { source }, AdditionalFiles = { }, + AnalyzerConfigFiles = { ("/.editorconfig", editorConfigText) } }, - AnalyzerConfigDocument = editorConfigText, }; if (shippedApiText != null) diff --git a/src/Test.Utilities/CSharpCodeFixVerifier`2+Test.cs b/src/Test.Utilities/CSharpCodeFixVerifier`2+Test.cs index c8f35fa730..a531b862b0 100644 --- a/src/Test.Utilities/CSharpCodeFixVerifier`2+Test.cs +++ b/src/Test.Utilities/CSharpCodeFixVerifier`2+Test.cs @@ -9,7 +9,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing.Verifiers; -using Microsoft.CodeAnalysis.Text; namespace Test.Utilities { @@ -40,20 +39,6 @@ static Test() public Test() { ReferenceAssemblies = AdditionalMetadataReferences.Default; - - SolutionTransforms.Add((solution, projectId) => - { - if (AnalyzerConfigDocument is not null) - { - solution = solution.AddAnalyzerConfigDocument( - DocumentId.CreateNewId(projectId, debugName: ".editorconfig"), - ".editorconfig", - SourceText.From($"is_global = true" + Environment.NewLine + AnalyzerConfigDocument), - filePath: @"/.editorconfig"); - } - - return solution; - }); } private static ImmutableDictionary GetNullableWarningsFromCompiler() @@ -67,8 +52,6 @@ private static ImmutableDictionary GetNullableWarnings public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.CSharp7_3; - public string? AnalyzerConfigDocument { get; set; } - protected override CompilationOptions CreateCompilationOptions() { var compilationOptions = base.CreateCompilationOptions(); From f66b73c3bae79889d36f7a4428697f5f8cd2a380 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sat, 24 Apr 2021 09:46:25 +0200 Subject: [PATCH 02/17] Fix nullable warning --- .../UnitTests/DeclarePublicApiAnalyzerTests.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs index 4cc1def6c0..2689f36e4f 100644 --- a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs +++ b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs @@ -96,7 +96,7 @@ private async Task VerifyCSharpAsync(string source, string? shippedApiText, stri await test.RunAsync(); } - private async Task VerifyCSharpAsync(string source, string? shippedApiText, string? unshippedApiText, string? editorConfigText, params DiagnosticResult[] expected) + private async Task VerifyCSharpAsync(string source, string? shippedApiText, string? unshippedApiText, string editorConfigText, params DiagnosticResult[] expected) { var test = new CSharpCodeFixVerifier.Test { @@ -212,12 +212,11 @@ private C() { } } [Theory] - [InlineData(null)] [InlineData("")] [InlineData("dotnet_public_api_analyzer.require_api_files = false")] [InlineData("dotnet_public_api_analyzer.require_api_files = true")] [WorkItem(2622, "https://github.com/dotnet/roslyn-analyzers/issues/2622")] - public async Task AnalyzerFileMissing_Both(string? editorconfigText) + public async Task AnalyzerFileMissing_Both(string editorconfigText) { var source = @" public class C @@ -230,8 +229,7 @@ private C() { } string? unshippedText = null; var expectedDiagnostics = Array.Empty(); - if (editorconfigText == null || - !editorconfigText.EndsWith("true", StringComparison.OrdinalIgnoreCase)) + if (!editorconfigText.EndsWith("true", StringComparison.OrdinalIgnoreCase)) { expectedDiagnostics = new[] { GetCSharpResultAt(2, 14, DeclarePublicApiAnalyzer.DeclareNewApiRule, "C") }; } From 9c48a08b5a15f632871ed2615a2864dc0349024c Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sat, 24 Apr 2021 11:56:26 +0200 Subject: [PATCH 03/17] Fix some tests --- .../MarkMembersAsStaticTests.cs | 4 ++-- .../ValidateArgumentsOfPublicMethodsTests.cs | 2 +- .../AvoidAssemblyLocationInSingleFileTests.cs | 20 +++++++++---------- .../DisposableFieldsShouldBeDisposedTests.cs | 4 ++-- ...tPassLiteralsAsLocalizedParametersTests.cs | 2 +- .../Runtime/SpecifyCultureInfoTests.cs | 2 +- .../DeclarePublicApiAnalyzerTests.cs | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs index fbfab47b58..94f5ade233 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs @@ -863,7 +863,7 @@ protected void Application_End() { } TestState = { Sources = { csSource}, - AnalyzerConfigFiles = { ("/.editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") } } }.RunAsync(); @@ -1163,7 +1163,7 @@ public class Test TestState = { Sources = { csSource }, - AnalyzerConfigFiles = { ("/.editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") }, } }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs index f8984b887d..48e44ae88f 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs @@ -745,7 +745,7 @@ public void M2(C c) TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", editorConfig) } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs index 2bb7edfb57..7044c6dc61 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs @@ -26,7 +26,7 @@ class C { public string M() => Assembly.GetExecutingAssembly().Location; }"; - string analyzerConfig = ""; + string analyzerConfig = "[*]\r\n"; if (publish is not null) { analyzerConfig += $"build_property.{PublishSingleFile} = {publish}" + Environment.NewLine; @@ -50,7 +50,7 @@ class C { diagnostics = new DiagnosticResult[] { // /0/Test0.cs(5,26): warning IL3000: 'System.Reflection.Assembly.Location' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3000).WithSpan(5, 26, 5, 66).WithArguments("System.Reflection.Assembly.Location"), + VerifyCS.Diagnostic(IL3000).WithSpan(5, 26, 5, 66).WithArguments("System.Reflection.Assembly.Location"), }; } else @@ -80,7 +80,7 @@ public void M() }"; return VerifyDiagnosticsAsync(src, // /0/Test0.cs(8,13): warning IL3000: 'System.Reflection.Assembly.Location' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3000).WithSpan(8, 13, 8, 23).WithArguments("System.Reflection.Assembly.Location") + VerifyCS.Diagnostic(IL3000).WithSpan(8, 13, 8, 23).WithArguments("System.Reflection.Assembly.Location") ); } @@ -100,9 +100,9 @@ public void M() }"; return VerifyDiagnosticsAsync(src, // /0/Test0.cs(8,13): warning IL3001: Assemblies embedded in a single-file app cannot have additional files in the manifest. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3001).WithSpan(8, 13, 8, 41).WithArguments("System.Reflection.Assembly.GetFile(string)"), + VerifyCS.Diagnostic(IL3001).WithSpan(8, 13, 8, 41).WithArguments("System.Reflection.Assembly.GetFile(string)"), // /0/Test0.cs(9,13): warning IL3001: Assemblies embedded in a single-file app cannot have additional files in the manifest. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3001).WithSpan(9, 13, 9, 25).WithArguments("System.Reflection.Assembly.GetFiles()") + VerifyCS.Diagnostic(IL3001).WithSpan(9, 13, 9, 25).WithArguments("System.Reflection.Assembly.GetFiles()") ); } @@ -122,9 +122,9 @@ public void M() }"; return VerifyDiagnosticsAsync(src, // /0/Test0.cs(8,13): warning IL3000: 'System.Reflection.AssemblyName.CodeBase' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3000).WithSpan(8, 13, 8, 23).WithArguments("System.Reflection.AssemblyName.CodeBase"), + VerifyCS.Diagnostic(IL3000).WithSpan(8, 13, 8, 23).WithArguments("System.Reflection.AssemblyName.CodeBase"), // /0/Test0.cs(9,13): warning IL3000: 'System.Reflection.AssemblyName.EscapedCodeBase' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3000).WithSpan(9, 13, 9, 30).WithArguments("System.Reflection.AssemblyName.EscapedCodeBase") + VerifyCS.Diagnostic(IL3000).WithSpan(9, 13, 9, 30).WithArguments("System.Reflection.AssemblyName.EscapedCodeBase") ); } @@ -146,15 +146,15 @@ public void M() }"; return VerifyDiagnosticsAsync(src, // /0/Test0.cs(8,13): warning IL3000: 'System.Reflection.Assembly.Location' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3000).WithSpan(8, 13, 8, 23).WithArguments("System.Reflection.Assembly.Location"), + VerifyCS.Diagnostic(IL3000).WithSpan(8, 13, 8, 23).WithArguments("System.Reflection.Assembly.Location"), // /0/Test0.cs(9,13): warning IL3001: Assemblies embedded in a single-file app cannot have additional files in the manifest. - VerifyCS.Diagnostic(AvoidAssemblyLocationInSingleFile.IL3001).WithSpan(9, 13, 9, 25).WithArguments("System.Reflection.Assembly.GetFiles()") + VerifyCS.Diagnostic(IL3001).WithSpan(9, 13, 9, 25).WithArguments("System.Reflection.Assembly.GetFiles()") ); } private Task VerifyDiagnosticsAsync(string source, params DiagnosticResult[] expected) { - const string singleFilePublishConfig = @" + const string singleFilePublishConfig = @"[*] build_property." + PublishSingleFile + " = true"; var test = new VerifyCS.Test diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs index 8dd534ea87..46ca34d70c 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs @@ -1013,7 +1013,7 @@ class C TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", editorConfig)} + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} } }; @@ -1100,7 +1100,7 @@ class C TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", editorConfig) } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs index 0a42da36e1..3c2f4e65a0 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs @@ -1874,7 +1874,7 @@ public void M1(C c) TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", editorConfig) } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs index 4f512250c1..ef85c6bbb4 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs @@ -37,7 +37,7 @@ public string SpecifyCultureInfo01() TestState = { Sources = { source }, - AnalyzerConfigFiles = { ("/.editorconfig", property) } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{property}") } } }.RunAsync(); } diff --git a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs index 2689f36e4f..b59494f834 100644 --- a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs +++ b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs @@ -234,7 +234,7 @@ private C() { } expectedDiagnostics = new[] { GetCSharpResultAt(2, 14, DeclarePublicApiAnalyzer.DeclareNewApiRule, "C") }; } - await VerifyCSharpAsync(source, shippedText, unshippedText, editorconfigText, expectedDiagnostics); + await VerifyCSharpAsync(source, shippedText, unshippedText, $"[*]\r\n{editorconfigText}", expectedDiagnostics); } [Fact] From 01e56706887f09e6c103b5649990b22ef65adb17 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sat, 24 Apr 2021 13:08:08 +0200 Subject: [PATCH 04/17] Parallel VB changes --- .../MarkMembersAsStaticTests.cs | 16 +++++++++++----- .../ValidateArgumentsOfPublicMethodsTests.cs | 7 +++++-- .../DisposableFieldsShouldBeDisposedTests.cs | 14 ++++++++++---- .../DisposeObjectsBeforeLosingScopeTests.cs | 16 +++++++++++----- ...oNotPassLiteralsAsLocalizedParametersTests.cs | 7 +++++-- .../VisualBasicCodeFixVerifier`2+Test.cs | 16 ---------------- 6 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs index 94f5ade233..298edffb38 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs @@ -862,7 +862,7 @@ protected void Application_End() { } { TestState = { - Sources = { csSource}, + Sources = { csSource }, AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") } } }.RunAsync(); @@ -914,8 +914,11 @@ End Class "; await new VerifyVB.Test() { - TestCode = vbSource, - AnalyzerConfigDocument = editorConfigText, + TestState = + { + Sources = { vbSource }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") } + } }.RunAsync(); } @@ -1187,8 +1190,11 @@ End Function End Class"; await new VerifyVB.Test() { - TestCode = vbSource, - AnalyzerConfigDocument = editorConfigText, + TestState = + { + Sources = { vbSource }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") }, + } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs index 48e44ae88f..d7a5bde25a 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs @@ -792,8 +792,11 @@ End Sub var vbTest = new VerifyVB.Test() { - TestCode = vbCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { vbCode }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } + } }; if (pointsToAnalysisKind == PointsToAnalysisKind.Complete) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs index 46ca34d70c..f4bd69ea90 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs @@ -1048,8 +1048,11 @@ End Class "; var vbTest = new VerifyVB.Test() { - TestCode = vbCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { vbCode }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} + } }; await vbTest.RunAsync(); @@ -1134,8 +1137,11 @@ End Class "; var vbTest = new VerifyVB.Test() { - TestCode = vbCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { vbCode }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} + } }; await vbTest.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs index 4b1ae8ca98..a5b070293b 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs @@ -59,17 +59,20 @@ private static DiagnosticResult GetBasicMayBeNotDisposedOnExceptionPathsResultAt private string GetEditorConfigContentToDisableInterproceduralAnalysis(DisposeAnalysisKind disposeAnalysisKind) { - var text = $@"dotnet_code_quality.interprocedural_analysis_kind = None + var text = $@"[*] + dotnet_code_quality.interprocedural_analysis_kind = None dotnet_code_quality.dispose_analysis_kind = {disposeAnalysisKind}"; return text; } private string GetEditorConfigContent(DisposeAnalysisKind disposeAnalysisKind) - => $@"dotnet_code_quality.dispose_analysis_kind = {disposeAnalysisKind}"; + => $@"[*] + dotnet_code_quality.dispose_analysis_kind = {disposeAnalysisKind}"; private string GetEditorConfigContent(PointsToAnalysisKind? pointsToAnalysisKind) => pointsToAnalysisKind.HasValue ? - $"dotnet_code_quality.CA2000.points_to_analysis_kind = {pointsToAnalysisKind}" : + $@"[*] + dotnet_code_quality.CA2000.points_to_analysis_kind = {pointsToAnalysisKind}" : string.Empty; [Fact] @@ -9133,8 +9136,11 @@ End Class "; var vbTest = new VerifyVB.Test() { - TestCode = vbCode, - AnalyzerConfigDocument = GetEditorConfigContent(pointsToAnalysisKind) + TestState = + { + Sources = { vbCode }, + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + } }; if (pointsToAnalysisKind != PointsToAnalysisKind.None) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs index 3c2f4e65a0..7cef594f79 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs @@ -1906,8 +1906,11 @@ End Class ".NormalizeLineEndings(); var vbTest = new VerifyVB.Test() { - TestCode = vbCode, - AnalyzerConfigDocument = editorConfig + TestState = + { + Sources = { vbCode }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } + } }; if (pointsToAnalysisKind == PointsToAnalysisKind.Complete) diff --git a/src/Test.Utilities/VisualBasicCodeFixVerifier`2+Test.cs b/src/Test.Utilities/VisualBasicCodeFixVerifier`2+Test.cs index 47134ada8a..a08c4c3ed6 100644 --- a/src/Test.Utilities/VisualBasicCodeFixVerifier`2+Test.cs +++ b/src/Test.Utilities/VisualBasicCodeFixVerifier`2+Test.cs @@ -20,26 +20,10 @@ public class Test : VisualBasicCodeFixTest public Test() { ReferenceAssemblies = AdditionalMetadataReferences.Default; - - SolutionTransforms.Add((solution, projectId) => - { - if (AnalyzerConfigDocument is not null) - { - solution = solution.AddAnalyzerConfigDocument( - DocumentId.CreateNewId(projectId, debugName: ".editorconfig"), - ".editorconfig", - SourceText.From($"is_global = true" + Environment.NewLine + AnalyzerConfigDocument), - filePath: @"/.editorconfig"); - } - - return solution; - }); } public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.VisualBasic15_5; - public string? AnalyzerConfigDocument { get; set; } - protected override ParseOptions CreateParseOptions() { return ((VisualBasicParseOptions)base.CreateParseOptions()).WithLanguageVersion(LanguageVersion); From bda4f623cef4f6e20ac7be214680c73ea32dafcb Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sat, 24 Apr 2021 14:41:08 +0200 Subject: [PATCH 05/17] Cleanup ReviewUnusedParametersTests --- .../ReviewUnusedParametersTests.cs | 56 +++---------------- 1 file changed, 7 insertions(+), 49 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs index 795ce2b0b1..ac427c445e 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Linq; using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Text; using Test.Utilities; using Xunit; using VerifyCS = Test.Utilities.CSharpCodeFixVerifier< @@ -926,14 +924,14 @@ public class C {{ }} }}" - } + }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]{Environment.NewLine}{editorConfigText}") } }, - SolutionTransforms = { WithAnalyzerConfigDocument } }; if (expectDiagnostic) { - csTest.ExpectedDiagnostics.Add(VerifyCS.Diagnostic().WithSpan(@"/Test0.cs", 4, 23, 4, 29).WithArguments("unused", "M")); + csTest.ExpectedDiagnostics.Add(VerifyCS.Diagnostic().WithSpan(4, 23, 4, 29).WithArguments("unused", "M")); } await csTest.RunAsync(); @@ -950,35 +948,16 @@ Public Class C End Sub End Class" }, + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]{Environment.NewLine}{editorConfigText}") } }, - SolutionTransforms = { WithAnalyzerConfigDocument } }; if (expectDiagnostic) { - vbTest.ExpectedDiagnostics.Add(VerifyVB.Diagnostic().WithSpan(@"/Test0.vb", 3, 18, 3, 24).WithArguments("unused", "M")); + vbTest.ExpectedDiagnostics.Add(VerifyVB.Diagnostic().WithSpan(3, 18, 3, 24).WithArguments("unused", "M")); } await vbTest.RunAsync(); - return; - - Solution WithAnalyzerConfigDocument(Solution solution, ProjectId projectId) - { - var project = solution.GetProject(projectId)!; - var projectFilePath = project.Language == LanguageNames.CSharp ? @"/Test.csproj" : @"/Test.vbproj"; - solution = solution.WithProjectFilePath(projectId, projectFilePath); - - var documentId = project.DocumentIds.Single(); - var documentExtension = project.Language == LanguageNames.CSharp ? "cs" : "vb"; - solution = solution.WithDocumentFilePath(documentId, $@"/Test0.{documentExtension}"); - - return solution.GetProject(projectId)! - .AddAnalyzerConfigDocument( - ".editorconfig", - SourceText.From($"[*.{documentExtension}]" + Environment.NewLine + editorConfigText), - filePath: @"/.editorconfig") - .Project.Solution; - } } [Theory] @@ -1019,12 +998,11 @@ public class C {editorConfigText} ") } }, - SolutionTransforms = { WithAnalyzerConfigDocument } }; if (expectDiagnostic) { - csTest.ExpectedDiagnostics.Add(VerifyCS.Diagnostic().WithSpan(@"/Test0.cs", 4, 23, 4, 29).WithArguments("unused", "M")); + csTest.ExpectedDiagnostics.Add(VerifyCS.Diagnostic().WithSpan(4, 23, 4, 29).WithArguments("unused", "M")); } await csTest.RunAsync(); @@ -1047,34 +1025,14 @@ End Class" {editorConfigText} ") } }, - SolutionTransforms = { WithAnalyzerConfigDocument } }; if (expectDiagnostic) { - vbTest.ExpectedDiagnostics.Add(VerifyVB.Diagnostic().WithSpan(@"/Test0.vb", 3, 18, 3, 24).WithArguments("unused", "M")); + vbTest.ExpectedDiagnostics.Add(VerifyVB.Diagnostic().WithSpan(3, 18, 3, 24).WithArguments("unused", "M")); } await vbTest.RunAsync(); - return; - - Solution WithAnalyzerConfigDocument(Solution solution, ProjectId projectId) - { - var project = solution.GetProject(projectId)!; - var projectFilePath = project.Language == LanguageNames.CSharp ? @"/Test.csproj" : @"/Test.vbproj"; - solution = solution.WithProjectFilePath(projectId, projectFilePath); - - var documentId = project.DocumentIds.Single(); - var documentExtension = project.Language == LanguageNames.CSharp ? "cs" : "vb"; - solution = solution.WithDocumentFilePath(documentId, $@"/Test0.{documentExtension}"); - - return solution.GetProject(projectId)! - .AddAnalyzerConfigDocument( - ".editorconfig", - SourceText.From($"[*.{documentExtension}]" + Environment.NewLine + editorConfigText), - filePath: @"/.editorconfig") - .Project.Solution; - } } [Fact, WorkItem(3106, "https://github.com/dotnet/roslyn-analyzers/issues/3106")] From 68d694e4f019a22b1211521792124d5ebfdde2b3 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:24:42 +0200 Subject: [PATCH 06/17] Update src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs Co-authored-by: Sam Harwell --- .../Publish/AvoidAssemblyLocationInSingleFileTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs index 7044c6dc61..cc925d655e 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs @@ -154,7 +154,7 @@ public void M() private Task VerifyDiagnosticsAsync(string source, params DiagnosticResult[] expected) { - const string singleFilePublishConfig = @"[*] + const string singleFilePublishConfig = @"is_global = true build_property." + PublishSingleFile + " = true"; var test = new VerifyCS.Test @@ -170,4 +170,4 @@ private Task VerifyDiagnosticsAsync(string source, params DiagnosticResult[] exp return test.RunAsync(); } } -} \ No newline at end of file +} From de1b6aa572c8a23312bc29f547fb2cdc085f08f7 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:27:07 +0200 Subject: [PATCH 07/17] Update src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs Co-authored-by: Sam Harwell --- .../Maintainability/ReviewUnusedParametersTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs index ac427c445e..9b8e1417b0 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs @@ -925,7 +925,7 @@ public class C }} }}" }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]{Environment.NewLine}{editorConfigText}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]{Environment.NewLine}{editorConfigText}") }, }, }; From 1e78e7a5eecb28ecf8604718a9001aa3d14456ac Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:28:05 +0200 Subject: [PATCH 08/17] Update ReviewUnusedParametersTests.cs --- .../Maintainability/ReviewUnusedParametersTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs index 9b8e1417b0..43788d47ec 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs @@ -868,7 +868,7 @@ public class C [*] {editorConfigText} -") } +") }, } }.RunAsync(); From 8d0e6535f0f52713b23d2bdca77fb035060bcd49 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:28:44 +0200 Subject: [PATCH 09/17] Update MarkMembersAsStaticTests.cs --- .../QualityGuidelines/MarkMembersAsStaticTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs index 298edffb38..28cf5b9d63 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/MarkMembersAsStaticTests.cs @@ -863,7 +863,7 @@ protected void Application_End() { } TestState = { Sources = { csSource }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") }, } }.RunAsync(); @@ -917,7 +917,7 @@ End Class TestState = { Sources = { vbSource }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfigText}") }, } }.RunAsync(); } From 3fa896b755babb81df3a31948d25fc1b07f44280 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:29:12 +0200 Subject: [PATCH 10/17] Update ValidateArgumentsOfPublicMethodsTests.cs --- .../ValidateArgumentsOfPublicMethodsTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs index d7a5bde25a..2c0d7a2da8 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs @@ -745,7 +745,7 @@ public void M2(C c) TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; @@ -795,7 +795,7 @@ End Sub TestState = { Sources = { vbCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; From 75f898bd21d65b68194ec3db8cf4771cbffc6cb7 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:29:34 +0200 Subject: [PATCH 11/17] Update AvoidAssemblyLocationInSingleFileTests.cs --- .../Publish/AvoidAssemblyLocationInSingleFileTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs index cc925d655e..99bc5e9942 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Publish/AvoidAssemblyLocationInSingleFileTests.cs @@ -41,7 +41,7 @@ class C TestState = { Sources = { source }, - AnalyzerConfigFiles = { ("/.editorconfig", analyzerConfig) } + AnalyzerConfigFiles = { ("/.editorconfig", analyzerConfig) }, } }; @@ -162,7 +162,7 @@ private Task VerifyDiagnosticsAsync(string source, params DiagnosticResult[] exp TestState = { Sources = { source }, - AnalyzerConfigFiles = { ("/.editorconfig", singleFilePublishConfig) } + AnalyzerConfigFiles = { ("/.editorconfig", singleFilePublishConfig) }, } }; From f16274fc0468996caa10cda3427132cbd422fa71 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:30:53 +0200 Subject: [PATCH 12/17] Update DisposableFieldsShouldBeDisposedTests.cs --- .../Runtime/DisposableFieldsShouldBeDisposedTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs index f4bd69ea90..c5dd16a3e6 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs @@ -1013,7 +1013,7 @@ class C TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; @@ -1051,7 +1051,7 @@ End Class TestState = { Sources = { vbCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; @@ -1103,7 +1103,7 @@ class C TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; @@ -1140,7 +1140,7 @@ End Class TestState = { Sources = { vbCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}")} + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; From 0d8961a69316b92c263d2eb367f0d5fbdada5c69 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:31:33 +0200 Subject: [PATCH 13/17] Update ReviewUnusedParametersTests.cs --- .../Maintainability/ReviewUnusedParametersTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs index 43788d47ec..147a961e40 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs @@ -948,7 +948,7 @@ Public Class C End Sub End Class" }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]{Environment.NewLine}{editorConfigText}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]{Environment.NewLine}{editorConfigText}") }, }, }; From 1b48a1c7769c310e9888e403f4aecfa2ca1aefd5 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:33:33 +0200 Subject: [PATCH 14/17] Update DisposeObjectsBeforeLosingScopeTests.cs --- .../Runtime/DisposeObjectsBeforeLosingScopeTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs index a5b070293b..7de9831d51 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs @@ -8243,7 +8243,7 @@ from a in b.C.ArrayOfA TestState = { Sources = { source }, - AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(analysisKind)) } + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(analysisKind)) }, } }.RunAsync(); } @@ -8887,7 +8887,7 @@ A M5() TestState = { Sources = { source }, - AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) }, } }; @@ -9028,7 +9028,7 @@ void M4(out (A, A) arg) TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) }, } }; @@ -9093,7 +9093,7 @@ void M2() TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) }, } }; @@ -9139,7 +9139,7 @@ End Class TestState = { Sources = { vbCode }, - AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) } + AnalyzerConfigFiles = { ("/.editorconfig", GetEditorConfigContent(pointsToAnalysisKind)) }, } }; From 0fb61975e6e7061945393bb67ce92a4924d08d47 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:34:45 +0200 Subject: [PATCH 15/17] Update DoNotPassLiteralsAsLocalizedParametersTests.cs --- .../Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs index 7cef594f79..eaee510b4c 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs @@ -1874,7 +1874,7 @@ public void M1(C c) TestState = { Sources = { csCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; @@ -1909,7 +1909,7 @@ End Class TestState = { Sources = { vbCode }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{editorConfig}") }, } }; From 3a28d5990d9766a594301b74c0bcf975943ca228 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:35:02 +0200 Subject: [PATCH 16/17] Update SpecifyCultureInfoTests.cs --- .../Runtime/SpecifyCultureInfoTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs index ef85c6bbb4..e731372be2 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs @@ -37,7 +37,7 @@ public string SpecifyCultureInfo01() TestState = { Sources = { source }, - AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{property}") } + AnalyzerConfigFiles = { ("/.editorconfig", $"[*]\r\n{property}") }, } }.RunAsync(); } From ffe1ce5f9320005cf452a45444c8a0651e964c76 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Mon, 17 May 2021 16:35:31 +0200 Subject: [PATCH 17/17] Update DeclarePublicApiAnalyzerTests.cs --- .../UnitTests/DeclarePublicApiAnalyzerTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs index b59494f834..5192b4d3f6 100644 --- a/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs +++ b/src/PublicApiAnalyzers/UnitTests/DeclarePublicApiAnalyzerTests.cs @@ -104,7 +104,7 @@ private async Task VerifyCSharpAsync(string source, string? shippedApiText, stri { Sources = { source }, AdditionalFiles = { }, - AnalyzerConfigFiles = { ("/.editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", editorConfigText) }, }, };