Use graph build and test for PR builds

NuGet · Feb 24, 2025 · b224a8d · b224a8d
1 parent e716e78
commit b224a8d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 319 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -10,19 +10,6 @@
     </ItemGroup>
   </Target>
 
-  <!--
-    Determines if a project is a test project by checking the TestProject property and returning an item with the full path to the project file and its test type.
-  -->
-  <Target Name="IsTestProject"
-          Returns="@(TestProject)"
-          Condition="'$(TestProject)' == 'true'">
-    <ItemGroup>
-      <TestProject Include="$(MSBuildProjectFullPath)"
-                   TestType="$(TestProjectType)"
-                   ProjectName="$(MSBuildProjectName)" />
-    </ItemGroup>
-  </Target>
-
   <!--
     Determines if a project supports a specified target framework.  This target first calls GetProjectTargetFrameworks to get a list of target frameworks that the project supports, then filters the list down to the specified target framework.
     If the specified framework is supported, the target returns an item with the full path to the project file, otherwise it returns nothing which will signal that the project does not support that target framework.

diff --git a/Directory.Solution.targets b/Directory.Solution.targets
diff --git a/build/common.targets b/build/common.targets
@@ -102,6 +102,31 @@
     <Message Text="Tested project $(MSBuildProjectName)" Importance="high"  />
   </Target>
 
+  <!-- Add ability to run tests via "msbuild /t:Test" -->
+  <Sdk Name="Microsoft.Build.RunVSTest" />
+  <PropertyGroup>
+    <!-- Workaround for https://github.com/microsoft/MSBuildSdks/issues/564 -->
+    <RunVSTest Condition="'$(IsCrossTargetingBuild)' == 'true'">false</RunVSTest>
+
+    <!-- Only run tests for the requested test type -->
+    <RunVSTest Condition="'$(TestType)' != '' AND '$(TestType)' != '$(TestProjectType)'">false</RunVSTest>
+
+    <!--
+      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 Condition="'$(VSTestToolPath)' == ''">$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
+
+    <VSTestNoLogo Condition="'$(VSTestNoLogo)' == ''">true</VSTestNoLogo>
+    <VSTestVerbosity Condition="'$(SYSTEM_DEBUG)' == 'true'">detailed</VSTestVerbosity>
+    <VSTestVerbosity Condition="'$(VSTestVerbosity)' == ''">quiet</VSTestVerbosity>
+    <VSTestSetting Condition="'$(VSTestSetting)' == ''">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'build', 'xunit.runsettings'))</VSTestSetting>
+    <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'TestResults'))</VSTestResultsDirectory>
+    <VSTestLogger>trx;$(VSTestLogger)</VSTestLogger>
+    <VSTestLogger>console%3Bverbosity=$(VSTestVerbosity);$(VSTestLogger)</VSTestLogger>
+  </PropertyGroup>
+
   <!--
     ============================================================
     PackProjects

diff --git a/eng/pipelines/pr.job.yml b/eng/pipelines/pr.job.yml
@@ -72,31 +72,38 @@ jobs:
 
   - ${{ if eq(parameters.osName, 'Windows') }}:
     - task: MSBuild@1
-      displayName: Restore and Build $(TestType) Test Projects
+      displayName: Restore $(TestType) Test Projects
       inputs:
         solution: NuGet.sln
         msbuildArchitecture: x64
-        msbuildArguments: --binarylogger:"$(BinlogDirectory)01-RestoreAndBuild.binlog"
+        msbuildArguments: -t:Restore --binarylogger:"$(BinlogDirectory)01-Restore.binlog"
   - ${{ else }}:
     - task: DotNetCoreCLI@2
-      displayName: Restore and Build $(TestType) Test Projects
+      displayName: Restore $(TestType) Test Projects
       inputs:
-        command: build
-        arguments: --binarylogger:"$(BinlogDirectory)01-RestoreAndBuild.binlog"
+        command: custom
+        custom: restore
+        arguments: --binarylogger:"$(BinlogDirectory)01-Restore.binlog"
 
-  - task: DotNetCoreCLI@2
-    displayName: Run $(TestType) Tests 
-    condition: succeeded()
-    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-    env:
-      VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: 1000
-    inputs:
-      command: test
-      arguments: --no-restore --restore:false --no-build --framework $(TestTargetFramework) --binarylogger:"$(BinlogDirectory)02-RunTests.binlog"
-      ${{ if ne(parameters.testProjectName, '') }}:
-        testRunTitle: ${{ parameters.osName }} $(TestType) Tests for $(TestProjectName) ($(TestTargetFramework))
-      ${{ else }}:
-        testRunTitle: ${{ parameters.osName }} $(TestType) Tests ($(TestTargetFramework))
+  - ${{ if eq(parameters.osName, 'Windows') }}:
+    - task: MSBuild@1
+      displayName: Build and Test $(TestType) Test Projects
+      condition: succeeded()
+      timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      inputs:
+        solution: NuGet.sln
+        msbuildArchitecture: x64
+        msbuildArguments: --restore:false -graph -t:Build;Test -p:VSTestFramework=$(TestTargetFramework) --binarylogger:"$(BinlogDirectory)02-BuildAndTest.binlog"
+  - ${{ else }}:
+    - task: DotNetCoreCLI@2
+      displayName: Build and Test $(TestType) Test Projects
+      condition: succeeded()
+      timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      env:
+        VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: 1000
+      inputs:
+        command: build
+        arguments: --no-restore --restore:false -graph -t:Build;Test -p:VSTestFramework=$(TestTargetFramework) --binarylogger:"$(BinlogDirectory)02-BuildAndTest.binlog"
 
   - ${{ if eq(parameters.osName, 'Windows') }}:
     - script: taskkill /im dotnet.exe /f