Infra

.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:

.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

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 -->