From 4af27fe4d0668cd5906e87b3a4a839ff2f59e362 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 22 Jan 2025 06:13:23 +0100
Subject: [PATCH 01/11] Enable MTP

---
 Directory.Build.props    | 4 ++++
 Directory.Packages.props | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 02a848c87e48..30be3ab7cd97 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,6 +17,10 @@
     <NuGetAuditMode>direct</NuGetAuditMode>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
     <PlatformTarget>$(Platform)</PlatformTarget>
+
+    <!-- Enable Microsoft.Testing.Platform -->
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <TestingPlatformDotNetTestSupport>true</TestingPlatformDotNetTestSupport>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
diff --git a/Directory.Packages.props b/Directory.Packages.props
index c04a97ec804f..88e114d7e087 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -56,7 +56,7 @@
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="3.6.3" />
+    <PackageVersion Include="MSTest" Version="3.7.2" />
     <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />

From 943e38b08b3c8b871a35440ff26cdc398516a0e5 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 22 Jan 2025 06:47:56 +0100
Subject: [PATCH 02/11] Infra

---
 .pipelines/v2/templates/job-build-project.yml | 16 +++---------
 .pipelines/v2/templates/job-test-project.yml  |  3 ---
 Directory.Build.props                         | 26 -------------------
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index 12ebe4ff9c27..56180b62fc75 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -106,10 +106,6 @@ jobs:
     JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
     NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=$(BuildPlatform) # Required for nuget to work due to self contained
     NODE_OPTIONS: --max_old_space_size=16384
-    ${{ if eq(parameters.runTests, true) }}:
-      MSBuildMainBuildTargets: Build;Test
-    ${{ else }}:
-      MSBuildMainBuildTargets: Build
     ${{ insert }}: ${{ parameters.variables }}
     ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
       RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages"'
@@ -157,10 +153,6 @@ jobs:
       sdk: true
       version: '9.0'
 
-  - ${{ if eq(parameters.runTests, true) }}:
-    - task: VisualStudioTestPlatformInstaller@1
-      displayName: Ensure VSTest Platform
-
   - pwsh: |-
       & '.pipelines/applyXamlStyling.ps1' -Passive
     displayName: Verify XAML formatting
@@ -211,9 +203,6 @@ jobs:
   - ${{ parameters.beforeBuildSteps }}
 
   - task: VSBuild@1
-    ${{ if eq(parameters.runTests, true) }}:
-      displayName: Build and Test PowerToys main project
-    ${{ else }}:
       displayName: Build PowerToys main project
     inputs:
       solution: 'PowerToys.sln'
@@ -225,7 +214,6 @@ jobs:
         /bl:$(LogOutputDirectory)\build-0-main.binlog
         ${{ parameters.additionalBuildOptions }}
         $(MSBuildCacheParameters)
-        /t:$(MSBuildMainBuildTargets)
         $(RestoreAdditionalProjectSourcesArg)
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -235,6 +223,10 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
+  - pwsh: |
+      dotnet test PowerToys.sln --no-build -- --report-trx
+    displayName: Test PowerToys main project
+
   - task: VSBuild@1
     displayName: Build BugReportTool
     inputs:
diff --git a/.pipelines/v2/templates/job-test-project.yml b/.pipelines/v2/templates/job-test-project.yml
index 0bf4641e429f..836ecda5e6a1 100644
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -73,9 +73,6 @@ jobs:
       sdk: true
       version: '9.0'
 
-  - task: VisualStudioTestPlatformInstaller@1
-    displayName: Ensure VSTest Platform
-
   - pwsh: |-
       & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
     displayName: Download and install WinAppDriver
