Update to generic testing packages

tautropfli · tautropfli · commit 26b8f581157e · 2025-01-18T15:23:19.000+01:00
The test-framework-specific packages have been obsoleted. See <https://github.com/dotnet/roslyn-sdk/blob/e5ac2973139bde52fae4f85327ea7ac7bc5eedf6/src/Microsoft.CodeAnalysis.Testing/README.md#obsolete-packages>.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -29,9 +29,9 @@
 		<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.0.1" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" /><!-- We explicitly reference these analyzers to get the latest version even though we might not use the latest version of Microsoft.CodeAnalysis everywhere. -->
-		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.0" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.0" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" Version="1.1.0" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.1.2" />
 		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
 		<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.1597"/>
 	</ItemGroup>
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj b/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj
@@ -16,9 +16,9 @@
         <PackageReference Include="xunit" />
         <PackageReference Include="xunit.runner.visualstudio" />
         <PackageReference Include="Microsoft.CodeAnalysis" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1+Test.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1+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 Funcky.Analyzers.Test;
 
 public static partial class CSharpAnalyzerVerifier<TAnalyzer>
     where TAnalyzer : DiagnosticAnalyzer, new()
 {
-    public class Test : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
+    public class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
     {
         public Test()
         {
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpAnalyzerVerifier`1.cs
@@ -2,7 +2,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Funcky.Analyzers.Test;
 
@@ -11,15 +10,15 @@ public static partial class CSharpAnalyzerVerifier<TAnalyzer>
 {
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic()"/>
     public static DiagnosticResult Diagnostic()
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic();
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic();
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(string)"/>
     public static DiagnosticResult Diagnostic(string diagnosticId)
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(diagnosticId);
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(diagnosticId);
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
     public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
-        => CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(descriptor);
+        => CSharpAnalyzerVerifier<TAnalyzer, DefaultVerifier>.Diagnostic(descriptor);
 
     /// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
     public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2+Test.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2+Test.cs
@@ -1,15 +1,15 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
+using Microsoft.CodeAnalysis.Testing;
 
 namespace Funcky.Analyzers.Test;
 
 public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
     where TAnalyzer : DiagnosticAnalyzer, new()
     where TCodeFix : CodeFixProvider, new()
 {
-    public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
+    public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
     {
         public Test()
         {
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeFixVerifier`2.cs
@@ -4,7 +4,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Funcky.Analyzers.Test;
 
@@ -14,15 +13,15 @@ public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
 {
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic()"/>
     public static DiagnosticResult Diagnostic()
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic();
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic();
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(string)"/>
     public static DiagnosticResult Diagnostic(string diagnosticId)
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(diagnosticId);
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(diagnosticId);
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
     public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
-        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(descriptor);
+        => CSharpCodeFixVerifier<TAnalyzer, TCodeFix, DefaultVerifier>.Diagnostic(descriptor);
 
     /// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
     public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs b/Funcky.Analyzers/Funcky.Analyzers.Test/Verifiers/CSharpCodeRefactoringVerifier`1+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 Funcky.Analyzers.Test;
 
 public static partial class CSharpCodeRefactoringVerifier<TCodeRefactoring>
     where TCodeRefactoring : CodeRefactoringProvider, new()
 {
-    public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, XUnitVerifier>
+    public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, DefaultVerifier>
     {
         public Test()
         {

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using Microsoft.CodeAnalysis.CSharp.Testing;`
`2`	`2`	`using Microsoft.CodeAnalysis.Diagnostics;`
`3`		`-using Microsoft.CodeAnalysis.Testing.Verifiers;`
	`3`	`+using Microsoft.CodeAnalysis.Testing;`
`4`	`4`
`5`	`5`	`namespace Funcky.Analyzers.Test;`
`6`	`6`
`7`	`7`	`public static partial class CSharpAnalyzerVerifier<TAnalyzer>`
`8`	`8`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`9`	`9`	`{`
`10`		`- public class Test : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>`
	`10`	`+ public class Test : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>`
`11`	`11`	`{`
`12`	`12`	`public Test()`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`using Microsoft.CodeAnalysis.CodeFixes;`
`2`	`2`	`using Microsoft.CodeAnalysis.CSharp.Testing;`
`3`	`3`	`using Microsoft.CodeAnalysis.Diagnostics;`
`4`		`-using Microsoft.CodeAnalysis.Testing.Verifiers;`
	`4`	`+using Microsoft.CodeAnalysis.Testing;`
`5`	`5`
`6`	`6`	`namespace Funcky.Analyzers.Test;`
`7`	`7`
`8`	`8`	`public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>`
`9`	`9`	`where TAnalyzer : DiagnosticAnalyzer, new()`
`10`	`10`	`where TCodeFix : CodeFixProvider, new()`
`11`	`11`	`{`
`12`		`- public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>`
	`12`	`+ public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>`
`13`	`13`	`{`
`14`	`14`	`public Test()`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using Microsoft.CodeAnalysis.CodeRefactorings;`
`2`	`2`	`using Microsoft.CodeAnalysis.CSharp.Testing;`
`3`		`-using Microsoft.CodeAnalysis.Testing.Verifiers;`
	`3`	`+using Microsoft.CodeAnalysis.Testing;`
`4`	`4`
`5`	`5`	`namespace Funcky.Analyzers.Test;`
`6`	`6`
`7`	`7`	`public static partial class CSharpCodeRefactoringVerifier<TCodeRefactoring>`
`8`	`8`	`where TCodeRefactoring : CodeRefactoringProvider, new()`
`9`	`9`	`{`
`10`		`- public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, XUnitVerifier>`
	`10`	`+ public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, DefaultVerifier>`
`11`	`11`	`{`
`12`	`12`	`public Test()`
`13`	`13`	`{`