From b7f762647b8e15640f30dad68a8dc4f3bdd6faba Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Sun, 21 Dec 2025 15:19:42 +0100
Subject: [PATCH 1/5] Migrate from VSTest to Microsoft.Testing.Platform

---
 Directory.Build.props                                      | 2 ++
 Directory.Packages.props                                   | 1 -
 global.json                                                | 5 ++++-
 tests/Files.InteractionTests/Files.InteractionTests.csproj | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2b34fb165147..c212909cb0f3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,5 +7,7 @@
     <WindowsSdkPackageVersion>10.0.26100.67-preview</WindowsSdkPackageVersion>
     <WindowsTargetFramework>$(TargetFrameworkVersion)-windows$(TargetWindowsVersion)</WindowsTargetFramework>
     <LangVersion>preview</LangVersion>
+
+    <EnableMSTestRunner>true</EnableMSTestRunner>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4f0b23586d00..07e3b02d9f56 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -57,7 +57,6 @@
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.9" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Axe.Windows" Version="2.4.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
     <PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageVersion Include="Dongle.GuidRVAGen" Version="1.0.5" />
diff --git a/global.json b/global.json
index 6b2ebefd9cc0..8489643fb4f1 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,9 @@
 {
   "sdk": {
-    "version": "9.0.200",
+    "version": "10.0.101",
     "rollForward": "latestMajor"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
   }
 }
\ No newline at end of file
diff --git a/tests/Files.InteractionTests/Files.InteractionTests.csproj b/tests/Files.InteractionTests/Files.InteractionTests.csproj
index cf5525fa5715..c8fc52b613bc 100644
--- a/tests/Files.InteractionTests/Files.InteractionTests.csproj
+++ b/tests/Files.InteractionTests/Files.InteractionTests.csproj
@@ -7,12 +7,12 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>x86;x64;arm64</Platforms>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+        <OutputType>Exe</OutputType>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Appium.WebDriver" />
         <PackageReference Include="Axe.Windows" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="MSTest.TestAdapter" />
         <PackageReference Include="MSTest.TestFramework" />
     </ItemGroup>

From cce64a237905eb6e84326a6049c6ebb254b7b0f2 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Mon, 22 Dec 2025 11:00:53 +0100
Subject: [PATCH 2/5] Fix dotnet test invocation

Signed-off-by: Youssef Victor <youssefvictor00@gmail.com>
---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9234b5c8ccf1..f17c0a845fa3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -237,8 +237,10 @@ jobs:
         shell: pwsh
         command: |
           dotnet test `
-            $env:AUTOMATED_TESTS_ASSEMBLY_DIR\**\Files.InteractionTests.dll `
-            --logger "trx;LogFileName=$env:AUTOMATED_TESTS_ASSEMBLY_DIR\testResults.trx"
+            --test-modules $env:AUTOMATED_TESTS_ASSEMBLY_DIR\**\Files.InteractionTests.dll `
+            --results-directory $env:AUTOMATED_TESTS_ASSEMBLY_DIR `
+            --report-trx `
+            --report-trx-filename testResults.trx
 
     - if: github.event_name == 'pull_request'
       uses: geekyeggo/delete-artifact@v5

From 24c65d7dc3c86eef72ca89597bfbbfc2cd1b92e6 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Tue, 20 Jan 2026 00:41:46 +0100
Subject: [PATCH 3/5] Update to latest SDK

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 8489643fb4f1..9e04c2aca53c 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.101",
+    "version": "10.0.102",
     "rollForward": "latestMajor"
   },
   "test": {

From 47e1816c975c7c7dd5acce7e4413dabe697b010f Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Tue, 20 Jan 2026 00:50:06 +0100
Subject: [PATCH 4/5] TrxReport

---
 Directory.Packages.props                                   | 1 +
 tests/Files.InteractionTests/Files.InteractionTests.csproj | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 07e3b02d9f56..aa83f4a6bdcd 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -59,6 +59,7 @@
     <PackageVersion Include="Axe.Windows" Version="2.4.2" />
     <PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
     <PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
     <PackageVersion Include="Dongle.GuidRVAGen" Version="1.0.5" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/Files.InteractionTests/Files.InteractionTests.csproj b/tests/Files.InteractionTests/Files.InteractionTests.csproj
index c8fc52b613bc..38b43e642a54 100644
--- a/tests/Files.InteractionTests/Files.InteractionTests.csproj
+++ b/tests/Files.InteractionTests/Files.InteractionTests.csproj
@@ -15,6 +15,7 @@
         <PackageReference Include="Axe.Windows" />
         <PackageReference Include="MSTest.TestAdapter" />
         <PackageReference Include="MSTest.TestFramework" />
+        <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
     </ItemGroup>
 
 </Project>

From 4987f48653eb1fd08abbfd8a55ba52fc94c867ac Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Tue, 20 Jan 2026 02:04:11 +0100
Subject: [PATCH 5/5] Fix test-modules

Signed-off-by: Youssef Victor <youssefvictor00@gmail.com>
---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f17c0a845fa3..f168090d2cf5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -237,7 +237,8 @@ jobs:
         shell: pwsh
         command: |
           dotnet test `
-            --test-modules $env:AUTOMATED_TESTS_ASSEMBLY_DIR\**\Files.InteractionTests.dll `
+            --test-modules **\Files.InteractionTests.dll `
+            --root-directory $env:AUTOMATED_TESTS_ASSEMBLY_DIR `
             --results-directory $env:AUTOMATED_TESTS_ASSEMBLY_DIR `
             --report-trx `
             --report-trx-filename testResults.trx