diff --git a/Directory.Build.props b/Directory.Build.props
index 30be3ab7cd97..a44cbf0fc549 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -49,32 +49,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <!-- Add ability to run tests via "msbuild /t:Test" -->
-  <!--
-    Workaround an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
-    See: https://github.com/dotnet/msbuild/pull/9984
-    NB 1: This means that using "/t:Test" is not supported for Arm64 builds and tests will need to be run in an alternate way,
-          eg running tests in VS or invoking vstest.console directly.
-    NB 2: <Sdk> elements do not support conditions, so this is also being worked around.
-          Once the change referenced above is fixed, the ImportGroup below can be replaced with:
-            <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
-  -->
-  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
-    <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
-  </ImportGroup>
-  <PropertyGroup>
-    <VSTestLogger>trx</VSTestLogger>
-    <!--
-      RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,
-      but some of the CI scenarios don't define %VSINSTALLDIR%, so be explicit about where to look for vstest.
-      Note: $(VsInstallRoot) is a built-in MSBuild property, so should always be defined.
-    -->
-    <VSTestToolPath>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
-    <!-- No arm64 agents to run the tests. -->
-    <RunVSTest Condition="'$(Platform)' == 'ARM64'">false</RunVSTest>
-  </PropertyGroup>
-
   <!-- MSBuildCache -->
   <PropertyGroup>
     <!-- Off by default -->

From eca410ad9bed4fc399798fa956d1c2de9084194f Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 22 Jan 2025 10:01:38 +0100
Subject: [PATCH 03/11] Revert some changes

---
 .pipelines/v2/templates/job-build-project.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index 56180b62fc75..12ebe4ff9c27 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -106,6 +106,10 @@ jobs:
     JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
     NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=$(BuildPlatform) # Required for nuget to work due to self contained
     NODE_OPTIONS: --max_old_space_size=16384
+    ${{ if eq(parameters.runTests, true) }}:
+      MSBuildMainBuildTargets: Build;Test
+    ${{ else }}:
+      MSBuildMainBuildTargets: Build
     ${{ insert }}: ${{ parameters.variables }}
     ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
       RestoreAdditionalProjectSourcesArg: '/p:RestoreAdditionalProjectSources="$(Build.SourcesDirectory)\localpackages\NugetPackages"'
@@ -153,6 +157,10 @@ jobs:
       sdk: true
       version: '9.0'
 
+  - ${{ if eq(parameters.runTests, true) }}:
+    - task: VisualStudioTestPlatformInstaller@1
+      displayName: Ensure VSTest Platform
+
   - pwsh: |-
       & '.pipelines/applyXamlStyling.ps1' -Passive
     displayName: Verify XAML formatting
@@ -203,6 +211,9 @@ jobs:
   - ${{ parameters.beforeBuildSteps }}
 
   - task: VSBuild@1
+    ${{ if eq(parameters.runTests, true) }}:
+      displayName: Build and Test PowerToys main project
+    ${{ else }}:
       displayName: Build PowerToys main project
     inputs:
       solution: 'PowerToys.sln'
@@ -214,6 +225,7 @@ jobs:
         /bl:$(LogOutputDirectory)\build-0-main.binlog
         ${{ parameters.additionalBuildOptions }}
         $(MSBuildCacheParameters)
+        /t:$(MSBuildMainBuildTargets)
         $(RestoreAdditionalProjectSourcesArg)
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -223,10 +235,6 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
-  - pwsh: |
-      dotnet test PowerToys.sln --no-build -- --report-trx
-    displayName: Test PowerToys main project
-
   - task: VSBuild@1
     displayName: Build BugReportTool
     inputs:

From d4e2c9d6f5b921b6609150499b075099184d8fb1 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Fri, 24 Jan 2025 14:51:00 +0100
Subject: [PATCH 04/11] Adjust

---
 .pipelines/v2/templates/job-test-project.yml  | 19 +++----------
 Directory.Build.props                         | 28 +++++++++++++++++++
 .../UITests-FancyZones.csproj                 |  8 +++---
 .../UITests-FancyZonesEditor.csproj           |  6 ++--
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/.pipelines/v2/templates/job-test-project.yml b/.pipelines/v2/templates/job-test-project.yml
index 836ecda5e6a1..73806fb13638 100644
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -82,18 +82,7 @@ jobs:
       inputs:
         displaySettings: 'optimal'
 
