Move to xunit v3 (#452)

sailro · web-flow · commit c4d99ff804cd · 2026-02-26T08:50:04.000+01:00
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -19,9 +19,8 @@
     <!-- Tests -->
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.3" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
     <!-- Misc -->
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
   </ItemGroup>
diff --git a/src/Microsoft.Unity.Analyzers.Tests/ConsistencyTests.cs b/src/Microsoft.Unity.Analyzers.Tests/ConsistencyTests.cs
@@ -12,7 +12,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.Unity.Analyzers.Tests;
 
@@ -124,12 +123,12 @@ public async Task CheckHelpLinks()
 			Assert.NotEmpty(d.HelpLinkUri);
 			Assert.Contains(d.Id, d.HelpLinkUri);
 
-			var response = await client.GetAsync(d.HelpLinkUri);
+			var response = await client.GetAsync(d.HelpLinkUri, TestContext.Current.CancellationToken);
 			Assert.True(response.IsSuccessStatusCode);
 		}
 	}
 
-	[SkippableFact]
+	[Fact]
 	public void CheckCodeFixTestsHaveTriviaTests()
 	{
 		var assembly = typeof(ConsistencyTests).Assembly;
@@ -153,7 +152,7 @@ public void CheckCodeFixTestsHaveTriviaTests()
 			missingTriviaTests.Add(testClass.Name);
 		}
 
-		Skip.If(missingTriviaTests.Any(), $"The following CodeFix test classes ({(float)missingTriviaTests.Count / codeFixTestClasses.Length:0.00%}) are missing a Trivia test:\n\n{string.Join("\n", missingTriviaTests)}");
+		Assert.SkipWhen(missingTriviaTests.Any(), $"The following CodeFix test classes ({(float)missingTriviaTests.Count / codeFixTestClasses.Length:0.00%}) are missing a Trivia test:\n\n{string.Join("\n", missingTriviaTests)}");
 	}
 
 	private static bool IsBaseCodeFixVerifierTest(Type type)
diff --git a/src/Microsoft.Unity.Analyzers.Tests/GetLocalPositionAndRotationTests.cs b/src/Microsoft.Unity.Analyzers.Tests/GetLocalPositionAndRotationTests.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Unity.Analyzers.Tests;
 public class GetLocalPositionAndRotationTests : BaseCodeFixVerifierTest<GetLocalPositionAndRotationAnalyzer, GetLocalPositionAndRotationCodeFix>
 {
 	// For extensive testing, see GetPositionAndRotationTests
-	[SkippableFact]
+	[Fact]
 	public async Task UseGetLocalPositionAndRotationMethod()
 	{
 		const string test = @"
@@ -31,7 +31,7 @@ void Update()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Transform);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(9, 9);
 
@@ -53,7 +53,7 @@ void Update()
 		await VerifyCSharpFixAsync(test, fixedTest);
 	}
 
-	[SkippableFact]
+	[Fact]
 	public async Task UseGetLocalPositionAndRotationMethodTransformAccess()
 	{
 		const string test = @"
@@ -73,7 +73,7 @@ void Method()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Jobs.TransformAccess);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(9, 9);
 
@@ -95,7 +95,7 @@ void Method()
 		await VerifyCSharpFixAsync(test, fixedTest);
 	}
 
-	[SkippableFact]
+	[Fact]
 	public async Task NoTypeMismatch()
 	{
 		const string test = @"
@@ -116,7 +116,7 @@ void Update()
 		await VerifyCSharpDiagnosticAsync(test);
 	}
 
-	[SkippableFact]
+	[Fact]
 	public async Task UseGetLocalPositionAndRotationMethodTrivia()
 	{
 		const string test = @"
@@ -139,7 +139,7 @@ void Update()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Transform);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(10, 9);
 
diff --git a/src/Microsoft.Unity.Analyzers.Tests/GetPositionAndRotationTests.cs b/src/Microsoft.Unity.Analyzers.Tests/GetPositionAndRotationTests.cs
@@ -49,7 +49,7 @@ void Update()
 		await VerifyCSharpFixAsync(test, fixedTest);
 	}
 
-	[SkippableFact]
+	[Fact]
 	public async Task UseGetPositionAndRotationMethodTransformAccess()
 	{
 		const string test = @"
@@ -72,7 +72,7 @@ void Method()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Jobs.TransformAccess);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(12, 9);
 
diff --git a/src/Microsoft.Unity.Analyzers.Tests/Microsoft.Unity.Analyzers.Tests.csproj b/src/Microsoft.Unity.Analyzers.Tests/Microsoft.Unity.Analyzers.Tests.csproj
@@ -1,6 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <NoWarn>NU1608;VSTHRD200</NoWarn>
@@ -12,9 +13,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />    
     <PackageReference Include="System.Reflection.MetadataLoadContext" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
-    <PackageReference Include="Xunit.SkippableFact" />	
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Unity.Analyzers.Tests/SetLocalPositionAndRotationTests.cs b/src/Microsoft.Unity.Analyzers.Tests/SetLocalPositionAndRotationTests.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Unity.Analyzers.Tests;
 public class SetLocalPositionAndRotationTests : BaseCodeFixVerifierTest<SetLocalPositionAndRotationAnalyzer, SetLocalPositionAndRotationCodeFix>
 {
 	// For extensive testing, see SetPositionAndRotationTests.cs
-	[SkippableFact]
+	[Fact]
 	public async Task UpdateLocalPositionAndRotationMethod()
 	{
 		const string test = @"
@@ -30,7 +30,7 @@ void Update()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Transform);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(8, 9);
 
@@ -51,7 +51,7 @@ void Update()
 		await VerifyCSharpFixAsync(test, fixedTest);
 	}
 
