refs and cleanup

Author: SimonCropp

src/global.json global.jsonsrc/global.json renamed to global.json

@@ -1,4 +1,4 @@
-{
+{
   "sdk": {
     "version": "10.0.103",
     "allowPrerelease": true,

src/Directory.Packages.props

@@ -5,12 +5,12 @@
   <ItemGroup>
     <PackageVersion Include="NServiceBus" Version="10.1.0" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.172" />
-    <PackageVersion Include="Verify.XunitV3" Version="31.13.0" />
-    <PackageVersion Include="xunit.v3" Version="3.2.2" />
+    <PackageVersion Include="Verify.TUnit" Version="31.13.0" />
     <PackageVersion Include="Argon" Version="0.33.5" />
     <PackageVersion Include="DiffEngine" Version="18.4.1" />
     <PackageVersion Include="EmptyFiles" Version="8.17.2" />
     <PackageVersion Include="SimpleInfoName" Version="3.2.0" />
     <PackageVersion Include="Verify" Version="31.13.0" />
+    <PackageVersion Include="TUnit" Version="1.15.11" />
   </ItemGroup>
 </Project>

src/Tests/Ensure_cascading_dependencies_are_resolved.cs

@@ -1,7 +1,9 @@
-public class Ensure_cascading_dependencies_are_resolved
+using System.Threading.Tasks;
+
+public class Ensure_cascading_dependencies_are_resolved
 {
-    [Fact]
-    public void Run()
+    [Test]
+    public async Task Run()
     {
         var types = new List<Type>
         {
@@ -11,9 +13,9 @@ public void Run()
         };
         var handlerDependencies = OrderHandlers.GetHandlerDependencies(types);
 
-        Assert.Contains(typeof(Class2), handlerDependencies[typeof(Class1)]);
-        Assert.Contains(typeof(Class3), handlerDependencies[typeof(Class1)]);
-        Assert.Contains(typeof(Class3), handlerDependencies[typeof(Class2)]);
+        await Assert.That(handlerDependencies[typeof(Class1)]).Contains(typeof(Class2));
+        await Assert.That(handlerDependencies[typeof(Class1)]).Contains(typeof(Class3));
+        await Assert.That(handlerDependencies[typeof(Class2)]).Contains(typeof(Class3));
     }
 
     class Class1 :

src/Tests/Tests.csproj

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
@@ -8,13 +7,13 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
-    <PackageReference Include="Verify.XunitV3" />
+    <PackageReference Include="Verify.TUnit" />
     <PackageReference Include="Argon" />
     <PackageReference Include="DiffEngine" />
     <PackageReference Include="EmptyFiles" />
     <PackageReference Include="SimpleInfoName" />
     <PackageReference Include="Verify" />
-    <PackageReference Include="xunit.v3" />
     <ProjectReference Include="..\HandlerOrdering\NServiceBus.Community.HandlerOrdering.csproj" />
+    <PackageReference Include="TUnit" />
   </ItemGroup>
 </Project>

src/Tests/TypeSorterTests.cs

@@ -1,10 +1,12 @@
-public class TypeSorterTests(VerifySettings? output) :
+using System.Threading.Tasks;
+
+public class TypeSorterTests(VerifySettings? output) :
     VerifyBase(output)
 {
     public class SimpleSort
     {
-        [Fact]
-        public void Run()
+        [Test]
+        public async Task Run()
         {
             var dependencies = new Dictionary<Type, List<Type>>
             {
@@ -16,10 +18,10 @@ public void Run()
                 [typeof(Class2)] = [typeof(Class3)]
             };
             var sorted = new TypeSorter(dependencies).Sorted;
-            Assert.Equal(3, sorted.Count);
-            Assert.Equal(typeof (Class3), sorted[0]);
-            Assert.Equal(typeof (Class2), sorted[1]);
-            Assert.Equal(typeof (Class1), sorted[2]);
+            await Assert.That(sorted.Count).IsEqualTo(3);
+            await Assert.That(sorted[0]).IsEqualTo(typeof (Class3));
+            await Assert.That(sorted[1]).IsEqualTo(typeof (Class2));
+            await Assert.That(sorted[2]).IsEqualTo(typeof (Class1));
         }
 
         class Class1;
@@ -31,8 +33,8 @@ class Class3;
 
     public class Ensure_circular_dependencies_are_handled
     {
-        [Fact]
-        public void Run()
+        [Test]
+        public async Task Run()
         {
             var dependencies = new Dictionary<Type, List<Type>>
             {
@@ -52,7 +54,7 @@ Cyclic dependency detected.
                     'Class2' wants to run after 'Class1'.
 
                     """.Replace("\r\n","").Replace("\n","");
-            Assert.Equal(expected, exception.Message.Replace("\r\n", "").Replace("\n", ""));
+            await Assert.That(exception.Message.Replace("\r\n", "").Replace("\n", "")).IsEqualTo(expected);
         }
 
         class Class1;
@@ -62,8 +64,8 @@ class Class3;
 
     public class Ensure_self_dependencies_are_handled
     {
-        [Fact]
-        public void Run()
+        [Test]
+        public async Task Run()
         {
             var dependencies = new Dictionary<Type, List<Type>>
             {
@@ -78,7 +80,7 @@ Cyclic dependency detected.
                            'Class1' wants to run after 'Class1'.
 
                            """.Replace("\r\n","").Replace("\n","");
-            Assert.Equal(expected, exception.Message.Replace("\r\n", "").Replace("\n", ""));
+            await Assert.That(exception.Message.Replace("\r\n", "").Replace("\n", "")).IsEqualTo(expected);
         }
 
         class Class1;

src/appveyor.yml

@@ -7,7 +7,7 @@ build_script:
     Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./dotnet-install.ps1"
     ./dotnet-install.ps1 -JSonFile src/global.json -Architecture x64 -InstallDir 'C:\Program Files\dotnet'
 - dotnet build src --configuration Release --nologo
-- dotnet test src --configuration Release --no-build --no-restore --nologo --filter Category!=Integration
+- dotnet test --solution src/HandlerOrdering.sln --configuration Release --no-build --no-restore --nologo --filter Category!=Integration
 test: off
 artifacts:
 - path: nugets\**\*.nupkg