diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.csproj b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.csproj index f35cd45d1..64d68dbe7 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.csproj +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.csproj @@ -46,6 +46,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ObsoleteMessages.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ObsoleteMessages.cs new file mode 100644 index 000000000..75657c330 --- /dev/null +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ObsoleteMessages.cs @@ -0,0 +1,11 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace Microsoft.CodeAnalysis.Testing +{ + internal static class ObsoleteMessages + { + public const string FrameworkPackages = "https://github.com/dotnet/roslyn-sdk/blob/main/src/Microsoft.CodeAnalysis.Testing/README.md#obsolete-packages"; + } +} diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier.cs index cd7769ccd..fd9950071 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class AnalyzerVerifier { public static AnalyzerVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier`1.cs index 96e02eb3a..28f09795f 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest/AnalyzerVerifier`1.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class AnalyzerVerifier : CSharpAnalyzerVerifier where TAnalyzer : DiagnosticAnalyzer, new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier.cs index 0a87991e5..fa65de843 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class AnalyzerVerifier { public static AnalyzerVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier`1.cs index 5dbb746be..21884373c 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit/AnalyzerVerifier`1.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class AnalyzerVerifier : CSharpAnalyzerVerifier where TAnalyzer : DiagnosticAnalyzer, new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier.cs index 8ea438001..5a401e243 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class AnalyzerVerifier { public static AnalyzerVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier`1.cs index d73936158..e364ab607 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit/AnalyzerVerifier`1.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class AnalyzerVerifier : CSharpAnalyzerVerifier where TAnalyzer : DiagnosticAnalyzer, new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier.cs index 6584195c8..b36de66a0 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class CodeFixVerifier { public static CodeFixVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier`2.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier`2.cs index dd0884d12..3c308be41 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier`2.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest/CodeFixVerifier`2.cs @@ -2,12 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class CodeFixVerifier : CSharpCodeFixVerifier where TAnalyzer : DiagnosticAnalyzer, new() where TCodeFix : CodeFixProvider, new() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier.cs index 5a5a85fa9..1ae128e45 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class CodeFixVerifier { public static CodeFixVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier`2.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier`2.cs index 59acf2687..7df25f420 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier`2.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit/CodeFixVerifier`2.cs @@ -2,12 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class CodeFixVerifier : CSharpCodeFixVerifier where TAnalyzer : DiagnosticAnalyzer, new() where TCodeFix : CodeFixProvider, new() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier.cs index 9f2502db5..4aa175bd0 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class CodeFixVerifier { public static CodeFixVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier`2.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier`2.cs index bc330b724..83950b242 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier`2.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit/CodeFixVerifier`2.cs @@ -2,12 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class CodeFixVerifier : CSharpCodeFixVerifier where TAnalyzer : DiagnosticAnalyzer, new() where TCodeFix : CodeFixProvider, new() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.cs index 545e1d68d..995cc7e13 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class CodeRefactoringVerifier { public static CodeRefactoringVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.cs index 98b8d6f65..2aa747f51 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class CodeRefactoringVerifier : CSharpCodeRefactoringVerifier where TCodeRefactoring : CodeRefactoringProvider, new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.cs index 390c991f5..fc72766f6 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class CodeRefactoringVerifier { public static CodeRefactoringVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.cs index b60767361..58b3a2aad 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class CodeRefactoringVerifier : CSharpCodeRefactoringVerifier where TCodeRefactoring : CodeRefactoringProvider, new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.cs index 6d0a36979..b1b7bf908 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Testing; namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class CodeRefactoringVerifier { public static CodeRefactoringVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.cs index 8d0c0aa8f..4b6b4a9c8 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.cs @@ -2,11 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using Microsoft.CodeAnalysis.CodeRefactorings; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class CodeRefactoringVerifier : CSharpCodeRefactoringVerifier where TCodeRefactoring : CodeRefactoringProvider, new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.cs index beec62067..4a6018eb1 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.cs @@ -2,8 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using Microsoft.CodeAnalysis.Testing; + namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class SourceGeneratorVerifier { public static SourceGeneratorVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.cs index 69eb4e7ee..4113a41fa 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.MSTest { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class SourceGeneratorVerifier : CSharpSourceGeneratorVerifier where TSourceGenerator : new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.cs index ce05c3bee..1eec1c9aa 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.cs @@ -2,8 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using Microsoft.CodeAnalysis.Testing; + namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class SourceGeneratorVerifier { public static SourceGeneratorVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.cs index b615f672d..008b773f4 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.NUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class SourceGeneratorVerifier : CSharpSourceGeneratorVerifier where TSourceGenerator : new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.cs index 736320d2c..4b067e44e 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.cs @@ -2,8 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using Microsoft.CodeAnalysis.Testing; + namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public static class SourceGeneratorVerifier { public static SourceGeneratorVerifier Create() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.cs index 602680900..1da427bfa 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.cs @@ -2,10 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.Testing.Verifiers; namespace Microsoft.CodeAnalysis.CSharp.Testing.XUnit { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class SourceGeneratorVerifier : CSharpSourceGeneratorVerifier where TSourceGenerator : new() { diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest/MSTestVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest/MSTestVerifier.cs index 3cd79b1e2..e743ebe2c 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest/MSTestVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest/MSTestVerifier.cs @@ -11,6 +11,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class MSTestVerifier : IVerifier { public MSTestVerifier() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit/NUnitVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit/NUnitVerifier.cs index 8105c97ce..691de76e9 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit/NUnitVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit/NUnitVerifier.cs @@ -11,6 +11,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class NUnitVerifier : IVerifier { public NUnitVerifier() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EmptyWithMessageException.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EmptyWithMessageException.cs index d91b9519d..15b9d5821 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EmptyWithMessageException.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EmptyWithMessageException.cs @@ -8,6 +8,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class EmptyWithMessageException : EmptyException { public EmptyWithMessageException(IEnumerable collection, string userMessage) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EqualWithMessageException.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EqualWithMessageException.cs index 3a14e78ed..7cd97607e 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EqualWithMessageException.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/EqualWithMessageException.cs @@ -7,6 +7,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class EqualWithMessageException : EqualException { public EqualWithMessageException(object? expected, object? actual, string userMessage) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/NotEmptyWithMessageException.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/NotEmptyWithMessageException.cs index 9204a8b22..2cfe53a69 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/NotEmptyWithMessageException.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/NotEmptyWithMessageException.cs @@ -7,6 +7,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class NotEmptyWithMessageException : NotEmptyException { public NotEmptyWithMessageException(string userMessage) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/XUnitVerifier.cs b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/XUnitVerifier.cs index 76279fbd4..fc1cb19fd 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/XUnitVerifier.cs +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit/XUnitVerifier.cs @@ -11,6 +11,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class XUnitVerifier : IVerifier { public XUnitVerifier() diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier.vb index 821a5c324..6a5da6ef8 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier.vb @@ -1,7 +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. Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing + Module AnalyzerVerifier Function Create(Of TAnalyzer As {DiagnosticAnalyzer, New})() As AnalyzerVerifier(Of TAnalyzer) Return New AnalyzerVerifier(Of TAnalyzer) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier`1.vb index 30f19ca2d..22b9995ff 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest/AnalyzerVerifier`1.vb @@ -1,8 +1,10 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class AnalyzerVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}) Inherits VisualBasicAnalyzerVerifier(Of TAnalyzer, MSTestVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier.vb index 821a5c324..6a5da6ef8 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier.vb @@ -1,7 +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. Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing + Module AnalyzerVerifier Function Create(Of TAnalyzer As {DiagnosticAnalyzer, New})() As AnalyzerVerifier(Of TAnalyzer) Return New AnalyzerVerifier(Of TAnalyzer) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier`1.vb index b2bc60934..3ecd5bca0 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit/AnalyzerVerifier`1.vb @@ -1,8 +1,10 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class AnalyzerVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}) Inherits VisualBasicAnalyzerVerifier(Of TAnalyzer, NUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier.vb index 821a5c324..6a5da6ef8 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier.vb @@ -1,7 +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. Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing + Module AnalyzerVerifier Function Create(Of TAnalyzer As {DiagnosticAnalyzer, New})() As AnalyzerVerifier(Of TAnalyzer) Return New AnalyzerVerifier(Of TAnalyzer) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier`1.vb index b0d6eefdd..2706e3f2b 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit/AnalyzerVerifier`1.vb @@ -1,8 +1,10 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class AnalyzerVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}) Inherits VisualBasicAnalyzerVerifier(Of TAnalyzer, XUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier.vb index 4c56af983..c43f3c4db 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier.vb @@ -2,7 +2,9 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing + Module CodeFixVerifier Public Function Create(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New})() As CodeFixVerifier(Of TAnalyzer, TCodeFix) Return New CodeFixVerifier(Of TAnalyzer, TCodeFix) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier`2.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier`2.vb index a3de62723..bf1c4f7f7 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier`2.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest/CodeFixVerifier`2.vb @@ -2,8 +2,10 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class CodeFixVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New}) Inherits VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, MSTestVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier.vb index 4c56af983..c43f3c4db 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier.vb @@ -2,7 +2,9 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing + Module CodeFixVerifier Public Function Create(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New})() As CodeFixVerifier(Of TAnalyzer, TCodeFix) Return New CodeFixVerifier(Of TAnalyzer, TCodeFix) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier`2.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier`2.vb index ba85c684f..6dcced196 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier`2.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit/CodeFixVerifier`2.vb @@ -2,8 +2,10 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class CodeFixVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New}) Inherits VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, NUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier.vb index 4c56af983..c43f3c4db 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier.vb @@ -2,7 +2,9 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing + Module CodeFixVerifier Public Function Create(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New})() As CodeFixVerifier(Of TAnalyzer, TCodeFix) Return New CodeFixVerifier(Of TAnalyzer, TCodeFix) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier`2.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier`2.vb index ea978fd67..1d33ee6ab 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier`2.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit/CodeFixVerifier`2.vb @@ -2,8 +2,10 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class CodeFixVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New}) Inherits VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, XUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.vb index ad363ea08..8248ac83a 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier.vb @@ -1,7 +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. Imports Microsoft.CodeAnalysis.CodeRefactorings +Imports Microsoft.CodeAnalysis.Testing + Module CodeRefactoringVerifier Public Function Create(Of TCodeRefactoring As {CodeRefactoringProvider, New})() As CodeRefactoringVerifier(Of TCodeRefactoring) Return New CodeRefactoringVerifier(Of TCodeRefactoring) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.vb index 5197a8ef6..19738765d 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest/CodeRefactoringVerifier`1.vb @@ -1,8 +1,10 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. Imports Microsoft.CodeAnalysis.CodeRefactorings +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class CodeRefactoringVerifier(Of TCodeRefactoring As {CodeRefactoringProvider, New}) Inherits VisualBasicCodeRefactoringVerifier(Of TCodeRefactoring, MSTestVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.vb index ad363ea08..8248ac83a 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier.vb @@ -1,7 +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. Imports Microsoft.CodeAnalysis.CodeRefactorings +Imports Microsoft.CodeAnalysis.Testing + Module CodeRefactoringVerifier Public Function Create(Of TCodeRefactoring As {CodeRefactoringProvider, New})() As CodeRefactoringVerifier(Of TCodeRefactoring) Return New CodeRefactoringVerifier(Of TCodeRefactoring) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.vb index f8825510f..9ecc0ac92 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit/CodeRefactoringVerifier`1.vb @@ -1,8 +1,10 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. Imports Microsoft.CodeAnalysis.CodeRefactorings +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class CodeRefactoringVerifier(Of TCodeRefactoring As {CodeRefactoringProvider, New}) Inherits VisualBasicCodeRefactoringVerifier(Of TCodeRefactoring, NUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.vb index ad363ea08..8248ac83a 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier.vb @@ -1,7 +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. Imports Microsoft.CodeAnalysis.CodeRefactorings +Imports Microsoft.CodeAnalysis.Testing + Module CodeRefactoringVerifier Public Function Create(Of TCodeRefactoring As {CodeRefactoringProvider, New})() As CodeRefactoringVerifier(Of TCodeRefactoring) Return New CodeRefactoringVerifier(Of TCodeRefactoring) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.vb index 5484d099f..359d7a889 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit/CodeRefactoringVerifier`1.vb @@ -1,8 +1,10 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. Imports Microsoft.CodeAnalysis.CodeRefactorings +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class CodeRefactoringVerifier(Of TCodeRefactoring As {CodeRefactoringProvider, New}) Inherits VisualBasicCodeRefactoringVerifier(Of TCodeRefactoring, XUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.vb index c518e23b9..9d5c710ef 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier.vb @@ -1,5 +1,8 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +Imports Microsoft.CodeAnalysis.Testing + + Module SourceGeneratorVerifier Public Function Create(Of TSourceGenerator As New)() As SourceGeneratorVerifier(Of TSourceGenerator) Return New SourceGeneratorVerifier(Of TSourceGenerator) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.vb index cf20ce5bc..95a11d8b8 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest/SourceGeneratorVerifier`1.vb @@ -1,7 +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. +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class SourceGeneratorVerifier(Of TSourceGenerator As New) Inherits VisualBasicSourceGeneratorVerifier(Of TSourceGenerator, MSTestVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.vb index c518e23b9..9d5c710ef 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier.vb @@ -1,5 +1,8 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +Imports Microsoft.CodeAnalysis.Testing + + Module SourceGeneratorVerifier Public Function Create(Of TSourceGenerator As New)() As SourceGeneratorVerifier(Of TSourceGenerator) Return New SourceGeneratorVerifier(Of TSourceGenerator) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.vb index 765192e13..5ef965ddd 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit/SourceGeneratorVerifier`1.vb @@ -1,7 +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. +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class SourceGeneratorVerifier(Of TSourceGenerator As New) Inherits VisualBasicSourceGeneratorVerifier(Of TSourceGenerator, NUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.vb index c518e23b9..9d5c710ef 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier.vb @@ -1,5 +1,8 @@ ' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +Imports Microsoft.CodeAnalysis.Testing + + Module SourceGeneratorVerifier Public Function Create(Of TSourceGenerator As New)() As SourceGeneratorVerifier(Of TSourceGenerator) Return New SourceGeneratorVerifier(Of TSourceGenerator) diff --git a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.vb b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.vb index 48dda307d..fc78df744 100644 --- a/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.vb +++ b/src/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit/SourceGeneratorVerifier`1.vb @@ -1,7 +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. +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.Testing.Verifiers + Public Class SourceGeneratorVerifier(Of TSourceGenerator As New) Inherits VisualBasicSourceGeneratorVerifier(Of TSourceGenerator, XUnitVerifier) End Class diff --git a/src/Microsoft.CodeAnalysis.Testing/README.md b/src/Microsoft.CodeAnalysis.Testing/README.md index ff497cfbb..5fe7a3a4b 100644 --- a/src/Microsoft.CodeAnalysis.Testing/README.md +++ b/src/Microsoft.CodeAnalysis.Testing/README.md @@ -17,52 +17,48 @@ To reference prerelease packages, add a **NuGet.Config** file to your solution d ``` -### MSTest +### Packages * C# - * Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest - * Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest - * Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest - * Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest + * Microsoft.CodeAnalysis.CSharp.Analyzer.Testing + * Microsoft.CodeAnalysis.CSharp.CodeFix.Testing + * Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing + * Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing * Visual Basic - * Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest - * Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest - * Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest - * Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.MSTest + * Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing + * Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing + * Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing + * Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing -### NUnit +### Obsolete Packages -* C# - * Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.NUnit - * Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.NUnit - * Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.NUnit - * Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.NUnit -* Visual Basic - * Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.NUnit - * Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.NUnit - * Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.NUnit - * Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.NUnit +This collection of packages previously included a number of packages for testing with specific test frameworks, such as +MSTest, NUnit, and xUnit. These packages have been marked obsolete, and users are encouraged to migrate to the generic +test packages. The migration process shown here is specific to MSTest; other frameworks can substitute `NUnit` or `XUnit` +as appropriate. -### xUnit.net +* Remove the **.MSTest** suffix from all referenced packages. For example: -* C# - * Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit - * Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit - * Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit - * Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit -* Visual Basic - * Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit - * Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit - * Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit - * Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit + Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest → Microsoft.CodeAnalysis.CSharp.Analyzer.Testing + +* Remove the **.MSTest** suffix from namespaces. For example: + + ```patch + -using Microsoft.CodeAnalysis.CSharp.Testing.MSTest; + +using Microsoft.CodeAnalysis.CSharp.Testing; + ``` + +* Use `CSharpAnalyzerVerifier` instead of `AnalyzerVerifier`. A similar change + should be applied for each of the other types impacted by this change (remove the language prefix, and add the + `DefaultVerifier` generic argument). ## Verifier overview Testing analyzers and code fixes starts with the selection of a *verifier* helper type. A default analyzer and code fix -verifier types is defined for each test framework and language combination: +verifier types is defined for each language: -* `AnalyzerVerifier` -* `CodeFixVerifier` +* `CSharpAnalyzerVerifier` / `VisualBasicAnalyzerVerifier` +* `CSharpCodeFixVerifier` / `VisualBasicCodeFixVerifier` The verifier types provide limited functionality intended to serve the majority of analyzer and code fix tests: @@ -73,8 +69,8 @@ The verifier types provide limited functionality intended to serve the majority Each of the verifier helper types is supported by a *test* helper type, which provides the primary implementation of each test scenario: -* `AnalyzerTest` -* `CodeFixTest` +* `CSharpAnalyzerTest` / `VisualBasicAnalyzerTest` +* `CSharpCodeFixTest` / `VisualBasicCodeFixTest` ### Imports @@ -82,7 +78,9 @@ This document is written on the assumption that users will alias a verifier or c the context of a test class. ```csharp -using Verify = Microsoft.CodeAnalysis.CSharp.Testing.XUnit.AnalyzerVerifier; +using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier< + SomeAnalyzerType, + Microsoft.CodeAnalysis.Testing.DefaultVerifier>; ``` Users writing tests involving compiler errors may also want to import the static members of the `DiagnosticResult` type, @@ -169,7 +167,7 @@ Advanced use cases involve the instantiation of a test helper, setting the appro `RunAsync` to run the test. These steps can be combined using the object initializer syntax: ```csharp -await new CSharpAnalyzerTest +await new CSharpAnalyzerTest { // Configure test by setting property values here... }.RunAsync(); @@ -178,7 +176,7 @@ await new CSharpAnalyzerTest #### Additional files ```csharp -await new CSharpAnalyzerTest +await new CSharpAnalyzerTest { TestState = { @@ -205,7 +203,7 @@ public static class CSharpAnalyzerVerifier where TAnalyzer : DiagnosticAnalyzer, new() { public static DiagnosticResult Diagnostic(string diagnosticId = null) - => CSharpAnalyzerVerifier.Diagnostic(diagnosticId); + => CSharpAnalyzerVerifier.Diagnostic(diagnosticId); public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) => new DiagnosticResult(descriptor); @@ -219,7 +217,7 @@ public static class CSharpAnalyzerVerifier // Code fix tests support both analyzer and code fix testing. This test class is derived from the code fix test // to avoid the need to maintain duplicate copies of the customization work. - public class Test : CSharpCodeFixTest + public class Test : CSharpCodeFixVerifier.Test { } } @@ -229,7 +227,7 @@ public static class CSharpCodeFixVerifier where TCodeFix : CodeFixProvider, new() { public static DiagnosticResult Diagnostic(string diagnosticId = null) - => CSharpCodeFixVerifier.Diagnostic(diagnosticId); + => CSharpCodeFixVerifier.Diagnostic(diagnosticId); public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) => new DiagnosticResult(descriptor); @@ -259,7 +257,7 @@ public static class CSharpCodeFixVerifier return test.RunAsync(); } - public class Test : CSharpCodeFixTest + public class Test : CSharpCodeFixTest where TAnalyzer : DiagnosticAnalyzer, new() where TCodeFix : CodeFixProvider, new() { diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Test.csproj b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Test.csproj index 97412dd14..762e81068 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Test.csproj +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Test.csproj @@ -9,12 +9,12 @@ - - - - - - + + + + + + diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer+Test.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer+Test.cs index 0fd3a85b0..4cf8caa5c 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer+Test.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer+Test.cs @@ -1,13 +1,13 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.Testing; namespace $safeprojectname$ { public static partial class CSharpAnalyzerVerifier where TAnalyzer : DiagnosticAnalyzer, new() { - public class Test : CSharpAnalyzerTest + public class Test : CSharpAnalyzerTest { public Test() { diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer.cs index a9c14eb1d..e369c9667 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSAnalyzer.cs @@ -4,7 +4,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; namespace $safeprojectname$ { @@ -13,15 +12,15 @@ public static partial class CSharpAnalyzerVerifier { /// public static DiagnosticResult Diagnostic() - => CSharpAnalyzerVerifier.Diagnostic(); + => CSharpAnalyzerVerifier.Diagnostic(); /// public static DiagnosticResult Diagnostic(string diagnosticId) - => CSharpAnalyzerVerifier.Diagnostic(diagnosticId); + => CSharpAnalyzerVerifier.Diagnostic(diagnosticId); /// public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) - => CSharpAnalyzerVerifier.Diagnostic(descriptor); + => CSharpAnalyzerVerifier.Diagnostic(descriptor); /// public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix+Test.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix+Test.cs index f0daec8be..13c1aacf9 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix+Test.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix+Test.cs @@ -1,7 +1,7 @@ using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.Testing; namespace $safeprojectname$ { @@ -9,7 +9,7 @@ public static partial class CSharpCodeFixVerifier where TAnalyzer : DiagnosticAnalyzer, new() where TCodeFix : CodeFixProvider, new() { - public class Test : CSharpCodeFixTest + public class Test : CSharpCodeFixTest { public Test() { diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix.cs index 67fb48696..0a49ca85e 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSCodeFix.cs @@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; namespace $safeprojectname$ { @@ -15,15 +14,15 @@ public static partial class CSharpCodeFixVerifier { /// public static DiagnosticResult Diagnostic() - => CSharpCodeFixVerifier.Diagnostic(); + => CSharpCodeFixVerifier.Diagnostic(); /// public static DiagnosticResult Diagnostic(string diagnosticId) - => CSharpCodeFixVerifier.Diagnostic(diagnosticId); + => CSharpCodeFixVerifier.Diagnostic(diagnosticId); /// public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) - => CSharpCodeFixVerifier.Diagnostic(descriptor); + => CSharpCodeFixVerifier.Diagnostic(descriptor); /// public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSRefactoring+Test.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSRefactoring+Test.cs index 6d657580b..5fa56fab4 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSRefactoring+Test.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/CSRefactoring+Test.cs @@ -1,13 +1,13 @@ using Microsoft.CodeAnalysis.CodeRefactorings; using Microsoft.CodeAnalysis.CSharp.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.Testing; namespace $safeprojectname$ { public static partial class CSharpCodeRefactoringVerifier where TCodeRefactoring : CodeRefactoringProvider, new() { - public class Test : CSharpCodeRefactoringTest + public class Test : CSharpCodeRefactoringTest { public Test() { diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer+Test.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer+Test.cs index 2e1035e47..6fa73c0ba 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer+Test.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer+Test.cs @@ -1,5 +1,5 @@ using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.VisualBasic.Testing; namespace $safeprojectname$ @@ -7,7 +7,7 @@ namespace $safeprojectname$ public static partial class VisualBasicAnalyzerVerifier where TAnalyzer : DiagnosticAnalyzer, new() { - public class Test : VisualBasicAnalyzerTest + public class Test : VisualBasicAnalyzerTest { public Test() { diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer.cs index 0b9389014..ee91e76bc 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBAnalyzer.cs @@ -3,7 +3,6 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.CodeAnalysis.VisualBasic.Testing; namespace $safeprojectname$ @@ -13,15 +12,15 @@ public static partial class VisualBasicAnalyzerVerifier { /// public static DiagnosticResult Diagnostic() - => VisualBasicAnalyzerVerifier.Diagnostic(); + => VisualBasicAnalyzerVerifier.Diagnostic(); /// public static DiagnosticResult Diagnostic(string diagnosticId) - => VisualBasicAnalyzerVerifier.Diagnostic(diagnosticId); + => VisualBasicAnalyzerVerifier.Diagnostic(diagnosticId); /// public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) - => VisualBasicAnalyzerVerifier.Diagnostic(descriptor); + => VisualBasicAnalyzerVerifier.Diagnostic(descriptor); /// public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix+Test.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix+Test.cs index 419feadcf..35302a3a7 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix+Test.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix+Test.cs @@ -1,6 +1,6 @@ using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.VisualBasic.Testing; namespace $safeprojectname$ @@ -9,7 +9,7 @@ public static partial class VisualBasicCodeFixVerifier where TAnalyzer : DiagnosticAnalyzer, new() where TCodeFix : CodeFixProvider, new() { - public class Test : VisualBasicCodeFixTest + public class Test : VisualBasicCodeFixTest { } } diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix.cs index 6a8a5a9c6..17105e24f 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBCodeFix.cs @@ -4,7 +4,6 @@ using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Testing; -using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.CodeAnalysis.VisualBasic.Testing; namespace $safeprojectname$ @@ -15,15 +14,15 @@ public static partial class VisualBasicCodeFixVerifier { /// public static DiagnosticResult Diagnostic() - => VisualBasicCodeFixVerifier.Diagnostic(); + => VisualBasicCodeFixVerifier.Diagnostic(); /// public static DiagnosticResult Diagnostic(string diagnosticId) - => VisualBasicCodeFixVerifier.Diagnostic(diagnosticId); + => VisualBasicCodeFixVerifier.Diagnostic(diagnosticId); /// public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor) - => VisualBasicCodeFixVerifier.Diagnostic(descriptor); + => VisualBasicCodeFixVerifier.Diagnostic(descriptor); /// public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected) diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBRefactoring+Test.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBRefactoring+Test.cs index 8f6695974..f69e8a041 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBRefactoring+Test.cs +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/CSharp/Diagnostic/Test/Verifiers/VBRefactoring+Test.cs @@ -1,5 +1,5 @@ using Microsoft.CodeAnalysis.CodeRefactorings; -using Microsoft.CodeAnalysis.Testing.Verifiers; +using Microsoft.CodeAnalysis.Testing; using Microsoft.CodeAnalysis.VisualBasic.Testing; namespace $safeprojectname$ @@ -7,7 +7,7 @@ namespace $safeprojectname$ public static partial class VisualBasicCodeRefactoringVerifier where TCodeRefactoring : CodeRefactoringProvider, new() { - public class Test : VisualBasicCodeRefactoringTest + public class Test : VisualBasicCodeRefactoringTest { } } diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/UnitTestProject.vbproj b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/UnitTestProject.vbproj index 5a5822da0..0157d65bf 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/UnitTestProject.vbproj +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/UnitTestProject.vbproj @@ -9,12 +9,12 @@ - - - - - - + + + + + + diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer+Test.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer+Test.vb index d1d5facfd..8daf5ba83 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer+Test.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer+Test.vb @@ -1,10 +1,10 @@ Imports Microsoft.CodeAnalysis.CSharp.Testing Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.Testing.Verifiers +Imports Microsoft.CodeAnalysis.Testing Partial Public NotInheritable Class CSharpAnalyzerVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}) Public Class Test - Inherits CSharpAnalyzerTest(Of TAnalyzer, MSTestVerifier) + Inherits CSharpAnalyzerTest(Of TAnalyzer, DefaultVerifier) Public Sub New() SolutionTransforms.Add( diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer.vb index 303122b9e..508f96c95 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSAnalyzer.vb @@ -3,7 +3,6 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CSharp.Testing Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Testing -Imports Microsoft.CodeAnalysis.Testing.Verifiers Partial Public NotInheritable Class CSharpAnalyzerVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}) @@ -13,17 +12,17 @@ Partial Public NotInheritable Class CSharpAnalyzerVerifier(Of TAnalyzer As {Diag ''' Public Shared Function Diagnostic() As DiagnosticResult - Return CSharpAnalyzerVerifier(Of TAnalyzer, MSTestVerifier).Diagnostic() + Return CSharpAnalyzerVerifier(Of TAnalyzer, DefaultVerifier).Diagnostic() End Function ''' Public Shared Function Diagnostic(diagnosticId As String) As DiagnosticResult - Return CSharpAnalyzerVerifier(Of TAnalyzer, MSTestVerifier).Diagnostic(diagnosticId) + Return CSharpAnalyzerVerifier(Of TAnalyzer, DefaultVerifier).Diagnostic(diagnosticId) End Function ''' Public Shared Function Diagnostic(descriptor As DiagnosticDescriptor) As DiagnosticResult - Return CSharpAnalyzerVerifier(Of TAnalyzer, MSTestVerifier).Diagnostic(descriptor) + Return CSharpAnalyzerVerifier(Of TAnalyzer, DefaultVerifier).Diagnostic(descriptor) End Function ''' diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix+Test.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix+Test.vb index cf3f1df2d..fffa6ee5f 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix+Test.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix+Test.vb @@ -1,11 +1,11 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.CSharp.Testing Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.Testing.Verifiers +Imports Microsoft.CodeAnalysis.Testing Partial Public NotInheritable Class CSharpCodeFixVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New}) Public Class Test - Inherits CSharpCodeFixTest(Of TAnalyzer, TCodeFix, MSTestVerifier) + Inherits CSharpCodeFixTest(Of TAnalyzer, TCodeFix, DefaultVerifier) Public Sub New() SolutionTransforms.Add( diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix.vb index 1433d62a5..c4d14c2a8 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSCodeFix.vb @@ -4,7 +4,6 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.CSharp.Testing Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Testing -Imports Microsoft.CodeAnalysis.Testing.Verifiers Partial Public NotInheritable Class CSharpCodeFixVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New}) @@ -14,17 +13,17 @@ Partial Public NotInheritable Class CSharpCodeFixVerifier(Of TAnalyzer As {Diagn ''' Public Shared Function Diagnostic() As DiagnosticResult - Return CSharpCodeFixVerifier(Of TAnalyzer, TCodeFix, MSTestVerifier).Diagnostic() + Return CSharpCodeFixVerifier(Of TAnalyzer, TCodeFix, DefaultVerifier).Diagnostic() End Function ''' Public Shared Function Diagnostic(diagnosticId As String) As DiagnosticResult - Return CSharpCodeFixVerifier(Of TAnalyzer, TCodeFix, MSTestVerifier).Diagnostic(diagnosticId) + Return CSharpCodeFixVerifier(Of TAnalyzer, TCodeFix, DefaultVerifier).Diagnostic(diagnosticId) End Function ''' Public Shared Function Diagnostic(descriptor As DiagnosticDescriptor) As DiagnosticResult - Return CSharpCodeFixVerifier(Of TAnalyzer, TCodeFix, MSTestVerifier).Diagnostic(descriptor) + Return CSharpCodeFixVerifier(Of TAnalyzer, TCodeFix, DefaultVerifier).Diagnostic(descriptor) End Function ''' diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSRefactoring+Test.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSRefactoring+Test.vb index be5dc91a4..3b1b747a1 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSRefactoring+Test.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/CSRefactoring+Test.vb @@ -1,10 +1,10 @@ Imports Microsoft.CodeAnalysis.CodeRefactorings Imports Microsoft.CodeAnalysis.CSharp.Testing -Imports Microsoft.CodeAnalysis.Testing.Verifiers +Imports Microsoft.CodeAnalysis.Testing Partial Public NotInheritable Class CSharpCodeRefactoringVerifier(Of TCodeRefactoring As {CodeRefactoringProvider, New}) Public Class Test - Inherits CSharpCodeRefactoringTest(Of TCodeRefactoring, MSTestVerifier) + Inherits CSharpCodeRefactoringTest(Of TCodeRefactoring, DefaultVerifier) Public Sub New() SolutionTransforms.Add( diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer+Test.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer+Test.vb index 277d74e43..01d0b7e8b 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer+Test.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer+Test.vb @@ -1,10 +1,10 @@ Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.Testing.Verifiers +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.VisualBasic.Testing Partial Public NotInheritable Class VisualBasicAnalyzerVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}) Public Class Test - Inherits VisualBasicAnalyzerTest(Of TAnalyzer, MSTestVerifier) + Inherits VisualBasicAnalyzerTest(Of TAnalyzer, DefaultVerifier) Public Sub New() End Sub diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer.vb index 2c97813d9..088eb12c5 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBAnalyzer.vb @@ -2,7 +2,6 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Testing -Imports Microsoft.CodeAnalysis.Testing.Verifiers Imports Microsoft.CodeAnalysis.VisualBasic.Testing Partial Public NotInheritable Class VisualBasicAnalyzerVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}) @@ -13,17 +12,17 @@ Partial Public NotInheritable Class VisualBasicAnalyzerVerifier(Of TAnalyzer As ''' Public Shared Function Diagnostic() As DiagnosticResult - Return VisualBasicAnalyzerVerifier(Of TAnalyzer, MSTestVerifier).Diagnostic() + Return VisualBasicAnalyzerVerifier(Of TAnalyzer, DefaultVerifier).Diagnostic() End Function ''' Public Shared Function Diagnostic(diagnosticId As String) As DiagnosticResult - Return VisualBasicAnalyzerVerifier(Of TAnalyzer, MSTestVerifier).Diagnostic(diagnosticId) + Return VisualBasicAnalyzerVerifier(Of TAnalyzer, DefaultVerifier).Diagnostic(diagnosticId) End Function ''' Public Shared Function Diagnostic(descriptor As DiagnosticDescriptor) As DiagnosticResult - Return VisualBasicAnalyzerVerifier(Of TAnalyzer, MSTestVerifier).Diagnostic(descriptor) + Return VisualBasicAnalyzerVerifier(Of TAnalyzer, DefaultVerifier).Diagnostic(descriptor) End Function ''' diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix+Test.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix+Test.vb index 9ffe19e4c..e8f633a1f 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix+Test.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix+Test.vb @@ -1,11 +1,11 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics -Imports Microsoft.CodeAnalysis.Testing.Verifiers +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.VisualBasic.Testing Partial Public NotInheritable Class VisualBasicCodeFixVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New}) Public Class Test - Inherits VisualBasicCodeFixTest(Of TAnalyzer, TCodeFix, MSTestVerifier) + Inherits VisualBasicCodeFixTest(Of TAnalyzer, TCodeFix, DefaultVerifier) End Class End Class diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix.vb index 36e546034..713589c67 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBCodeFix.vb @@ -3,7 +3,6 @@ Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Testing -Imports Microsoft.CodeAnalysis.Testing.Verifiers Imports Microsoft.CodeAnalysis.VisualBasic.Testing Partial Public NotInheritable Class VisualBasicCodeFixVerifier(Of TAnalyzer As {DiagnosticAnalyzer, New}, TCodeFix As {CodeFixProvider, New}) @@ -14,17 +13,17 @@ Partial Public NotInheritable Class VisualBasicCodeFixVerifier(Of TAnalyzer As { ''' Public Shared Function Diagnostic() As DiagnosticResult - Return VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, MSTestVerifier).Diagnostic() + Return VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, DefaultVerifier).Diagnostic() End Function ''' Public Shared Function Diagnostic(diagnosticId As String) As DiagnosticResult - Return VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, MSTestVerifier).Diagnostic(diagnosticId) + Return VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, DefaultVerifier).Diagnostic(diagnosticId) End Function ''' Public Shared Function Diagnostic(descriptor As DiagnosticDescriptor) As DiagnosticResult - Return VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, MSTestVerifier).Diagnostic(descriptor) + Return VisualBasicCodeFixVerifier(Of TAnalyzer, TCodeFix, DefaultVerifier).Diagnostic(descriptor) End Function ''' diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBRefactoring+Test.vb b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBRefactoring+Test.vb index ce87585eb..2f023fd38 100644 --- a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBRefactoring+Test.vb +++ b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK/ProjectTemplates/VisualBasic/Diagnostic/Test/Verifiers/VBRefactoring+Test.vb @@ -1,10 +1,10 @@ Imports Microsoft.CodeAnalysis.CodeRefactorings -Imports Microsoft.CodeAnalysis.Testing.Verifiers +Imports Microsoft.CodeAnalysis.Testing Imports Microsoft.CodeAnalysis.VisualBasic.Testing Partial Public NotInheritable Class VisualBasicCodeRefactoringVerifier(Of TCodeRefactoring As {CodeRefactoringProvider, New}) Public Class Test - Inherits VisualBasicCodeRefactoringTest(Of TCodeRefactoring, MSTestVerifier) + Inherits VisualBasicCodeRefactoringTest(Of TCodeRefactoring, DefaultVerifier) End Class End Class diff --git a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest.UnitTests/MSTestVerifierTests.cs b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest.UnitTests/MSTestVerifierTests.cs index 7eac9781b..988cc9e02 100644 --- a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest.UnitTests/MSTestVerifierTests.cs +++ b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.MSTest.UnitTests/MSTestVerifierTests.cs @@ -8,6 +8,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { [TestClass] + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class MSTestVerifierTests { [TestMethod] diff --git a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs index 5935cc0c0..b6b952372 100644 --- a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs +++ b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.NUnit.UnitTests/NUnitVerifierTests.cs @@ -8,6 +8,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { [TestFixture] + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class NUnitVerifierTests { [Test] diff --git a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit.UnitTests/XUnitVerifierTests.cs b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit.UnitTests/XUnitVerifierTests.cs index 849e62c68..a69fcb7ca 100644 --- a/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit.UnitTests/XUnitVerifierTests.cs +++ b/tests/Microsoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Testing.Verifiers.XUnit.UnitTests/XUnitVerifierTests.cs @@ -8,6 +8,7 @@ namespace Microsoft.CodeAnalysis.Testing.Verifiers { + [Obsolete(ObsoleteMessages.FrameworkPackages)] public class XUnitVerifierTests { [Fact] diff --git a/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/CreateProjectTests.cs b/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/CreateProjectTests.cs index 7eada54ad..5fe6519a0 100644 --- a/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/CreateProjectTests.cs +++ b/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/CreateProjectTests.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.CodeAnalysis.Testing.Verifiers; using Microsoft.VisualStudio.Shell.Interop; using Xunit; using Task = System.Threading.Tasks.Task; @@ -12,7 +11,7 @@ namespace Microsoft.CodeAnalysis.Testing { public class CreateProjectTests : AbstractIntegrationTest { - private static readonly XUnitVerifier s_verifier = new XUnitVerifier(); + private static readonly DefaultVerifier s_verifier = new DefaultVerifier(); [IdeFact] public async Task CreateFromTemplateAsync() @@ -30,7 +29,7 @@ public async Task CreateFromTemplateAsync() // Verify that intentional errors get validated by the test var errors = await TestServices.ErrorList.GetBuildErrorsAsync(__VSERRORCATEGORY.EC_ERROR, HangMitigatingCancellationToken); - var expected = "(Compiler) Class1.cs(1, 13): error CS1002: ; expected"; + var expected = "(Csc) Class1.cs(1, 13): error CS1002: ; expected"; s_verifier.EqualOrDiff(expected, string.Join(Environment.NewLine, errors)); Assert.Equal(1, await TestServices.ErrorList.GetErrorCountAsync(__VSERRORCATEGORY.EC_ERROR, HangMitigatingCancellationToken)); } diff --git a/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/InProcess/ErrorListInProcess.cs b/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/InProcess/ErrorListInProcess.cs index ca81bfbd8..3203d0332 100644 --- a/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/InProcess/ErrorListInProcess.cs +++ b/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/InProcess/ErrorListInProcess.cs @@ -26,10 +26,16 @@ public async Task ShowBuildErrorsAsync(CancellationToken cancellationToken) await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken); var errorList = await GetRequiredGlobalServiceAsync(cancellationToken); + ((IVsErrorList)errorList).BringToFront(); + errorList.AreBuildErrorSourceEntriesShown = true; + + // Set AreOtherErrorSourceEntriesShown to true before setting it to false, otherwise build diagnostics + // never appear in the error list. + errorList.AreOtherErrorSourceEntriesShown = true; errorList.AreOtherErrorSourceEntriesShown = false; errorList.AreErrorsShown = true; - errorList.AreMessagesShown = true; + errorList.AreMessagesShown = false; errorList.AreWarningsShown = false; } diff --git a/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/Roslyn.SDK.IntegrationTests.csproj b/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/Roslyn.SDK.IntegrationTests.csproj index 88375f10b..f7f03853b 100644 --- a/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/Roslyn.SDK.IntegrationTests.csproj +++ b/tests/VisualStudio.Roslyn.SDK/Roslyn.SDK.IntegrationTests/Roslyn.SDK.IntegrationTests.csproj @@ -8,13 +8,10 @@ + - - - -