-	[SkippableFact]
+	[Fact]
 	public async Task UpdateLocalPositionAndRotationMethodTransformAccess()
 	{
 		const string test = @"
@@ -72,7 +72,7 @@ void Method()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Jobs.TransformAccess);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(10, 9);
 
@@ -95,7 +95,7 @@ void Method()
 		await VerifyCSharpFixAsync(test, fixedTest);
 	}
 
-	[SkippableFact]
+	[Fact]
 	public async Task UpdateLocalPositionAndRotationMethodTrivia()
 	{
 		const string test = @"
@@ -116,7 +116,7 @@ void Update()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Transform);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(9, 9);
 
diff --git a/src/Microsoft.Unity.Analyzers.Tests/SetPositionAndRotationTests.cs b/src/Microsoft.Unity.Analyzers.Tests/SetPositionAndRotationTests.cs
@@ -45,7 +45,7 @@ void Update()
 		await VerifyCSharpFixAsync(test, fixedTest);
 	}
 
-	[SkippableFact]
+	[Fact]
 	public async Task UpdatePositionAndRotationMethodTransformAccess()
 	{
 		const string test = @"
@@ -66,7 +66,7 @@ void Method()
 		var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;
 		var type = typeof(UnityEngine.Jobs.TransformAccess);
 
-		Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
+		Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");
 
 		var diagnostic = ExpectDiagnostic().WithLocation(10, 9);
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`using Microsoft.CodeAnalysis;`
`13`	`13`	`using Microsoft.CodeAnalysis.Diagnostics;`
`14`	`14`	`using Xunit;`
`15`		`-using Xunit.Abstractions;`
`16`	`15`
`17`	`16`	`namespace Microsoft.Unity.Analyzers.Tests;`
`18`	`17`
`@@ -124,12 +123,12 @@ public async Task CheckHelpLinks()`
`124`	`123`	`Assert.NotEmpty(d.HelpLinkUri);`
`125`	`124`	`Assert.Contains(d.Id, d.HelpLinkUri);`
`126`	`125`
`127`		`- var response = await client.GetAsync(d.HelpLinkUri);`
	`126`	`+ var response = await client.GetAsync(d.HelpLinkUri, TestContext.Current.CancellationToken);`
`128`	`127`	`Assert.True(response.IsSuccessStatusCode);`
`129`	`128`	`}`
`130`	`129`	`}`
`131`	`130`
`132`		`- [SkippableFact]`
	`131`	`+ [Fact]`
`133`	`132`	`public void CheckCodeFixTestsHaveTriviaTests()`
`134`	`133`	`{`
`135`	`134`	`var assembly = typeof(ConsistencyTests).Assembly;`
`@@ -153,7 +152,7 @@ public void CheckCodeFixTestsHaveTriviaTests()`
`153`	`152`	`missingTriviaTests.Add(testClass.Name);`
`154`	`153`	`}`
`155`	`154`
`156`		`- Skip.If(missingTriviaTests.Any(), $"The following CodeFix test classes ({(float)missingTriviaTests.Count / codeFixTestClasses.Length:0.00%}) are missing a Trivia test:\n\n{string.Join("\n", missingTriviaTests)}");`
	`155`	`+ Assert.SkipWhen(missingTriviaTests.Any(), $"The following CodeFix test classes ({(float)missingTriviaTests.Count / codeFixTestClasses.Length:0.00%}) are missing a Trivia test:\n\n{string.Join("\n", missingTriviaTests)}");`
`157`	`156`	`}`
`158`	`157`
`159`	`158`	`private static bool IsBaseCodeFixVerifierTest(Type type)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void Update()`
`49`	`49`	`await VerifyCSharpFixAsync(test, fixedTest);`
`50`	`50`	`}`
`51`	`51`
`52`		`- [SkippableFact]`
	`52`	`+ [Fact]`
`53`	`53`	`public async Task UseGetPositionAndRotationMethodTransformAccess()`
`54`	`54`	`{`
`55`	`55`	`const string test = @"`
`@@ -72,7 +72,7 @@ void Method()`
`72`	`72`	`var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;`
`73`	`73`	`var type = typeof(UnityEngine.Jobs.TransformAccess);`
`74`	`74`
`75`		`- Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");`
	`75`	`+ Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");`
`76`	`76`
`77`	`77`	`var diagnostic = ExpectDiagnostic().WithLocation(12, 9);`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void Update()`
`45`	`45`	`await VerifyCSharpFixAsync(test, fixedTest);`
`46`	`46`	`}`
`47`	`47`
`48`		`- [SkippableFact]`
	`48`	`+ [Fact]`
`49`	`49`	`public async Task UpdatePositionAndRotationMethodTransformAccess()`
`50`	`50`	`{`
`51`	`51`	`const string test = @"`
`@@ -66,7 +66,7 @@ void Method()`
`66`	`66`	`var method = GetCSharpDiagnosticAnalyzer().ExpressionContext.PositionAndRotationMethodName;`
`67`	`67`	`var type = typeof(UnityEngine.Jobs.TransformAccess);`
`68`	`68`
`69`		`- Skip.IfNot(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");`
	`69`	`+ Assert.SkipUnless(MethodExists("UnityEngine", type.FullName!, method), $"This Unity version does not support {type}.{method}");`
`70`	`70`
`71`	`71`	`var diagnostic = ExpectDiagnostic().WithLocation(10, 9);`
`72`	`72`