Migrate to xunit v3

.devcontainer/Dockerfile

@@ -12,3 +12,7 @@ FROM mcr.microsoft.com/dotnet/sdk:9.0.102-noble
 # See https://github.com/dotnet/dotnet-docker/issues/2790 for a discussion on this, where the prioritized use case
 # was *not* devcontainers, sadly.
 ENV NUGET_XMLDOC_MODE=
+
+# Install Node.js 18
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt-get install -y nodejs

Directory.Packages.props

@@ -38,13 +38,12 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.0" />
     <PackageVersion Include="Validation" Version="2.5.51" />
-    <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
+    <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
   </ItemGroup>
   <ItemGroup Label="Library.Template">
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.v3" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>
     <!-- Put repo-specific GlobalPackageReference items in this group. -->

test/Cake.GitVersioning.Tests/Cake.GitVersioning.Tests.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
+    <OutputType>exe</OutputType>
     <SignAssembly>false</SignAssembly>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
@@ -18,7 +19,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Nerdbank.GitVersioning.LKG" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
 </Project>

test/Nerdbank.GitVersioning.Tests/AssemblyInfoTest.cs

@@ -13,7 +13,7 @@
 
 public class AssemblyInfoTest : IClassFixture<MSBuildFixture> // The MSBuildFixture throws PlatformNotSupportedException when run on mono.
 {
-    [SkippableTheory(typeof(PlatformNotSupportedException))]
+    [Theory]
     [InlineData(false)]
     [InlineData(true)]
     [InlineData(null)]
@@ -91,7 +91,7 @@ type internal ThisAssembly() =
         Assert.Equal(expected, built);
     }
 
-    [SkippableTheory(typeof(PlatformNotSupportedException))]
+    [Theory]
     [InlineData(null, "MyRootNamespace")]
     [InlineData("", "MyRootNamespace")]
     [InlineData("MyCustomNamespace", null)]
@@ -152,7 +152,7 @@ type internal ThisAssembly() =
         Assert.Equal(expected, built);
     }
 
-    [SkippableTheory(typeof(PlatformNotSupportedException))]
+    [Theory]
     [InlineData(false)]
     [InlineData(true)]
     [InlineData(null)]
@@ -228,7 +228,7 @@ internal static partial class ThisAssembly {{
         Assert.Equal(expected, built);
     }
 
-    [SkippableTheory(typeof(PlatformNotSupportedException))]
+    [Theory]
     [InlineData(null, "MyRootNamespace")]
     [InlineData("", "MyRootNamespace")]
     [InlineData("MyCustomNamespace", null)]
@@ -286,7 +286,7 @@ internal static partial class ThisAssembly {{
         Assert.Equal(expected, built);
     }
 
-    [SkippableTheory(typeof(PlatformNotSupportedException))]
+    [Theory]
     [InlineData(false)]
     [InlineData(true)]
     [InlineData(null)]
@@ -342,7 +342,7 @@ End Class
         Assert.Equal(expected, built);
     }
 
-    [SkippableTheory(typeof(PlatformNotSupportedException))]
+    [Theory]
     [InlineData(null, "MyRootNamespace")]
     [InlineData("", "MyRootNamespace")]
     [InlineData("MyCustomNamespace", null)]

test/Nerdbank.GitVersioning.Tests/BuildIntegrationTests.cs

@@ -191,8 +191,8 @@ public async Task AssemblyInfo_HasKeyData(string keyFile, bool delaySigned)
                     result.BuildResult.ProjectStateAfterBuild.GetPropertyValue("VersionSourceFile"))));
         this.Logger.WriteLine(versionCsContent);
 
-        SyntaxTree sourceFile = CSharpSyntaxTree.ParseText(versionCsContent);
-        SyntaxNode syntaxTree = await sourceFile.GetRootAsync();
+        SyntaxTree sourceFile = CSharpSyntaxTree.ParseText(versionCsContent, cancellationToken: TestContext.Current.CancellationToken);
+        SyntaxNode syntaxTree = await sourceFile.GetRootAsync(TestContext.Current.CancellationToken);
         IEnumerable<VariableDeclaratorSyntax> fields = syntaxTree.DescendantNodes().OfType<VariableDeclaratorSyntax>();
 
         var publicKeyField = (LiteralExpressionSyntax)fields.SingleOrDefault(f => f.Identifier.ValueText == "PublicKey")?.Initializer.Value;

test/Nerdbank.GitVersioning.Tests/GitContextTests.cs

@@ -93,14 +93,14 @@ public void SelectCommitByPartialId(bool fromPack, bool oddLength)
         Assert.Equal(this.LibGit2Repository.Head.Tip.Sha, this.Context.GitCommitId);
     }
 
-    [SkippableTheory]
+    [Theory]
     [InlineData(4)]
     [InlineData(7)]
     [InlineData(8)]
     [InlineData(11)]
     public void GetShortUniqueCommitId(int length)
     {
-        Skip.If(length < 7 && this.Context is Nerdbank.GitVersioning.LibGit2.LibGit2Context, "LibGit2Sharp never returns commit IDs with fewer than 7 characters.");
+        Assert.SkipWhen(length < 7 && this.Context is Nerdbank.GitVersioning.LibGit2.LibGit2Context, "LibGit2Sharp never returns commit IDs with fewer than 7 characters.");
         Assert.Equal(this.Context.GitCommitId.Substring(0, length), this.Context.GetShortUniqueCommitId(length));
     }
 

test/Nerdbank.GitVersioning.Tests/LibGit2GitExtensionsTests.cs

@@ -467,7 +467,7 @@ public void GetIdAsVersion_MigrationFromVersionTxtToJson()
     public void TestBiggerRepo()
     {
         string testBiggerRepoPath = @"D:\git\Nerdbank.GitVersioning";
-        Skip.If(!Directory.Exists(testBiggerRepoPath), $"{testBiggerRepoPath} does not exist.");
+        Assert.SkipWhen(!Directory.Exists(testBiggerRepoPath), $"{testBiggerRepoPath} does not exist.");
 
         using var largeRepo = new Repository(testBiggerRepoPath);
         foreach (Commit commit in largeRepo.Head.Commits)

test/Nerdbank.GitVersioning.Tests/Nerdbank.GitVersioning.Tests.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net9.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net472</TargetFrameworks>
+    <OutputType>exe</OutputType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <DebugType>full</DebugType>
@@ -44,8 +45,7 @@
     <PackageReference Include="System.Memory" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
     <PackageReference Include="Xunit.Combinatorial" />
-    <PackageReference Include="Xunit.SkippableFact" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 </Project>

test/Nerdbank.GitVersioning.Tests/Usings.cs

@@ -1,4 +1,4 @@
 // Copyright (c) .NET Foundation and Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-global using Xunit.Abstractions;
+global using Xunit;