Upgrade to xunit v3

Author: niemyjski

src/Foundatio.RabbitMQ/Foundatio.RabbitMQ.csproj

@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
 
-    <PackageReference Include="Foundatio" Version="12.0.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio" Version="12.0.1-preview.0.39" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>

tests/Directory.Build.props

@@ -2,17 +2,17 @@
   <Import Project="..\build\common.props" />
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
     <IsPackable>False</IsPackable>
     <NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="xunit.v3.mtp-off" Version="3.2.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="3.0.1" PrivateAssets="All" />
 
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="All" />
-
-    <PackageReference Include="Foundatio.TestHarness" Version="12.0.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio.TestHarness" Version="12.0.1-preview.0.39" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>

tests/Foundatio.RabbitMQ.Tests/Messaging/RabbitMqMessageBusClassicDelayedExchangeTests.cs

@@ -1,4 +1,4 @@
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Foundatio.RabbitMQ.Tests.Messaging;
 

tests/Foundatio.RabbitMQ.Tests/Messaging/RabbitMqMessageBusClassicTestBase.cs

@@ -5,7 +5,6 @@
 using Foundatio.Tests.Messaging;
 using Microsoft.Extensions.Logging;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Foundatio.RabbitMQ.Tests.Messaging;
 
@@ -46,12 +45,12 @@ await messageBus.SubscribeAsync<SimpleMessageA>(_ =>
                 _logger.LogTrace("SimpleAMessage received");
                 Interlocked.Increment(ref handlerInvocations);
                 throw new Exception("Poisoned message");
-            });
+            }, TestCancellationToken);
 
             await messageBus.PublishAsync(new SimpleMessageA());
             _logger.LogTrace("Published one...");
 
-            await Task.Delay(TimeSpan.FromSeconds(3));
+            await Task.Delay(TimeSpan.FromSeconds(3), TestCancellationToken);
             Assert.Equal(3, handlerInvocations);
         }
         finally

tests/Foundatio.RabbitMQ.Tests/Messaging/RabbitMqMessageBusClassicTests.cs

@@ -1,4 +1,4 @@
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Foundatio.RabbitMQ.Tests.Messaging;
 

tests/Foundatio.RabbitMQ.Tests/Messaging/RabbitMqMessageBusDelayedExchangeTests.cs

@@ -1,4 +1,4 @@
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Foundatio.RabbitMQ.Tests.Messaging;
 

tests/Foundatio.RabbitMQ.Tests/Messaging/RabbitMqMessageBusTestBase.cs

@@ -7,7 +7,6 @@
 using Foundatio.Tests.Messaging;
 using Microsoft.Extensions.Logging;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Foundatio.RabbitMQ.Tests.Messaging;
 
@@ -166,12 +165,12 @@ await messageBus.SubscribeAsync<SimpleMessageA>(_ =>
                 _logger.LogTrace("SimpleAMessage received");
                 Interlocked.Increment(ref handlerInvocations);
                 throw new Exception("Poisoned message");
-            });
+            }, TestCancellationToken);
 
             await messageBus.PublishAsync(new SimpleMessageA());
             _logger.LogTrace("Published one...");
 
-            await Task.Delay(TimeSpan.FromSeconds(3));
+            await Task.Delay(TimeSpan.FromSeconds(3), TestCancellationToken);
             Assert.Equal(3, handlerInvocations);
         }
         finally

tests/Foundatio.RabbitMQ.Tests/Messaging/RabbitMqMessageBusTests.cs

@@ -1,4 +1,4 @@
-using Xunit.Abstractions;
+using Xunit;
 
 namespace Foundatio.RabbitMQ.Tests.Messaging;