diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidEmptyInterfacesTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidEmptyInterfacesTests.cs index 5538e5bf2c..0105b0bba8 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidEmptyInterfacesTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidEmptyInterfacesTests.cs @@ -160,7 +160,11 @@ public class C {accessibility} interface I {{ }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, ExpectedDiagnostics = { @@ -208,7 +212,11 @@ Public Class C End Interface End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, ExpectedDiagnostics = { @@ -237,7 +245,11 @@ public class C {accessibility} interface I {{ }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -262,7 +274,11 @@ Public Class C End Interface End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidExcessiveParametersOnGenericTypesTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidExcessiveParametersOnGenericTypesTests.cs index d825a58203..9575755a31 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidExcessiveParametersOnGenericTypesTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidExcessiveParametersOnGenericTypesTests.cs @@ -133,7 +133,11 @@ public class OuterClass {accessibility} class [|C|] {{ }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } @@ -177,7 +181,11 @@ Public Class OuterClass End Class End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidOutParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidOutParametersTests.cs index 6890f26520..0812055cf6 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidOutParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidOutParametersTests.cs @@ -97,7 +97,11 @@ public class C }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); @@ -116,7 +120,11 @@ Public Class C End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); } @@ -147,7 +155,11 @@ public class C }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpExpectedResult(4, 11 + accessibility.Length) @@ -175,7 +187,11 @@ Public Class C End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetBasicExpectedResult(5, 10 + accessibility.Length) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CancellationTokenParametersMustComeLastTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CancellationTokenParametersMustComeLastTests.cs index 29adbd6715..067564e2cc 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CancellationTokenParametersMustComeLastTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CancellationTokenParametersMustComeLastTests.cs @@ -486,7 +486,11 @@ public class C {accessibility} void [|M|](CancellationToken t, int i) {{}} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } @@ -536,7 +540,11 @@ Public Class C End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } @@ -576,7 +584,11 @@ public class C2 public " + prefix + "C2" + suffix + @"(CancellationToken t, int i) {} }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); @@ -602,7 +614,11 @@ Public Class C2 End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } @@ -630,7 +646,11 @@ public async Task CA1068_ExcludedSymbolNames_Record_NoDiagnostic(string editorCo public record " + prefix + "R" + suffix + @"(CancellationToken t, int i) {}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CollectionsShouldImplementGenericInterfaceTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CollectionsShouldImplementGenericInterfaceTests.cs index 872e96faa6..32846d0521 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CollectionsShouldImplementGenericInterfaceTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CollectionsShouldImplementGenericInterfaceTests.cs @@ -937,7 +937,11 @@ public class C : IDictionary IEnumerator IEnumerable.GetEnumerator() => throw new NotImplementedException(); }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1010CSharpResultAt(5, 14, "C", "ICollection", "ICollection") }, } }.RunAsync(); @@ -1035,7 +1039,11 @@ Throw New NotImplementedException() End Function End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1010CSharpResultAt(5, 14, "C", "ICollection", "ICollection(Of T)") }, } }.RunAsync(); @@ -1088,7 +1096,11 @@ public class C : IDictionary IEnumerator IEnumerable.GetEnumerator() => throw new NotImplementedException(); }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1010CSharpResultAt(5, 14, "C", "IDictionary", "IDictionary") }, } }.RunAsync(); @@ -1186,7 +1198,11 @@ Throw New NotImplementedException() End Function End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1010CSharpResultAt(5, 14, "C", "IDictionary", "IDictionary(Of TKey, TValue)") }, } }.RunAsync(); @@ -1208,7 +1224,11 @@ public async Task UserMappingWinsOverHardcoded_NoDiagnostic() public class TestClass : CollectionBase { }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1010CSharpResultAt(4, 14, "TestClass", "IList", "IDictionary") }, } }.RunAsync(); @@ -1227,7 +1247,11 @@ Inherits CollectionBase End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1010BasicResultAt(4, 14, "TestClass", "IList", "IDictionary(Of TKey, TValue)") }, } }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotCatchGeneralExceptionTypesTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotCatchGeneralExceptionTypesTests.cs index 93ab046db3..7a6f11dec8 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotCatchGeneralExceptionTypesTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotCatchGeneralExceptionTypesTests.cs @@ -678,7 +678,11 @@ void M1(string param) }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); @@ -697,7 +701,11 @@ End Try End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -750,7 +758,11 @@ void M1(string param) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); @@ -771,7 +783,11 @@ End Sub End Class End Namespace" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareProtectedMembersInSealedTypesTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareProtectedMembersInSealedTypesTests.cs index a18140bc1b..4efe901774 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareProtectedMembersInSealedTypesTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareProtectedMembersInSealedTypesTests.cs @@ -110,7 +110,11 @@ Protected [|SomeField|] As Integer End Class End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareVisibleInstanceFieldsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareVisibleInstanceFieldsTests.cs index 21a5b4af7b..b378c19e78 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareVisibleInstanceFieldsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareVisibleInstanceFieldsTests.cs @@ -402,7 +402,11 @@ public struct S TestState = { Sources = { csharpCode }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); @@ -415,7 +419,11 @@ Public Structure S TestState = { Sources = { vbCode }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATaskTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATaskTests.cs index 56e85bf01c..054d838d68 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATaskTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATaskTests.cs @@ -585,7 +585,11 @@ private async Task M1Async() TestState = { Sources = { code }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -633,7 +637,11 @@ private async Task M1Async() TestState = { Sources = { code }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, FixedState = { @@ -669,7 +677,11 @@ public async Task M() } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotExposeGenericListsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotExposeGenericListsTests.cs index 949a97ec92..42666a3819 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotExposeGenericListsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotExposeGenericListsTests.cs @@ -296,7 +296,11 @@ public class OuterClass {accessibility} List [|AutoProperty|] {{ get; set; }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } @@ -348,7 +352,11 @@ End Function End Class End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotOverloadOperatorEqualsOnReferenceTypesTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotOverloadOperatorEqualsOnReferenceTypesTests.cs index 2ea371f3e6..31547d5f7f 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotOverloadOperatorEqualsOnReferenceTypesTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotOverloadOperatorEqualsOnReferenceTypesTests.cs @@ -137,7 +137,11 @@ public class OuterClass }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } @@ -188,7 +192,11 @@ End Operator End Class End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPassTypesByReferenceTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPassTypesByReferenceTests.cs index e4b1d27dcf..905c790f25 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPassTypesByReferenceTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPassTypesByReferenceTests.cs @@ -211,7 +211,11 @@ public class C {accessibility} void M(ref string [|s|]) {{ }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } @@ -255,7 +259,11 @@ Public Class C End Sub End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPrefixEnumValuesWithTypeNameTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPrefixEnumValuesWithTypeNameTests.cs index ca18c47bb5..cb3868d6a8 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPrefixEnumValuesWithTypeNameTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPrefixEnumValuesWithTypeNameTests.cs @@ -169,7 +169,11 @@ enum State } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpResultAt(6, 25, "State"), @@ -196,7 +200,11 @@ Enum State End Enum End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetBasicResultAt(4, 25, "State"), @@ -237,7 +245,11 @@ enum State } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -264,7 +276,11 @@ Enum State End Enum End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -305,7 +321,11 @@ enum State } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -338,7 +358,11 @@ Enum State End Enum End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectPrefixTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectPrefixTests.cs index fa99ba521e..66c1302c30 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectPrefixTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectPrefixTests.cs @@ -291,7 +291,11 @@ public class Class6 } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1715CSharpResultAt(4, 25, IdentifiersShouldHaveCorrectPrefixAnalyzer.TypeParameterRule, "V"), @@ -344,7 +348,11 @@ public class Class6 } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -582,7 +590,11 @@ Public Class Class6(Of TTypeParameter) End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1715BasicResultAt(4, 28, IdentifiersShouldHaveCorrectPrefixAnalyzer.TypeParameterRule, "V"), @@ -630,7 +642,11 @@ Public Class Class6(Of TTypeParameter) End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectSuffixTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectSuffixTests.cs index 5f0fc7118e..c09054b61c 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectSuffixTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldHaveCorrectSuffixTests.cs @@ -216,7 +216,10 @@ protected DataTableWithWrongSuffix(SerializationInfo info, StreamingContext cont : base(info, context) { } }", }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.CA1710.exclude_indirect_base_types = false") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.CA1710.exclude_indirect_base_types = false") }, ExpectedDiagnostics = { GetCA1710CSharpResultAt(line: 16, column: 14, typeName: "EventsItemsDerived", suffix: "EventArgs"), @@ -759,7 +762,10 @@ End Property End Class", }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.CA1710.exclude_indirect_base_types = false") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.CA1710.exclude_indirect_base_types = false") }, ExpectedDiagnostics = { GetCA1710BasicResultAt(line: 13, column: 14, typeName: "AnotherDataStructure", suffix: "Queue", isSpecial: true), @@ -1173,7 +1179,10 @@ public class C : IReadOnlyCollection IEnumerator IEnumerable.GetEnumerator() => throw new System.NotImplementedException(); }", }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.CA1710.exclude_indirect_base_types = false") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.CA1710.exclude_indirect_base_types = false") }, ExpectedDiagnostics = { GetCA1710CSharpResultAt(6, 14, "C", "Collection"), @@ -1227,7 +1236,11 @@ public class SomeOtherClass } public class SomeOtherSubClass : SomeOtherClass {}"}, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -1295,7 +1308,11 @@ Public Class SomeOtherSubClass Inherits SomeOtherClass End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -1350,7 +1367,11 @@ public void MyMethod() {} } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); @@ -1368,7 +1389,11 @@ End Sub End Class End Namespace" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); } @@ -1393,7 +1418,11 @@ public class SomeClass : Dictionary } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1710CSharpResultAt(4, 14, "SomeClass", "MySuffix"), @@ -1414,7 +1443,11 @@ Public Class SomeClass Inherits Dictionary(Of String, String) End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1710BasicResultAt(4, 14, "SomeClass", "MySuffix"), @@ -1518,7 +1551,11 @@ public class SomeClass : IDataReader } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); @@ -1709,7 +1746,11 @@ End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); } @@ -1751,7 +1792,11 @@ public class SomeClass {} public class SomeSubClass : SomeClass {} public class SomeSubSubClass : SomeSubClass {}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1710CSharpResultAt(7, 14, "C", "Exception") }, } }; @@ -1822,7 +1867,11 @@ Public Class SomeSubSubClass Inherits SomeSubClass End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCA1710BasicResultAt(7, 14, "C", "Exception") }, } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotHaveIncorrectSuffixTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotHaveIncorrectSuffixTests.cs index 3f0cfa4e70..f1aff8188a 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotHaveIncorrectSuffixTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotHaveIncorrectSuffixTests.cs @@ -2064,7 +2064,11 @@ public enum MyFlag {} public class MyAttribute {}", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); @@ -2082,7 +2086,11 @@ End Enum Public Class MyAttribute End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberParameterRuleTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberParameterRuleTests.cs index aa935c38ad..ec26ddd03f 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberParameterRuleTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberParameterRuleTests.cs @@ -434,7 +434,11 @@ public class C public virtual void F(int @int) {} }", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); @@ -450,7 +454,11 @@ Public Overridable Sub F([int] As Integer) End Sub End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); } @@ -474,7 +482,11 @@ public class C public virtual void F(int @int) {} }", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpResultAt(4, 31, IdentifiersShouldNotMatchKeywordsAnalyzer.MemberParameterRule, "C.F(int)", "int", "int"), }, }, }.RunAsync(); @@ -491,7 +503,11 @@ Public Overridable Sub F([int] As Integer) End Sub End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetBasicResultAt(3, 30, IdentifiersShouldNotMatchKeywordsAnalyzer.MemberParameterRule, "C.F(Integer)", "int", "int"), }, }, }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberRuleTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberRuleTests.cs index 95722bb0de..f66553c953 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberRuleTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsMemberRuleTests.cs @@ -655,7 +655,11 @@ public virtual void @internal() {} } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); @@ -671,7 +675,11 @@ Public Overridable Sub internal() End Sub End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); } @@ -696,7 +704,11 @@ public virtual void @internal() {} } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpResultAt(4, 25, IdentifiersShouldNotMatchKeywordsAnalyzer.MemberRule, "C.internal()", "internal"), }, }, }.RunAsync(); @@ -713,7 +725,11 @@ Public Overridable Sub internal() End Sub End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetBasicResultAt(3, 28, IdentifiersShouldNotMatchKeywordsAnalyzer.MemberRule, "C.internal()", "internal"), }, }, }.RunAsync(); @@ -739,7 +755,11 @@ public class C } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); @@ -754,7 +774,11 @@ Public Class C Public Overridable Property [Sub] As Integer End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); } @@ -779,7 +803,11 @@ public class C } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpResultAt(4, 24, IdentifiersShouldNotMatchKeywordsAnalyzer.MemberRule, "C.for", "for"), }, }, }.RunAsync(); @@ -795,7 +823,11 @@ Public Class C Public Overridable Property [Sub] As Integer End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetBasicResultAt(3, 33, IdentifiersShouldNotMatchKeywordsAnalyzer.MemberRule, "C.Sub", "Sub"), }, }, }.RunAsync(); @@ -822,7 +854,11 @@ public class C } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); } @@ -848,7 +884,11 @@ public class C } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpResultAt(5, 35, IdentifiersShouldNotMatchKeywordsAnalyzer.MemberRule, "C.float", "float"), }, }, }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsNamespaceRuleTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsNamespaceRuleTests.cs index 4253efa2d8..6f61e231e1 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsNamespaceRuleTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsNamespaceRuleTests.cs @@ -194,7 +194,11 @@ public class C {} } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); @@ -210,7 +214,11 @@ Public Class C End Class End Namespace", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); } @@ -235,7 +243,11 @@ public class C {} } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpResultAt(2, 11, IdentifiersShouldNotMatchKeywordsAnalyzer.NamespaceRule, "namespace", "namespace"), }, }, }.RunAsync(); @@ -252,7 +264,11 @@ Public Class C End Class End Namespace", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetBasicResultAt(2, 11, IdentifiersShouldNotMatchKeywordsAnalyzer.NamespaceRule, "Namespace", "Namespace"), }, }, }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsTypeRuleTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsTypeRuleTests.cs index 4d22d8a2cf..2601bd6999 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsTypeRuleTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotMatchKeywordsTypeRuleTests.cs @@ -172,7 +172,11 @@ public async Task UserOptionDoesNotIncludeNamedType_NoDiagnostic(string editorCo { @"public class @class {}", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); @@ -186,7 +190,11 @@ public async Task UserOptionDoesNotIncludeNamedType_NoDiagnostic(string editorCo Public Class [Class] End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }.RunAsync(); } @@ -206,7 +214,11 @@ public async Task UserOptionIncludesNamedType_Diagnostic(string editorConfigText { @"public class @class {}", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetCSharpResultAt(1, 14, IdentifiersShouldNotMatchKeywordsAnalyzer.TypeRule, "class", "class"), }, }, }.RunAsync(); @@ -221,7 +233,11 @@ public async Task UserOptionIncludesNamedType_Diagnostic(string editorConfigText Public Class [Class] End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, ExpectedDiagnostics = { GetBasicResultAt(2, 14, IdentifiersShouldNotMatchKeywordsAnalyzer.TypeRule, "Class", "Class"), }, }, }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/TypesThatOwnDisposableFieldsShouldBeDisposableTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/TypesThatOwnDisposableFieldsShouldBeDisposableTests.cs index daf0efd6ff..45fc74e328 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/TypesThatOwnDisposableFieldsShouldBeDisposableTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/TypesThatOwnDisposableFieldsShouldBeDisposableTests.cs @@ -550,7 +550,11 @@ public class {|#0:SomeClass|} } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, ExpectedDiagnostics = { VerifyCS.Diagnostic().WithLocation(0).WithArguments("SomeClass", args), }, }, }.RunAsync(); @@ -570,7 +574,11 @@ Imports System.IO End Class ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, ExpectedDiagnostics = { VerifyVB.Diagnostic().WithLocation(0).WithArguments("SomeClass", args), }, }, }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_NullAnalysis.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_NullAnalysis.cs index bf51456260..40d9188472 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_NullAnalysis.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_NullAnalysis.cs @@ -51,7 +51,10 @@ private static async Task VerifyCSharpAnalyzerAsync(string source, params Diagno TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") }, } }; @@ -67,7 +70,10 @@ private static async Task VerifyBasicAnalyzerAsync(string source, params Diagnos TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") }, } }; @@ -6424,7 +6430,11 @@ void M1() } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); @@ -6447,7 +6457,11 @@ End Sub End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -6790,7 +6804,11 @@ void M1(string param) } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -6819,7 +6837,11 @@ End If End Sub End Module" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_ValueContentAnalysis.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_ValueContentAnalysis.cs index d6ed45309b..5e9727a9a1 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_ValueContentAnalysis.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidDeadConditionalCode_ValueContentAnalysis.cs @@ -2103,7 +2103,10 @@ A M5() } " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") }, ExpectedDiagnostics = { // Test0.cs(30,13): warning CA1508: 'a2 == a' is always 'true'. Remove or refactor the condition(s) to avoid dead code. @@ -2188,7 +2191,10 @@ void M4(out (A a, A a2) arg) } " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") }, ExpectedDiagnostics = { // Test0.cs(16,13): warning CA1508: 'x.Item1.Item1 == a' is always 'true'. Remove or refactor the condition(s) to avoid dead code. @@ -2559,7 +2565,11 @@ public static double NextDouble(this Random random, double minValue, double maxV } " }, - AdditionalFiles = { (".editorconfig", editorconfig) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorconfig} +") } } }.RunAsync(); } @@ -2707,7 +2717,11 @@ public void Load(Uri productFileUrl, Uri originalLocation = null) } " }, - AdditionalFiles = { (".editorconfig", editorconfig) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorconfig} +") } } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzerTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzerTests.cs index dc33cf886d..0f58440429 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzerTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/CodeMetricsAnalyzerTests.cs @@ -127,7 +127,11 @@ public async Task CA1501_AlwaysExcludesTypesInSystemNamespace(string editorConfi TestState = { Sources = { "public class MyUC : System.Windows.Forms.UserControl {}", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, ReferenceAssemblies = AdditionalMetadataReferences.DefaultWithWinForms, }.RunAsync(); @@ -143,7 +147,11 @@ Public Class MyUC Inherits System.Windows.Forms.UserControl End Class", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, ReferenceAssemblies = AdditionalMetadataReferences.DefaultWithWinForms, }.RunAsync(); @@ -223,9 +231,16 @@ public class C2 : SomeClass2 {}" }, AdditionalFiles = { - (".editorconfig", editorConfigText), (AdditionalFileName, codeMetricsConfigText), }, + AnalyzerConfigFiles = + { + ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), + }, }, }; @@ -297,9 +312,16 @@ End Class" }, AdditionalFiles = { - (".editorconfig", editorConfigText), (AdditionalFileName, codeMetricsConfigText), }, + AnalyzerConfigFiles = + { + ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), + }, }, }; @@ -366,9 +388,16 @@ public class C1 : SomeClass {} }, AdditionalFiles = { - (".editorconfig", editorConfigText), (AdditionalFileName, codeMetricsConfigText), }, + AnalyzerConfigFiles = + { + ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), + }, ExpectedDiagnostics = { GetCSharpCA1501ExpectedDiagnostic(15, 14, "C1", 1, 1, "SomeClass"), @@ -418,9 +447,16 @@ End Class" }, AdditionalFiles = { - (".editorconfig", editorConfigText), (AdditionalFileName, codeMetricsConfigText), }, + AnalyzerConfigFiles = + { + ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), + }, ExpectedDiagnostics = { GetBasicCA1501ExpectedDiagnostic(23, 14, "C1", 1, 1, "SomeClass"), @@ -484,9 +520,16 @@ public class C1 : SomeClass {} }, AdditionalFiles = { - (".editorconfig", editorConfigText), (AdditionalFileName, codeMetricsConfigText), }, + AnalyzerConfigFiles = + { + ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), + }, }, }.RunAsync(); @@ -535,9 +578,16 @@ End Class" }, AdditionalFiles = { - (".editorconfig", editorConfigText), (AdditionalFileName, codeMetricsConfigText), }, + AnalyzerConfigFiles = + { + ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), + }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/DoNotIgnoreMethodResultsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/DoNotIgnoreMethodResultsTests.cs index 469a24dc32..0f5cd79b58 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/DoNotIgnoreMethodResultsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/DoNotIgnoreMethodResultsTests.cs @@ -823,7 +823,11 @@ public void Method1(SomeClass sc) } }", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; @@ -860,7 +864,11 @@ End Sub End Class ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs index aea83ee7d1..795ce2b0b1 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/Maintainability/ReviewUnusedParametersTests.cs @@ -866,7 +866,11 @@ public class C }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); @@ -882,7 +886,11 @@ Public Class C End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -1005,7 +1013,11 @@ public class C }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, SolutionTransforms = { WithAnalyzerConfigDocument } }; @@ -1029,7 +1041,11 @@ Public Class C End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, SolutionTransforms = { WithAnalyzerConfigDocument } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/DoNotDeclareEventFieldsAsVirtualTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/DoNotDeclareEventFieldsAsVirtualTests.cs index 923dc06f36..c27fa358fb 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/DoNotDeclareEventFieldsAsVirtualTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/DoNotDeclareEventFieldsAsVirtualTests.cs @@ -80,7 +80,11 @@ public class OuterClass {accessibility} virtual event EventHandler [|ThresholdReached|]; }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/UseLiteralsWhereAppropriateTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/UseLiteralsWhereAppropriateTests.cs index 9394dff326..f7778fb9b6 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/UseLiteralsWhereAppropriateTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/UseLiteralsWhereAppropriateTests.cs @@ -135,7 +135,11 @@ public class Test } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; csTest.ExpectedDiagnostics.AddRange(expected); @@ -162,7 +166,11 @@ Public Class Test End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; vbTest.ExpectedDiagnostics.AddRange(expected); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs index bfaf5ee960..735d2ca753 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/QualityGuidelines/ValidateArgumentsOfPublicMethodsTests.cs @@ -934,7 +934,10 @@ public void M4(string str, C c, bool flag) } " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); @@ -997,7 +1000,10 @@ End Sub End Class" }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); } @@ -1400,7 +1406,10 @@ void M5_Assert(C c) } " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); @@ -1450,7 +1459,10 @@ End Sub End Class " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); } @@ -2004,7 +2016,11 @@ private static void M3(C c) } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); @@ -2034,7 +2050,11 @@ End Sub End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -2078,7 +2098,11 @@ private static void NoValidate(C c) } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, ExpectedDiagnostics = { @@ -2250,7 +2274,11 @@ internal static void NoValidate(C c, U u) } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, ExpectedDiagnostics = { @@ -6459,7 +6487,11 @@ public void M1(string str) } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; csTest.ExpectedDiagnostics.AddRange(expected); @@ -6489,7 +6521,11 @@ End Sub End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; vbTest.ExpectedDiagnostics.AddRange(expected); @@ -6530,7 +6566,11 @@ public static void M1(this string str) } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; csTest.ExpectedDiagnostics.AddRange(expected); @@ -6562,7 +6602,11 @@ Public Sub M1(str As String) End Sub End Module" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; vbTest.ExpectedDiagnostics.AddRange(expected); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests.cs index 5566d35c77..a96286be68 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests.cs @@ -1703,7 +1703,11 @@ void M1(string param) }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -1733,7 +1737,11 @@ Dim c As New Command() End Sub End Module" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests_FlowAnalysis.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests_FlowAnalysis.cs index 882659c59b..2a62ce9ea3 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests_FlowAnalysis.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Data/ReviewSQLQueriesForSecurityVulnerabilitiesTests_FlowAnalysis.cs @@ -6918,7 +6918,10 @@ void M1(string param, string param2, string param3) }} " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); @@ -6964,7 +6967,10 @@ End If End Sub End Module" }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); } @@ -7080,7 +7086,10 @@ void M1(string param, string param2, string param3) }} " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") }, ExpectedDiagnostics = { // Test0.cs(142,25): warning CA2100: Review if the query string passed to 'Command1.Command1(string cmd, string parameter2)' in 'M1', accepts any user input. @@ -7191,7 +7200,10 @@ End If End Sub End Module" }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") }, ExpectedDiagnostics = { // Test0.vb(177,32): warning CA2100: Review if the query string passed to 'Sub Command1.New(cmd As String, parameter2 As String)' in 'M1', accepts any user input. @@ -8387,7 +8399,10 @@ void M5_Assert(string param) }} " }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); @@ -8436,7 +8451,10 @@ Private Sub M5_Assert(ByVal param As String) End Sub End Module" }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.copy_analysis = true") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.copy_analysis = true") } } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzerTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzerTests.cs index b4cb36979b..1cb1cb7999 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzerTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzerTests.cs @@ -3491,14 +3491,22 @@ private static async Task VerifyAnalyzerAsyncCs(string sourceCode, params Diagno private static async Task VerifyAnalyzerAsyncCs(string sourceCode, string editorconfigText, params DiagnosticResult[] expectedDiagnostics) { var test = PopulateTestCs(sourceCode, expectedDiagnostics); - test.TestState.AdditionalFiles.Add((".editorconfig", editorconfigText)); + test.TestState.AnalyzerConfigFiles.Add(("/.editorconfig", $@"root = true + +[*] +{editorconfigText} +")); await test.RunAsync(); } private static async Task VerifyAnalyzerAsyncCs(string sourceCode, string editorconfigText) { var test = PopulateTestCs(sourceCode); - test.TestState.AdditionalFiles.Add((".editorconfig", editorconfigText)); + test.TestState.AnalyzerConfigFiles.Add(("/.editorconfig", $@"root = true + +[*] +{editorconfigText} +")); await test.RunAsync(); } @@ -3508,7 +3516,11 @@ private static async Task VerifyAnalyzerAsyncVb(string sourceCode, params Diagno private static async Task VerifyAnalyzerAsyncVb(string sourceCode, string editorconfigText, params DiagnosticResult[] expectedDiagnostics) { var test = PopulateTestVb(sourceCode, expectedDiagnostics); - test.TestState.AdditionalFiles.Add((".editorconfig", editorconfigText)); + test.TestState.AnalyzerConfigFiles.Add(("/.editorconfig", $@"root = true + +[*] +{editorconfigText} +")); await test.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs index bc71f92113..a6c3d6e134 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposableFieldsShouldBeDisposedTests.cs @@ -3326,7 +3326,11 @@ public void Dispose() } } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -3366,7 +3370,11 @@ Public Sub Dispose() Implements IDisposable.Dispose End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs index 7436430c17..4bcdf94b53 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs @@ -1290,7 +1290,11 @@ public DisposableOwnerType(A a) TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -1332,7 +1336,11 @@ End Class TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -1385,7 +1393,11 @@ void TransferDisposeOwnership(A a) TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -1425,7 +1437,11 @@ End Class TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -1525,7 +1541,11 @@ public void Close() TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }; @@ -1601,7 +1621,11 @@ End Class TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }; @@ -1696,7 +1720,10 @@ End Sub End Class " }, - AdditionalFiles = { (".editorconfig", GetEditorConfigContent(disposeAnalysisKind)) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{GetEditorConfigContent(disposeAnalysisKind)}") } } }; @@ -2644,7 +2671,11 @@ void M1() } " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); @@ -2671,7 +2702,11 @@ Dim a As List(Of A) = New List(Of A) From {New A()} ' TODO: https://github.co End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -2713,7 +2748,11 @@ void M1() } " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); @@ -2741,7 +2780,11 @@ Dim a As List(Of A) = New List(Of A) From {New A()} End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -2783,7 +2826,11 @@ void M1(int i) } " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); @@ -2811,7 +2858,11 @@ Dim a As List(Of A) = New List(Of A) From {New A()} End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -2886,7 +2937,11 @@ void M1() } " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); @@ -2959,7 +3014,11 @@ Dim l As New NonGenericList() End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -3035,7 +3094,11 @@ void M1() } " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); @@ -3101,7 +3164,11 @@ Private Sub M1() End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -6182,7 +6249,11 @@ void M2(Action disposeCallback) TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }; @@ -7193,7 +7264,11 @@ void M1(string filePath, FileMode fileMode) } " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") }, ExpectedDiagnostics = { // Test0.cs(34,25): warning CA2000: Use recommended dispose pattern to ensure that object created by 'new FileStream(filePath, fileMode)' is disposed on all exception paths. If possible, wrap the creation within a 'using' statement or a 'using' declaration. Otherwise, use a try-finally pattern, with a dedicated local variable declared before the try region and an unconditional Dispose invocation on non-null value in the 'finally' region, say 'x?.Dispose()'. If the object is explicitly disposed within the try region or the dispose ownership is transfered to another object or method, assign 'null' to the local variable just after such an operation to prevent double dispose in 'finally'. @@ -7303,7 +7378,11 @@ End Sub End Class " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") }, ExpectedDiagnostics = { // Test0.vb(30,32): warning CA2000: Use recommended dispose pattern to ensure that object created by 'New FileStream(filePath, fileMode)' is disposed on all exception paths. If possible, wrap the creation within a 'using' statement or a 'using' declaration. Otherwise, use a try-finally pattern, with a dedicated local variable declared before the try region and an unconditional Dispose invocation on non-null value in the 'finally' region, say 'x?.Dispose()'. If the object is explicitly disposed within the try region or the dispose ownership is transfered to another object or method, assign 'null' to the local variable just after such an operation to prevent double dispose in 'finally'. @@ -7630,7 +7709,11 @@ void ThrowException() TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }; csharpTest.ExpectedDiagnostics.AddRange(builder); @@ -7706,7 +7789,11 @@ End Class TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }; vbTest.ExpectedDiagnostics.AddRange(builder); @@ -8706,7 +8793,11 @@ A M5() } " }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -10082,7 +10173,10 @@ void M12(bool flag1, bool flag2, bool flag3) } " }, - AdditionalFiles = { (".editorconfig", GetEditorConfigContent(DisposeAnalysisKind.AllPaths)) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{GetEditorConfigContent(DisposeAnalysisKind.AllPaths)}") }, ExpectedDiagnostics = { // Test0.cs(17,15): warning CA2000: Use recommended dispose pattern to ensure that object created by 'new A(1)' is disposed on all paths. If possible, wrap the creation within a 'using' statement or a 'using' declaration. Otherwise, use a try-finally pattern, with a dedicated local variable declared before the try region and an unconditional Dispose invocation on non-null value in the 'finally' region, say 'x?.Dispose()'. If the object is explicitly disposed within the try region or the dispose ownership is transfered to another object or method, assign 'null' to the local variable just after such an operation to prevent double dispose in 'finally'. @@ -10325,7 +10419,10 @@ End Sub End Class " }, - AdditionalFiles = { (".editorconfig", GetEditorConfigContent(DisposeAnalysisKind.AllPaths)) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{GetEditorConfigContent(DisposeAnalysisKind.AllPaths)}") }, ExpectedDiagnostics = { // Test0.vb(16,22): warning CA2000: Use recommended dispose pattern to ensure that object created by 'New A(1)' is disposed on all paths. If possible, wrap the creation within a 'using' statement or a 'using' declaration. Otherwise, use a try-finally pattern, with a dedicated local variable declared before the try region and an unconditional Dispose invocation on non-null value in the 'finally' region, say 'x?.Dispose()'. If the object is explicitly disposed within the try region or the dispose ownership is transfered to another object or method, assign 'null' to the local variable just after such an operation to prevent double dispose in 'finally'. @@ -10517,7 +10614,10 @@ public MyException(Exception inner) } " }, - AdditionalFiles = { (".editorconfig", GetEditorConfigContent(disposeAnalysisKind)) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{GetEditorConfigContent(disposeAnalysisKind)}") } } }; @@ -11248,7 +11348,11 @@ void M2(object o) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -11296,7 +11400,11 @@ public void Remove2(object key) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }.RunAsync(); } @@ -11542,7 +11650,11 @@ void M1() } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -11578,7 +11690,11 @@ Dim a As New A() End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -11628,7 +11744,11 @@ void M1() } " }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -11669,7 +11789,11 @@ Sub M2(a As A) End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -11852,7 +11976,11 @@ public void Dispose() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -11899,7 +12027,11 @@ public void Dispose() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -11947,7 +12079,11 @@ private void Warning2() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigFile) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigFile} +") } } }.RunAsync(); } @@ -12057,7 +12193,11 @@ void M1() } }", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -12101,7 +12241,11 @@ End Sub End Class End Namespace", }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }; @@ -12209,7 +12353,11 @@ public C() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); @@ -12236,7 +12384,11 @@ Public Sub New() End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, } }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs index 626e7da123..023b0a4fd2 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParametersTests.cs @@ -494,7 +494,11 @@ public void M1(C c) } ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, ExpectedDiagnostics = { // Test0.cs(17,13): warning CA1303: Method 'void Test.M1(C c)' passes a literal string as parameter 'param' of a call to 'void C.M(string param, string message)'. Retrieve the following string(s) from a resource table instead: "a". @@ -528,7 +532,11 @@ End Sub End Class ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, ExpectedDiagnostics = { // Test0.vb(13,13): warning CA1303: Method 'Sub Test.M1(c As C)' passes a literal string as parameter 'param' of a call to 'Sub C.M(param As String, message As String)'. Retrieve the following string(s) from a resource table instead: "a". @@ -1334,7 +1342,11 @@ public void M1(C c) }} ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; @@ -1365,7 +1377,11 @@ End Sub End Class ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; @@ -1425,7 +1441,11 @@ public void M1(C c) }} ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; @@ -1455,7 +1475,11 @@ End Sub End Class ", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; @@ -1495,7 +1519,10 @@ private class DerivedClass : BaseClass } }", }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.CA1303.use_naming_heuristic = true"), }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.CA1303.use_naming_heuristic = true"), }, ExpectedDiagnostics = { // Test0.cs(6,45): warning CA1303: Method 'void Program.Main()' passes a literal string as parameter 'text' of a call to 'decimal DerivedClass.Generic(string text)'. Retrieve the following string(s) from a resource table instead: "number". @@ -1532,7 +1559,10 @@ private class DerivedClass : BaseClass } }", }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.CA1303.use_naming_heuristic = true"), }, + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.CA1303.use_naming_heuristic = true"), }, ExpectedDiagnostics = { // Test0.cs(6,45): warning CA1303: Method 'void Program.Main()' passes a literal string as parameter 'text' of a call to 'decimal DerivedClass.Generic(string text)'. Retrieve the following string(s) from a resource table instead: "number". @@ -1587,7 +1617,11 @@ public void M1(C c) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -1651,7 +1685,11 @@ public void M1() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigTextWithNamingHeuristic) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigTextWithNamingHeuristic} +") } } }; @@ -1711,7 +1749,11 @@ public void M1() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigTextWithNamingHeuristic) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigTextWithNamingHeuristic} +") } } }; @@ -1767,7 +1809,10 @@ public void M1() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigTextWithNamingHeuristic) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigTextWithNamingHeuristic}") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectlyTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectlyTests.cs index 4832316203..b28791c72e 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectlyTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectlyTests.cs @@ -218,7 +218,11 @@ public C(IReadOnlyList l) TestState = { Sources = { csharpSource, }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, ExpectedDiagnostics = { GetCSharpResultAt(10, 9), @@ -258,7 +262,11 @@ End Sub TestState = { Sources = { vbSource, }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, ExpectedDiagnostics = { GetBasicResultAt(8, 13), diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/InstantiateArgumentExceptionsCorrectlyTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/InstantiateArgumentExceptionsCorrectlyTests.cs index 12410c1e29..a2e8f3b18c 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/InstantiateArgumentExceptionsCorrectlyTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/InstantiateArgumentExceptionsCorrectlyTests.cs @@ -685,7 +685,11 @@ public class C }} }}" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, MarkupOptions = MarkupOptions.UseFirstDescriptor }.RunAsync(); @@ -705,7 +709,11 @@ Public Class C End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, MarkupOptions = MarkupOptions.UseFirstDescriptor }.RunAsync(); @@ -734,7 +742,10 @@ private void TestFlipped(string first) }} }}" }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.CA2208.api_surface = public") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.CA2208.api_surface = public") } }, MarkupOptions = MarkupOptions.UseFirstDescriptor }.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/ProvideCorrectArgumentsToFormattingMethodsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/ProvideCorrectArgumentsToFormattingMethodsTests.cs index c36c7e6fd2..0870a37cf5 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/ProvideCorrectArgumentsToFormattingMethodsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/ProvideCorrectArgumentsToFormattingMethodsTests.cs @@ -375,7 +375,11 @@ void M1(string param) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -405,7 +409,11 @@ Private Sub M1(ByVal param As String) End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -450,7 +458,11 @@ void M1(string param) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; @@ -480,7 +492,11 @@ Private Sub M1(ByVal param As String) End Sub End Class" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs index 61ac1e031e..3dd20ca872 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureInfoTests.cs @@ -691,7 +691,11 @@ public void M() } }", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; @@ -725,7 +729,11 @@ End Sub End Class End Namespace", }, - AdditionalFiles = { (".editorconfig", editorConfigText), }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), }, }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotAddArchiveItemPathToTheTargetFileSystemPathTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotAddArchiveItemPathToTheTargetFileSystemPathTests.cs index 2a5d59019c..e709c06272 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotAddArchiveItemPathToTheTargetFileSystemPathTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotAddArchiveItemPathToTheTargetFileSystemPathTests.cs @@ -228,7 +228,11 @@ public void TestMethod(ZipArchiveEntry zipArchiveEntry) { zipArchiveEntry.ExtractToFile(zipArchiveEntry.FullName); } -}", (".editorconfig", editorConfigText), expected); +}", ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +"), expected); } } } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableSchUseStrongCryptoTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableSchUseStrongCryptoTests.cs index 565ba89ae2..5046e4c58c 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableSchUseStrongCryptoTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableSchUseStrongCryptoTests.cs @@ -259,7 +259,11 @@ public void TestMethod() } }", }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableUsingServicePointManagerSecurityProtocolsTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableUsingServicePointManagerSecurityProtocolsTests.cs index 18db53fc98..9280a3a8ce 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableUsingServicePointManagerSecurityProtocolsTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotDisableUsingServicePointManagerSecurityProtocolsTests.cs @@ -260,7 +260,11 @@ public void ExampleMethod() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotInstallRootCertTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotInstallRootCertTests.cs index 0464b8995b..e7f30ce3c3 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotInstallRootCertTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotInstallRootCertTests.cs @@ -440,7 +440,11 @@ public void TestMethod() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } } }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerBinaryFormatterWithoutBinderTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerBinaryFormatterWithoutBinderTests.cs index 90be02b5f9..004c18072d 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerBinaryFormatterWithoutBinderTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerBinaryFormatterWithoutBinderTests.cs @@ -1430,7 +1430,11 @@ public BookRecord DeserializeBookRecord(byte[] bytes) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJavascriptSerializerWithSimpleTypeResolverTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJavascriptSerializerWithSimpleTypeResolverTests.cs index 990de274c4..d8f1102c0c 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJavascriptSerializerWithSimpleTypeResolverTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJavascriptSerializerWithSimpleTypeResolverTests.cs @@ -627,7 +627,11 @@ public T Des(string str) }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) }, + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") }, }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJsonNetWithoutBinderTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJsonNetWithoutBinderTests.cs index b7ab517ac2..5863426151 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJsonNetWithoutBinderTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureDeserializerJsonNetWithoutBinderTests.cs @@ -757,7 +757,11 @@ object Method(JsonReader jr) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureSettingsForJsonNetTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureSettingsForJsonNetTests.cs index 6007ddb122..05f0466c42 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureSettingsForJsonNetTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseInsecureSettingsForJsonNetTests.cs @@ -1370,7 +1370,11 @@ object Method(string s) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseWeakKDFInsufficientIterationCountTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseWeakKDFInsufficientIterationCountTests.cs index fb48b691e9..9ee01cd4d9 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseWeakKDFInsufficientIterationCountTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/DoNotUseWeakKDFInsufficientIterationCountTests.cs @@ -432,7 +432,11 @@ public void TestMethod(string password, byte[] salt, int cb) }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/TaintedDataAnalyzerTestBase.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/TaintedDataAnalyzerTestBase.cs index 079102b04f..df351e3f81 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/TaintedDataAnalyzerTestBase.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/TaintedDataAnalyzerTestBase.cs @@ -70,7 +70,7 @@ protected async Task VerifyCSharpWithDependenciesAsync(string source, (string ad } } - test.TestState.AdditionalFiles.Add(file); + test.TestState.AnalyzerConfigFiles.Add(file); test.TestState.ExpectedDiagnostics.AddRange(expected); await test.RunAsync(); diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseAutoValidateAntiforgeryTokenTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseAutoValidateAntiforgeryTokenTests.cs index 21c549c17b..dc5a47954c 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseAutoValidateAntiforgeryTokenTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseAutoValidateAntiforgeryTokenTests.cs @@ -433,7 +433,10 @@ public AcceptedAtActionResult CustomizedActionMethod (string actionName) } }", }, - AdditionalFiles = { (".editorconfig", "dotnet_code_quality.CA5391.exclude_aspnet_core_mvc_controllerbase = false") } + AnalyzerConfigFiles = { ("/.editorconfig", @"root = true + +[*] +dotnet_code_quality.CA5391.exclude_aspnet_core_mvc_controllerbase = false") } }, }; @@ -1600,7 +1603,11 @@ public AcceptedAtActionResult CustomizedActionMethod (string actionName) } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseContainerLevelAccessPolicyTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseContainerLevelAccessPolicyTests.cs index 988b3737c6..7b992961dd 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseContainerLevelAccessPolicyTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseContainerLevelAccessPolicyTests.cs @@ -37,7 +37,11 @@ private async Task VerifyCSharpWithDependenciesAsync(string source, string edito TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }; diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseDefaultDllImportSearchPathsAttributeTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseDefaultDllImportSearchPathsAttributeTests.cs index a0ef20cb1e..49a0bfd66f 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseDefaultDllImportSearchPathsAttributeTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseDefaultDllImportSearchPathsAttributeTests.cs @@ -284,7 +284,11 @@ public void TestMethod() { GetCSharpResultAt(9, 30, UseDefaultDllImportSearchPathsAttribute.DoNotUseUnsafeDllImportSearchPathRule, "AssemblyDirectory, ApplicationDirectory"), }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } @@ -319,7 +323,11 @@ public void TestMethod() { GetCSharpResultAt(9, 30, UseDefaultDllImportSearchPathsAttribute.DoNotUseUnsafeDllImportSearchPathRule, "System32"), }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } @@ -354,7 +362,11 @@ public void TestMethod() { GetCSharpResultAt(9, 30, UseDefaultDllImportSearchPathsAttribute.DoNotUseUnsafeDllImportSearchPathRule, "UserDirectories"), }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } @@ -425,7 +437,11 @@ public void TestMethod() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } @@ -456,7 +472,11 @@ public void TestMethod() } }" }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, }.RunAsync(); } diff --git a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseSharedAccessProtocolHttpsOnlyTests.cs b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseSharedAccessProtocolHttpsOnlyTests.cs index 69def59099..32e13d64d3 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseSharedAccessProtocolHttpsOnlyTests.cs +++ b/src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Security/UseSharedAccessProtocolHttpsOnlyTests.cs @@ -37,7 +37,11 @@ protected async Task VerifyCSharpWithDependenciesAsync(string source, string edi TestState = { Sources = { source }, - AdditionalFiles = { (".editorconfig", editorConfigText) } + AnalyzerConfigFiles = { ("/.editorconfig", $@"root = true + +[*] +{editorConfigText} +") } }, };