Fix Analyzer tests, switch from Xunit to default verifier and bump to…

… net8.0 verifier, bump dependencies to next minor version
Remora · Feb 13, 2024 · 7fb50ca · 7fb50ca
1 parent fd0333f
commit 7fb50ca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,15 +4,17 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="JsonDocumentPath" Version="1.0.3" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.1" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageVersion Include="OneOf" Version="3.0.263" />
     <PackageVersion Include="Remora.Results" Version="7.4.1" />
     <PackageVersion Include="Remora.Results.Analyzers" Version="1.0.2" />
     <PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.0" />
-    <PackageVersion Include="xunit.assert" Version="2.6.2" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.1" />
+    <PackageVersion Include="xunit.assert" Version="2.6.6" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-1.final" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.1" />
   </ItemGroup>

diff --git a/Tests/Remora.Rest.Core.Analyzers.Tests/Remora.Rest.Core.Analyzers.Tests.csproj b/Tests/Remora.Rest.Core.Analyzers.Tests/Remora.Rest.Core.Analyzers.Tests.csproj
@@ -6,9 +6,9 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" />
     </ItemGroup>
 
 </Project>
diff --git a/Tests/Remora.Rest.Core.Analyzers.Tests/TestBases/OptionalAnalyzerTests.cs b/Tests/Remora.Rest.Core.Analyzers.Tests/TestBases/OptionalAnalyzerTests.cs
@@ -8,15 +8,14 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Remora.Rest.Core.Analyzers.Tests.TestBases;
 
 /// <summary>
 /// Serves as a base class for Optional-targeted analyzer tests.
 /// </summary>
 /// <typeparam name="TAnalyzer">The analyzer under test.</typeparam>
-public abstract class OptionalAnalyzerTests<TAnalyzer> : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
+public abstract class OptionalAnalyzerTests<TAnalyzer> : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
     where TAnalyzer : DiagnosticAnalyzer, new()
 {
     /// <summary>
@@ -26,9 +25,9 @@ protected OptionalAnalyzerTests()
     {
         this.ReferenceAssemblies = new ReferenceAssemblies
         (
-            "net7.0",
-            new PackageIdentity("Microsoft.NETCore.App.Ref", "7.0.0"),
-            Path.Combine("ref", "net7.0")
+            "net8.0",
+            new PackageIdentity("Microsoft.NETCore.App.Ref", "8.0.1"),
+            Path.Combine("ref", "net8.0")
         );
 
         this.TestState.AdditionalReferences.Add(typeof(Optional<>).Assembly);

diff --git a/Tests/Remora.Rest.Core.Analyzers.Tests/TestBases/OptionalCodeFixTests.cs b/Tests/Remora.Rest.Core.Analyzers.Tests/TestBases/OptionalCodeFixTests.cs
@@ -9,7 +9,6 @@
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
 
 namespace Remora.Rest.Core.Analyzers.Tests.TestBases;
 
@@ -18,7 +17,7 @@ namespace Remora.Rest.Core.Analyzers.Tests.TestBases;
 /// </summary>
 /// <typeparam name="TAnalyzer">The analyzer under test.</typeparam>
 /// <typeparam name="TCodeFix">The code fix under test.</typeparam>
-public abstract class OptionalCodeFixTests<TAnalyzer, TCodeFix> : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
+public abstract class OptionalCodeFixTests<TAnalyzer, TCodeFix> : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
     where TAnalyzer : DiagnosticAnalyzer, new()
     where TCodeFix : CodeFixProvider, new()
 {
@@ -29,9 +28,9 @@ protected OptionalCodeFixTests()
     {
         this.ReferenceAssemblies = new ReferenceAssemblies
         (
-            "net7.0",
-            new PackageIdentity("Microsoft.NETCore.App.Ref", "7.0.0"),
-            Path.Combine("ref", "net7.0")
+            "net8.0",
+            new PackageIdentity("Microsoft.NETCore.App.Ref", "8.0.1"),
+            Path.Combine("ref", "net8.0")
         );
 
         this.TestState.AdditionalReferences.Add(typeof(Optional<int>).Assembly);