Update xUnit major version from 2 to 3

Author: Aldaviva

Tests/Dns/LiveDnsTests.cs

@@ -11,6 +11,8 @@ public class LiveDnsTests {
     private readonly LiveDns            _liveDns;
     private readonly UnfuckedHttpClient _httpClient = A.Fake<UnfuckedHttpClient>();
 
+    private static CancellationToken Ct => TestContext.Current.CancellationToken;
+
     public LiveDnsTests() {
         _httpClient.Property(PropertyKey.JsonSerializerOptions, GandiClient.JsonOptions);
         A.CallTo(() => _gandi.HttpClient).Returns(_httpClient);
@@ -25,7 +27,7 @@ public async Task ListAll() {
                 Encoding.UTF8, MediaTypeNames.Application.Json)
         });
 
-        IEnumerable<DnsRecord> actual = await _liveDns.List();
+        IEnumerable<DnsRecord> actual = await _liveDns.List(cancellationToken: Ct);
 
         actual.Should().BeEquivalentTo([
             new DnsRecord(RecordType.A, "@", TimeSpan.FromMinutes(5), "67.210.32.33"),
@@ -46,7 +48,7 @@ public async Task ListByType() {
                 Encoding.UTF8, MediaTypeNames.Application.Json)
         });
 
-        IEnumerable<DnsRecord> actual = await _liveDns.List(RecordType.A);
+        IEnumerable<DnsRecord> actual = await _liveDns.List(RecordType.A, cancellationToken: Ct);
 
         actual.Should().BeEquivalentTo([
             new DnsRecord(RecordType.A, "@", TimeSpan.FromMinutes(5), "67.210.32.33"),
@@ -67,7 +69,7 @@ public async Task ListByName() {
                 Encoding.UTF8, MediaTypeNames.Application.Json)
         });
 
-        IEnumerable<DnsRecord> actual = await _liveDns.List(name: "west");
+        IEnumerable<DnsRecord> actual = await _liveDns.List(name: "west", cancellationToken: Ct);
 
         actual.Should().BeEquivalentTo([
             new DnsRecord(RecordType.A, "west", TimeSpan.FromMinutes(5), "172.11.57.29")
@@ -87,7 +89,7 @@ public async Task ListByTypeAndName() {
                 Encoding.UTF8, MediaTypeNames.Application.Json)
         });
 
-        IEnumerable<DnsRecord> actual = await _liveDns.List(RecordType.A, "west");
+        IEnumerable<DnsRecord> actual = await _liveDns.List(RecordType.A, "west", Ct);
 
         actual.Should().BeEquivalentTo([
             new DnsRecord(RecordType.A, "west", TimeSpan.FromMinutes(5), "172.11.57.29")
@@ -107,7 +109,7 @@ public async Task Get() {
                 Encoding.UTF8, MediaTypeNames.Application.Json)
         });
 
-        DnsRecord? actual = await _liveDns.Get(RecordType.A, "west");
+        DnsRecord? actual = await _liveDns.Get(RecordType.A, "west", Ct);
 
         actual.Should().Be(new DnsRecord(RecordType.A, "west", TimeSpan.FromMinutes(5), "172.11.57.29"));
 
@@ -124,7 +126,7 @@ public async Task GetMissing() {
                 MediaTypeNames.Application.Json)
         });
 
-        DnsRecord? actual = await _liveDns.Get(new DnsRecord(RecordType.A, "missing"));
+        DnsRecord? actual = await _liveDns.Get(new DnsRecord(RecordType.A, "missing"), Ct);
 
         actual.Should().BeNull();
 
@@ -138,14 +140,14 @@ public async Task GetMissing() {
                 Content = new StringContent("hargle invalid json", Encoding.UTF8, MediaTypeNames.Text.Plain)
             });
 
-        (await _liveDns.Get(RecordType.A, "_test")).Should().BeNull();
+        (await _liveDns.Get(RecordType.A, "_test", Ct)).Should().BeNull();
     }
 
     [Fact]
     public async Task Delete() {
         A.CallTo(() => _httpClient.SendAsync(A<HttpRequest>._, A<CancellationToken>._)).Returns(new HttpResponseMessage(HttpStatusCode.NoContent));
 
-        await _liveDns.Delete(new DnsRecord(RecordType.A, "deleteme"));
+        await _liveDns.Delete(new DnsRecord(RecordType.A, "deleteme"), Ct);
 
         A.CallTo(() => _httpClient.SendAsync(A<HttpRequest>.That.Matches(req =>
             req.Equals(new HttpRequest(HttpMethod.Delete, new Uri("https://api.gandi.net/v5/livedns/domains/aldaviva.com/records/deleteme/A"),
@@ -160,7 +162,7 @@ public async Task Set() {
             Headers = { Location = new Uri("https://api.gandi.net/v5/livedns/domains/aldaviva.com/records/_test/TXT") }
         });
 
-        await _liveDns.Set(new DnsRecord(RecordType.TXT, "_test", null, "hi"));
+        await _liveDns.Set(new DnsRecord(RecordType.TXT, "_test", null, "hi"), Ct);
 
         A.CallTo(() => _httpClient.SendAsync(A<HttpRequest>.That.Matches(req =>
             req.Equals(new HttpRequest(HttpMethod.Put, new Uri("https://api.gandi.net/v5/livedns/domains/aldaviva.com/records/_test/TXT"),

Tests/GandiClientTest.cs

@@ -39,7 +39,7 @@ public async Task LiveDnsRequest() {
         });
 
         ILiveDns   liveDns = gandiClient.LiveDns("aldaviva.com");
-        DnsRecord? actual  = await liveDns.Get(RecordType.A, DnsRecord.Origin);
+        DnsRecord? actual  = await liveDns.Get(RecordType.A, DnsRecord.Origin, TestContext.Current.CancellationToken);
 
         actual.Should().Be(new DnsRecord(RecordType.A, "@", TimeSpan.FromDays(7), "67.210.32.33"));
 

Tests/Marshal/SecondsToTimeSpanConverterTest.cs

@@ -20,7 +20,7 @@ public async Task Serialize() {
         using MemoryStream         jsonStream = new();
         await using Utf8JsonWriter writer     = new(jsonStream);
         _converter.Write(writer, TimeSpan.FromMinutes(5), JsonSerializerOptions.Default);
-        await writer.FlushAsync();
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
         jsonStream.ToArray().Should().Equal("300"u8.ToArray());
     }
 

Tests/Tests.csproj

@@ -18,11 +18,11 @@
         <PackageReference Include="FakeItEasy" Version="9.0.1" />
         <PackageReference Include="FluentAssertions" Version="[7.2.1, 8)" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="xunit.v3" Version="3.2.2" />
     </ItemGroup>
 
     <ItemGroup>