-  - task: VSTest@3
-    displayName: Run UI Tests
-    inputs:
-      platform: '$(BuildPlatform)'
-      configuration: '$(BuildConfiguration)'
-      testSelector: 'testAssemblies'
-      searchFolder: '$(Pipeline.Workspace)\build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}'
-      vsTestVersion: 'toolsInstaller'
-      uiTests: true
-      rerunFailedTests: true
-      testAssemblyVer2: |
-        **\UITests-FancyZones.dll
-        **\UITests-FancyZonesEditor.dll
-        !**\obj\**
-        !**\ref\**
+  - script: 
+      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\UITests-FancyZones\UITests-FancyZones.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
+      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\UITests-FancyZonesEditor\UITests-FancyZonesEditor.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
+    displayName: "Run UI Tests"
diff --git a/Directory.Build.props b/Directory.Build.props
index a44cbf0fc549..90a8a352346c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -20,6 +20,7 @@
 
     <!-- Enable Microsoft.Testing.Platform -->
     <EnableMSTestRunner>true</EnableMSTestRunner>
+    <TestingPlatformCaptureOutput>false</TestingPlatformCaptureOutput>
     <TestingPlatformDotNetTestSupport>true</TestingPlatformDotNetTestSupport>
   </PropertyGroup>
 
@@ -49,6 +50,33 @@
     </PackageReference>
   </ItemGroup>
 
+  <!-- Add ability to run tests via "msbuild /t:Test" using the RunVSTest SDK -->
+  <!-- This is only needed for C++, as we use Microsoft.Testing.Platform for C# -->
+  <!--
+    Workaround an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
+    See: https://github.com/dotnet/msbuild/pull/9984
+    NB 1: This means that using "/t:Test" is not supported for Arm64 builds and tests will need to be run in an alternate way,
+          eg running tests in VS or invoking vstest.console directly.
+    NB 2: <Sdk> elements do not support conditions, so this is also being worked around.
+          Once the change referenced above is fixed, the ImportGroup below can be replaced with:
+            <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
+  -->
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64' AND '$(Language)' == 'C++'">
+    <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
+  </ImportGroup>
+  <PropertyGroup Condition="'$(Language)' == 'C++'">
+    <VSTestLogger>trx</VSTestLogger>
+    <!--
+      RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,
+      but some of the CI scenarios don't define %VSINSTALLDIR%, so be explicit about where to look for vstest.
+      Note: $(VsInstallRoot) is a built-in MSBuild property, so should always be defined.
+    -->
+    <VSTestToolPath>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
+    <!-- No arm64 agents to run the tests. -->
+    <RunVSTest Condition="'$(Platform)' == 'ARM64'">false</RunVSTest>
+  </PropertyGroup>
+
   <!-- MSBuildCache -->
   <PropertyGroup>
     <!-- Off by default -->
diff --git a/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj b/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj
index 1ded556e9527..92ea952d3ce7 100644
--- a/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj
+++ b/src/modules/fancyzones/UITests-FancyZones/UITests-FancyZones.csproj
@@ -7,10 +7,10 @@
     <RootNamespace>Microsoft.FancyZones.UITests</RootNamespace>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
-    <OutputType>Library</OutputType>
-    
-    <!-- This is a UI test, so don't run as part of MSBuild -->
-    <RunVSTest>false</RunVSTest>
+    <OutputType>Exe</OutputType>
+
+    <!-- This is a UI test, so don't run as part of the Test target -->
+    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj b/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj
index 542ebb4ef126..f180b1425ea1 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj
@@ -7,10 +7,10 @@
     <RootNamespace>Microsoft.FancyZonesEditor.UITests</RootNamespace>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     
-    <!-- This is a UI test, so don't run as part of MSBuild -->
-    <RunVSTest>false</RunVSTest>
+    <!-- This is a UI test, so don't run as part of the Test target -->
+    <TestingPlatformDisableCustomTestTarget>false</TestingPlatformDisableCustomTestTarget>
   </PropertyGroup>
 
   <PropertyGroup>

From c0c332a526dee87319f1dece965144845b19f237 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Mon, 27 Jan 2025 17:22:01 +0100
Subject: [PATCH 05/11] Update to 3.7.3

---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 88e114d7e087..bf387b263b19 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -56,7 +56,7 @@
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="3.7.2" />
+    <PackageVersion Include="MSTest" Version="3.7.3" />
     <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />

From 84abda19a88907443688136424180180ce6da23a Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Mon, 27 Jan 2025 17:25:10 +0100
Subject: [PATCH 06/11] Small fix

