NuGet governance: migrate xUnit v2 to v3, update SDK & packages, fix Publish.ps1

davidnmbond · davidnmbond · commit da0f1552d688 · 2026-04-02T18:02:58.000+01:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,21 +5,18 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageVersion Include="AwesomeAssertions" Version="9.3.0" />
+		<PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
 		<PackageVersion Include="AwesomeAssertions.Analyzers" Version="9.0.8" />
-		<PackageVersion Include="coverlet.collector" Version="6.0.4" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
-		<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.101" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.201" />
 		<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
-		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-		<PackageVersion Include="Neovolve.Logging.Xunit" Version="6.3.0" />
+		<PackageVersion Include="Neovolve.Logging.Xunit.v3" Version="7.2.0" />
 		<PackageVersion Include="Nerdbank.GitVersioning" Version="3.9.50" />
 		<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
 		<PackageVersion Include="refit" Version="10.1.6" />
 		<PackageVersion Include="Refit.Newtonsoft.Json" Version="10.1.6" />
 		<PackageVersion Include="SecurityCodeScan.VS2019" Version="5.6.7" />
-		<PackageVersion Include="xunit" Version="2.9.3" />
-		<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+		<PackageVersion Include="xunit.v3" Version="3.2.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/Mapbox.Api.Test/GeocodingTests.cs b/Mapbox.Api.Test/GeocodingTests.cs
@@ -2,7 +2,6 @@
 using Mapbox.Api.Data;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Mapbox.Api.Test;
 
@@ -13,7 +12,7 @@ public async Task GetAllAsync_Succeeds()
 	{
 		var geocoding = await MapboxClient
 			.Geocoding
-			.GetForwardsAsync("Greenwich Observatory, Greenwich, London");
+			.GetForwardsAsync("Greenwich Observatory, Greenwich, London", TestContext.Current.CancellationToken);
 		geocoding.Should().BeOfType<Geocoding>();
 		geocoding.Should().NotBeNull();
 	}
diff --git a/Mapbox.Api.Test/Mapbox.Api.Test.csproj b/Mapbox.Api.Test/Mapbox.Api.Test.csproj
@@ -3,6 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
+		<OutputType>Exe</OutputType>
 
 		<IsPackable>false</IsPackable>
 
@@ -18,22 +19,13 @@
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="Neovolve.Logging.Xunit" />
+		<PackageReference Include="Neovolve.Logging.Xunit.v3" />
 		<PackageReference Include="Newtonsoft.Json" />
 		<PackageReference Include="SecurityCodeScan.VS2019">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
+		<PackageReference Include="xunit.v3" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Mapbox.Api.Test/MapboxClientTest.cs b/Mapbox.Api.Test/MapboxClientTest.cs
@@ -4,7 +4,7 @@
 using Newtonsoft.Json;
 using System;
 using System.IO;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Mapbox.Api.Test;
 
diff --git a/Publish.ps1 b/Publish.ps1
@@ -43,8 +43,8 @@ if ($existingTag) {
     exit 1
 }
 
-Write-Host "Tagging as $version ..." -ForegroundColor Cyan
+Write-Information "Tagging as $version ..."
 git tag $version
 git push origin $version
 
-Write-Host "✅ Published tag $version — CI will build and push to NuGet." -ForegroundColor Green
+Write-Information "Published tag $version - CI will build and push to NuGet."
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "rollForward": "latestMinor",
-    "version": "10.0.102"
+    "version": "10.0.201"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using Mapbox.Api.Data;`
`3`	`3`	`using System.Threading.Tasks;`
`4`	`4`	`using Xunit;`
`5`		`-using Xunit.Abstractions;`
`6`	`5`
`7`	`6`	`namespace Mapbox.Api.Test;`
`8`	`7`
`@@ -13,7 +12,7 @@ public async Task GetAllAsync_Succeeds()`
`13`	`12`	`{`
`14`	`13`	`var geocoding = await MapboxClient`
`15`	`14`	`.Geocoding`
`16`		`- .GetForwardsAsync("Greenwich Observatory, Greenwich, London");`
	`15`	`+ .GetForwardsAsync("Greenwich Observatory, Greenwich, London", TestContext.Current.CancellationToken);`
`17`	`16`	`geocoding.Should().BeOfType<Geocoding>();`
`18`	`17`	`geocoding.Should().NotBeNull();`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ if ($existingTag) {`
`43`	`43`	`exit 1`
`44`	`44`	`}`
`45`	`45`
`46`		`-Write-Host "Tagging as $version ..." -ForegroundColor Cyan`
	`46`	`+Write-Information "Tagging as $version ..."`
`47`	`47`	`git tag $version`
`48`	`48`	`git push origin $version`
`49`	`49`
`50`		`-Write-Host "✅ Published tag $version — CI will build and push to NuGet." -ForegroundColor Green`
	`50`	`+Write-Information "Published tag $version - CI will build and push to NuGet."`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`	`3`	`"rollForward": "latestMinor",`
`4`		`- "version": "10.0.102"`
	`4`	`+ "version": "10.0.201"`
`5`	`5`	`}`
`6`	`6`	`}`