Merge branch 'v3'

Author: asherber

README.md

@@ -1,6 +1,11 @@
 ![Icon](https://github.com/asherber/Xunit.Priority/blob/main/media/xunit-priority-64.png)
 
-# Xunit.Priority [![NuGet](https://img.shields.io/nuget/v/Xunit.Priority.svg)](https://nuget.org/packages/Xunit.Priority) [![Build status](https://github.com/asherber/Xunit.Priority/actions/workflows/CI.yml/badge.svg)](https://github.com/asherber/Xunit.Priority/actions)
+# Xunit.Priority [![Build status](https://github.com/asherber/Xunit.Priority/actions/workflows/CI.yml/badge.svg)](https://github.com/asherber/Xunit.Priority/actions)
+
+| Package                | Supported xUnit Version | NuGet                                                                                  |
+|------------------------|------------------------|----------------------------------------------------------------------------------------|
+| Xunit.Priority         | xunit v2               | [![NuGet](https://img.shields.io/nuget/v/Xunit.Priority.svg)](https://nuget.org/packages/Xunit.Priority)         |
+| Xunit.v3.Priority   | xunit v3               | [![NuGet](https://img.shields.io/nuget/v/Xunit.v3.Priority.svg)](https://nuget.org/packages/Xunit.v3.Priority)   |
 
 Provides an `ITestCaseOrderer` that allows you to control the order of execution of Xunit tests within a class.
 
@@ -13,7 +18,11 @@ Based closely on the code at https://github.com/xunit/samples.xunit/tree/main/Te
 Add the following attribute to classes for which you want tests run in order:
 
 ```csharp
+// for Xunit.Priority
 [TestCaseOrderer(PriorityOrderer.Name, PriorityOrderer.Assembly)]
+
+// for Xunit.v3.Priority
+[TestCaseOrderer(typeof(PriorityOrderer))]
 ```
 
 Then decorate your test methods with the `Priority` attribute.

Xunit.Priority.Tests/BasicPriorityTests.cs

@@ -4,10 +4,17 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Priority;
 using FluentAssertions;
 
+#if V3
+using Xunit.v3.Priority;
+
+namespace Xunit.v3.Priority.Tests
+#else
+using Xunit.Priority;
+
 namespace Xunit.Priority.Tests
+#endif
 {
     public class BasicPriorityTests: TestsBase
     {

Xunit.Priority.Tests/NoPriorityTests.cs

@@ -4,10 +4,17 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Priority;
 using FluentAssertions;
 
+#if V3
+using Xunit.v3.Priority;
+
+namespace Xunit.v3.Priority.Tests
+#else
+using Xunit.Priority;
+
 namespace Xunit.Priority.Tests
+#endif
 {
     public class NoPriorityTests: TestsBase
     {

Xunit.Priority.Tests/OnePriorityMinDefaultTests.cs

@@ -4,10 +4,17 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Priority;
 using FluentAssertions;
 
+#if V3
+using Xunit.v3.Priority;
+
+namespace Xunit.v3.Priority.Tests
+#else
+using Xunit.Priority;
+
 namespace Xunit.Priority.Tests
+#endif
 {
     [DefaultPriority(int.MinValue)]
     public class OnePriorityMinDefaultTests: TestsBase

Xunit.Priority.Tests/PriorityWithMaxDefaultTests.cs

@@ -4,10 +4,17 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Priority;
 using FluentAssertions;
 
+#if V3
+using Xunit.v3.Priority;
+
+namespace Xunit.v3.Priority.Tests
+#else
+using Xunit.Priority;
+
 namespace Xunit.Priority.Tests
+#endif
 {
     [DefaultPriority(int.MaxValue)]
     public class PriorityWithMaxDefaultTests: TestsBase

Xunit.Priority.Tests/PriorityWithZeroDefault.cs

@@ -4,10 +4,17 @@
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Priority;
 using FluentAssertions;
 
+#if V3
+using Xunit.v3.Priority;
+
+namespace Xunit.v3.Priority.Tests
+#else
+using Xunit.Priority;
+
 namespace Xunit.Priority.Tests
+#endif
 {
     [DefaultPriority(0)]
     public class PriorityWithZeroDefault: TestsBase

Xunit.Priority.Tests/TestsBase.cs

@@ -6,9 +6,17 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 
+#if V3
+namespace Xunit.v3.Priority.Tests
+#else
 namespace Xunit.Priority.Tests
+#endif
 {
+#if V3
+    [TestCaseOrderer(typeof(PriorityOrderer))]
+#else
     [TestCaseOrderer(PriorityOrderer.Name, PriorityOrderer.Assembly)]
+#endif
     public abstract class TestsBase
     {
         private FieldInfo _counterField;

Xunit.Priority.Tests/Xunit.Priority.Tests.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1" />
     <PackageReference Include="FluentAssertions" Version="5.8.0" />
   </ItemGroup>