---
 .../UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj b/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj
index f180b1425ea1..29fbaadacb32 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/UITests-FancyZonesEditor.csproj
@@ -10,7 +10,7 @@
     <OutputType>Exe</OutputType>
     
     <!-- This is a UI test, so don't run as part of the Test target -->
-    <TestingPlatformDisableCustomTestTarget>false</TestingPlatformDisableCustomTestTarget>
+    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
   </PropertyGroup>
 
   <PropertyGroup>

From 4955c007352a195042d127cf3b90b94618fbee25 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 29 Jan 2025 13:18:02 +0100
Subject: [PATCH 07/11] Adjust for C++

---
 Directory.Build.props | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 90a8a352346c..9a6d1c65612d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -50,6 +50,13 @@
     </PackageReference>
   </ItemGroup>
 
+  <!-- In CI, we build and test with `/t:Build;Test` -->
+  <!-- So, for non-test projects, we want the target to be there and it's basically doing nothing -->
+  <!-- For C# test projects, Microsoft.Testing.Platform should inject Test target here: -->
+  <!-- https://github.com/microsoft/testfx/blob/5ad21909704db501f58f27d4a7ec241edd761af5/src/Platform/Microsoft.Testing.Platform.MSBuild/buildMultiTargeting/Microsoft.Testing.Platform.MSBuild.targets#L270-L273 -->
+  <!-- For C++ test projects, the RunVSTest SDK will do its job -->
+  <Target Name="Test" />
+
   <!-- Add ability to run tests via "msbuild /t:Test" using the RunVSTest SDK -->
   <!-- This is only needed for C++, as we use Microsoft.Testing.Platform for C# -->
   <!--
@@ -61,11 +68,11 @@
           Once the change referenced above is fixed, the ImportGroup below can be replaced with:
             <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
   -->
-  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64' AND '$(Language)' == 'C++'">
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64' AND ('$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj')">
     <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
     <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
   </ImportGroup>
-  <PropertyGroup Condition="'$(Language)' == 'C++'">
+  <PropertyGroup Condition="'$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj'">
     <VSTestLogger>trx</VSTestLogger>
     <!--
       RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,

From e2b90829fa7dfcb231dc2143f31284c0469b149c Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 29 Jan 2025 17:56:13 +0100
Subject: [PATCH 08/11] A little more progress

---
 .pipelines/v2/templates/job-build-project.yml        |  3 +++
 .../v2/templates/steps-ensure-dotnet-version.yml     |  4 +++-
 .../RunFancyZonesEditorTest.cs                       | 12 ++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index 12ebe4ff9c27..edbc0668074c 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -146,16 +146,19 @@ jobs:
     parameters:
       sdk: true
       version: '6.0'
+      platform: $(BuildPlatform)
 
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
       version: '8.0'
+      platform: $(BuildPlatform)
 
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
       version: '9.0'
+      platform: $(BuildPlatform)
 
   - ${{ if eq(parameters.runTests, true) }}:
     - task: VisualStudioTestPlatformInstaller@1
diff --git a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
index b327b8004fd1..85771036bc2c 100644
--- a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
+++ b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
@@ -5,6 +5,8 @@ parameters:
 - name: sdk
   type: boolean
   default: false
+- name: platform
+  type: string
 
 # You might be wondering, "Why didn't they use UseDotNet?"
 # Azure Pipelines is practically unmaintained, that's why.
@@ -21,7 +23,7 @@ steps:
       exit 1
     }
     $NEW_DOTNET_ROOT = "$(Agent.ToolsDirectory)\dotnet"
-    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -InstallDir $NEW_DOTNET_ROOT
+    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -Architecture ${{parameters.platform}} -InstallDir $NEW_DOTNET_ROOT
     Write-Host "##vso[task.setvariable variable=DOTNET_ROOT]${NEW_DOTNET_ROOT}"
     Write-Host "##vso[task.prependpath]${NEW_DOTNET_ROOT}"
     Remove-Item dotnet-install.ps1 -ErrorAction:Ignore
