From 6f334a16526b91ad645d2f1eb8d048a5c01b16d1 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Sun, 29 Dec 2024 21:01:17 +0100
Subject: [PATCH] UITest: Migrate to Xunit v3

---
 src/Samples.UITest/BookLibrary.Test/BookLibrary.Test.csproj    | 3 ++-
 src/Samples.UITest/BookLibrary.Test/Tests/AddressBookTest.cs   | 1 -
 src/Samples.UITest/BookLibrary.Test/Tests/BookLibraryTest.cs   | 1 -
 src/Samples.UITest/BookLibrary.Test/Tests/GeneralTest.cs       | 1 -
 src/Samples.UITest/BookLibrary.Test/Tests/ReportingTest.cs     | 1 -
 src/Samples.UITest/BookLibrary.Test/UITest.cs                  | 1 -
 src/Samples.UITest/Directory.Packages.props                    | 3 +--
 .../InformationManager.Test/InformationManager.Test.csproj     | 3 ++-
 .../InformationManager.Test/Tests/AddressBookTest.cs           | 1 -
 src/Samples.UITest/InformationManager.Test/Tests/EmailTest.cs  | 1 -
 .../InformationManager.Test/Tests/GeneralTest.cs               | 1 -
 src/Samples.UITest/InformationManager.Test/UITest.cs           | 1 -
 src/Samples.UITest/UITest.Core/UITest.Core.csproj              | 2 +-
 src/Samples.UITest/UITest.Core/UITestBase.cs                   | 2 +-
 src/Samples.UITest/Writer.Test/Tests/WriterTest.cs             | 1 -
 src/Samples.UITest/Writer.Test/UITest.cs                       | 1 -
 src/Samples.UITest/Writer.Test/Writer.Test.csproj              | 3 ++-
 17 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/Samples.UITest/BookLibrary.Test/BookLibrary.Test.csproj b/src/Samples.UITest/BookLibrary.Test/BookLibrary.Test.csproj
index b52542b2..293fbf95 100644
--- a/src/Samples.UITest/BookLibrary.Test/BookLibrary.Test.csproj
+++ b/src/Samples.UITest/BookLibrary.Test/BookLibrary.Test.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
     <RootNamespace>UITest.BookLibrary</RootNamespace>
   </PropertyGroup>
@@ -8,7 +9,7 @@
     <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Samples.UITest/BookLibrary.Test/Tests/AddressBookTest.cs b/src/Samples.UITest/BookLibrary.Test/Tests/AddressBookTest.cs
index 5232198a..601d5e6c 100644
--- a/src/Samples.UITest/BookLibrary.Test/Tests/AddressBookTest.cs
+++ b/src/Samples.UITest/BookLibrary.Test/Tests/AddressBookTest.cs
@@ -1,6 +1,5 @@
 using FlaUI.Core.AutomationElements;
 using UITest.BookLibrary.Views;
-using Xunit.Abstractions;
 using Xunit;
 using UITest.SystemViews;
 
diff --git a/src/Samples.UITest/BookLibrary.Test/Tests/BookLibraryTest.cs b/src/Samples.UITest/BookLibrary.Test/Tests/BookLibraryTest.cs
index 6aed8e09..ba2c422c 100644
--- a/src/Samples.UITest/BookLibrary.Test/Tests/BookLibraryTest.cs
+++ b/src/Samples.UITest/BookLibrary.Test/Tests/BookLibraryTest.cs
@@ -2,7 +2,6 @@
 using UITest.BookLibrary.Views;
 using UITest.SystemViews;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace UITest.BookLibrary.Tests;
 
diff --git a/src/Samples.UITest/BookLibrary.Test/Tests/GeneralTest.cs b/src/Samples.UITest/BookLibrary.Test/Tests/GeneralTest.cs
index 525d4cc9..a4bf92b0 100644
--- a/src/Samples.UITest/BookLibrary.Test/Tests/GeneralTest.cs
+++ b/src/Samples.UITest/BookLibrary.Test/Tests/GeneralTest.cs
@@ -2,7 +2,6 @@
 using FlaUI.Core.Capturing;
 using UITest.SystemViews;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace UITest.BookLibrary.Tests;
 
diff --git a/src/Samples.UITest/BookLibrary.Test/Tests/ReportingTest.cs b/src/Samples.UITest/BookLibrary.Test/Tests/ReportingTest.cs
index 52f7d855..4ab12836 100644
--- a/src/Samples.UITest/BookLibrary.Test/Tests/ReportingTest.cs
+++ b/src/Samples.UITest/BookLibrary.Test/Tests/ReportingTest.cs
@@ -4,7 +4,6 @@
 using FlaUI.Core.Tools;
 using UITest.SystemViews;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace UITest.BookLibrary.Tests;
 
diff --git a/src/Samples.UITest/BookLibrary.Test/UITest.cs b/src/Samples.UITest/BookLibrary.Test/UITest.cs
index b0653e6f..0ecc6525 100644
--- a/src/Samples.UITest/BookLibrary.Test/UITest.cs
+++ b/src/Samples.UITest/BookLibrary.Test/UITest.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using UITest.BookLibrary.Views;
 using Xunit;
-using Xunit.Abstractions;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 
diff --git a/src/Samples.UITest/Directory.Packages.props b/src/Samples.UITest/Directory.Packages.props
index c2aa63c2..6eaef15b 100644
--- a/src/Samples.UITest/Directory.Packages.props
+++ b/src/Samples.UITest/Directory.Packages.props
@@ -7,8 +7,7 @@
     <PackageVersion Include="FlaUI.UIA3" Version="4.0.0" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
+    <PackageVersion Include="xunit.v3" Version="1.0.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />    
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Samples.UITest/InformationManager.Test/InformationManager.Test.csproj b/src/Samples.UITest/InformationManager.Test/InformationManager.Test.csproj
index aa9d4a3c..ea905b14 100644
--- a/src/Samples.UITest/InformationManager.Test/InformationManager.Test.csproj
+++ b/src/Samples.UITest/InformationManager.Test/InformationManager.Test.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
     <RootNamespace>UITest.InformationManager</RootNamespace>
   </PropertyGroup>
@@ -8,7 +9,7 @@
     <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Samples.UITest/InformationManager.Test/Tests/AddressBookTest.cs b/src/Samples.UITest/InformationManager.Test/Tests/AddressBookTest.cs
index 4e9f976d..9cf607f6 100644
--- a/src/Samples.UITest/InformationManager.Test/Tests/AddressBookTest.cs
+++ b/src/Samples.UITest/InformationManager.Test/Tests/AddressBookTest.cs
@@ -1,5 +1,4 @@
 using FlaUI.Core.AutomationElements;
-using Xunit.Abstractions;
 using Xunit;
 using UITest.InformationManager.Views;
 using FlaUI.Core.Definitions;
diff --git a/src/Samples.UITest/InformationManager.Test/Tests/EmailTest.cs b/src/Samples.UITest/InformationManager.Test/Tests/EmailTest.cs
index d2bd258d..5aeb764a 100644
--- a/src/Samples.UITest/InformationManager.Test/Tests/EmailTest.cs
+++ b/src/Samples.UITest/InformationManager.Test/Tests/EmailTest.cs
@@ -2,7 +2,6 @@
 using UITest.InformationManager.Views;
 using UITest.SystemViews;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace UITest.InformationManager.Tests;
 
diff --git a/src/Samples.UITest/InformationManager.Test/Tests/GeneralTest.cs b/src/Samples.UITest/InformationManager.Test/Tests/GeneralTest.cs
index 36e5cc51..5c6faed1 100644
--- a/src/Samples.UITest/InformationManager.Test/Tests/GeneralTest.cs
+++ b/src/Samples.UITest/InformationManager.Test/Tests/GeneralTest.cs
@@ -2,7 +2,6 @@
 using FlaUI.Core.Capturing;
 using UITest.SystemViews;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace UITest.InformationManager.Tests;
 
diff --git a/src/Samples.UITest/InformationManager.Test/UITest.cs b/src/Samples.UITest/InformationManager.Test/UITest.cs
index 229d27fb..92b26391 100644
--- a/src/Samples.UITest/InformationManager.Test/UITest.cs
+++ b/src/Samples.UITest/InformationManager.Test/UITest.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using UITest.InformationManager.Views;
 using Xunit;
-using Xunit.Abstractions;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 
diff --git a/src/Samples.UITest/UITest.Core/UITest.Core.csproj b/src/Samples.UITest/UITest.Core/UITest.Core.csproj
index 4aa0f5ed..bf4b14b7 100644
--- a/src/Samples.UITest/UITest.Core/UITest.Core.csproj
+++ b/src/Samples.UITest/UITest.Core/UITest.Core.csproj
@@ -6,6 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="FlaUI.UIA3" />
-    <PackageReference Include="xunit.abstractions" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 </Project>
diff --git a/src/Samples.UITest/UITest.Core/UITestBase.cs b/src/Samples.UITest/UITest.Core/UITestBase.cs
index e665f5cf..3b7d32c4 100644
--- a/src/Samples.UITest/UITest.Core/UITestBase.cs
+++ b/src/Samples.UITest/UITest.Core/UITestBase.cs
@@ -7,7 +7,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Xunit.Abstractions;
+using Xunit;
 
 namespace UITest;
 
diff --git a/src/Samples.UITest/Writer.Test/Tests/WriterTest.cs b/src/Samples.UITest/Writer.Test/Tests/WriterTest.cs
index 6f4611c7..7705e6b1 100644
--- a/src/Samples.UITest/Writer.Test/Tests/WriterTest.cs
+++ b/src/Samples.UITest/Writer.Test/Tests/WriterTest.cs
@@ -5,7 +5,6 @@
 using UITest.SystemViews;
 using UITest.Writer.Views;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace UITest.Writer;
 
diff --git a/src/Samples.UITest/Writer.Test/UITest.cs b/src/Samples.UITest/Writer.Test/UITest.cs
index 6bee544a..b2577800 100644
--- a/src/Samples.UITest/Writer.Test/UITest.cs
+++ b/src/Samples.UITest/Writer.Test/UITest.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using UITest.Writer.Views;
 using Xunit;
-using Xunit.Abstractions;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 
diff --git a/src/Samples.UITest/Writer.Test/Writer.Test.csproj b/src/Samples.UITest/Writer.Test/Writer.Test.csproj
index aa26c3ef..eeff90e6 100644
--- a/src/Samples.UITest/Writer.Test/Writer.Test.csproj
+++ b/src/Samples.UITest/Writer.Test/Writer.Test.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
     <RootNamespace>UITest.Writer</RootNamespace>
   </PropertyGroup>
@@ -8,7 +9,7 @@
     <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
   <ItemGroup>