diff --git a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs
index c3af0fefacee..6420ed2e2084 100644
--- a/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs
+++ b/src/modules/fancyzones/UITests-FancyZonesEditor/RunFancyZonesEditorTest.cs
@@ -15,13 +15,14 @@ namespace UITests_FancyZonesEditor
     public class RunFancyZonesEditorTest
     {
         private static FancyZonesEditorSession? _session;
-        private static TestContext? _context;
+        private readonly TestContext _context;
+
+        public RunFancyZonesEditorTest(TestContext context)
+            => _context = context;
 
         [ClassInitialize]
         public static void ClassInitialize(TestContext testContext)
         {
-            _context = testContext;
-
             // prepare files to launch Editor without errors
             EditorParameters editorParameters = new EditorParameters();
             EditorParameters.ParamsWrapper parameters = new EditorParameters.ParamsWrapper
@@ -133,19 +134,18 @@ public static void ClassInitialize(TestContext testContext)
         public static void ClassCleanup()
         {
             FancyZonesEditorSession.Files.Restore();
-            _context = null;
         }
 
         [TestInitialize]
         public void TestInitialize()
         {
-            _session = new FancyZonesEditorSession(_context!);
+            _session = new FancyZonesEditorSession(_context);
         }
 
         [TestCleanup]
         public void TestCleanup()
         {
-            _session?.Close(_context!);
+            _session?.Close(_context);
         }
 
         [TestMethod]

From 805b38b3fdbebbd3f67a21fe51947a4465dc82b7 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Thu, 30 Jan 2025 09:37:52 +0100
Subject: [PATCH 09/11] Revert

---
 .pipelines/v2/templates/job-build-project.yml           | 3 ---
 .pipelines/v2/templates/steps-ensure-dotnet-version.yml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index edbc0668074c..12ebe4ff9c27 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -146,19 +146,16 @@ jobs:
     parameters:
       sdk: true
       version: '6.0'
-      platform: $(BuildPlatform)
 
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
       version: '8.0'
-      platform: $(BuildPlatform)
 
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true
       version: '9.0'
-      platform: $(BuildPlatform)
 
   - ${{ if eq(parameters.runTests, true) }}:
     - task: VisualStudioTestPlatformInstaller@1
diff --git a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
index 85771036bc2c..3cf468951d4d 100644
--- a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
+++ b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
@@ -23,7 +23,7 @@ steps:
       exit 1
     }
     $NEW_DOTNET_ROOT = "$(Agent.ToolsDirectory)\dotnet"
-    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -Architecture ${{parameters.platform}} -InstallDir $NEW_DOTNET_ROOT
+    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -InstallDir $NEW_DOTNET_ROOT
     Write-Host "##vso[task.setvariable variable=DOTNET_ROOT]${NEW_DOTNET_ROOT}"
     Write-Host "##vso[task.prependpath]${NEW_DOTNET_ROOT}"
     Remove-Item dotnet-install.ps1 -ErrorAction:Ignore

From b563529b588cee7c287e2e05f5db4e67141801ce Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Thu, 30 Jan 2025 09:39:46 +0100
Subject: [PATCH 10/11] Ignore on arm64 for now as before. This needs an arm64
 agent

---
 Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9a6d1c65612d..2f6a51bc0195 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -22,6 +22,9 @@
     <EnableMSTestRunner>true</EnableMSTestRunner>
     <TestingPlatformCaptureOutput>false</TestingPlatformCaptureOutput>
     <TestingPlatformDotNetTestSupport>true</TestingPlatformDotNetTestSupport>
+
+    <!-- No arm64 agents to run the tests. -->
+    <TestingPlatformDisableCustomTestTarget Condition="'$(Platform)' == 'ARM64'">true</TestingPlatformDisableCustomTestTarget>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">

From c26fbc0433fd0241ead59910d127dba2ffea3484 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Thu, 30 Jan 2025 17:22:45 +0100
Subject: [PATCH 11/11] Revert

---
 .pipelines/v2/templates/steps-ensure-dotnet-version.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
index 3cf468951d4d..b327b8004fd1 100644
--- a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
+++ b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
@@ -5,8 +5,6 @@ parameters:
 - name: sdk
   type: boolean
   default: false
-- name: platform
-  type: string
 
 # You might be wondering, "Why didn't they use UseDotNet?"
 # Azure Pipelines is practically unmaintained, that's why.