Hook up CI runs to run tests as tools

Author: dsplaisted

.vsts-ci.yml

@@ -55,6 +55,22 @@ phases:
             _BuildConfig: Release
             _PublishType: none
             _SignType: test
+  - template: /eng/build.yml
+    parameters:
+      agentOs: Windows_NT_TestAsTools
+      queue:
+        name: dotnet-external-temp
+        parallel: 2
+        timeoutInMinutes: 120
+        matrix:
+          Build_Debug:
+            _BuildConfig: Debug
+            _PublishType: none
+            _SignType: test
+          Build_Release:
+            _BuildConfig: Release
+            _PublishType: none
+            _SignType: test
 
   - template: /eng/build.yml
     parameters:

Directory.Build.targets

@@ -15,4 +15,11 @@
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <!-- Optionally override arcade's test target with one which will run the tests as tools.
+       Conditionally overriding a target requires a conditional import of another (.targets)
+       file. -->
+  <Import Project="OverrideTest.targets"
+          Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>
+
 </Project>

OverrideTest.targets

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
+<Project>
+  <Target Name="Test" DependsOnTargets="TestAsTool"
+          Condition="'$(IsUnitTestProject)' == 'true' or '$(IsPerformanceTestProject)' == 'true'"/>
+
+</Project>

eng/build.yml

@@ -72,7 +72,20 @@ phases:
           PublishType: $(_PublishType)
           TestFullMSBuild: 'true'
 
-    - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework') }}:
+    - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}:
+      - script: eng\common\CIBuild.cmd 
+                  -configuration $(_BuildConfig)
+                  $(_PublishArgs)
+                  $(_SignArgs)
+                  $(_OfficialBuildIdArgs)
+                  /p:RunTestsAsTool=true
+        displayName: Build
+        env:
+          BuildConfig: $(_BuildConfig)
+          BlobFeedUrl: $(PB_PublishBlobFeedUrl)
+          PublishType: $(_PublishType)
+
+    - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}:
       - script: eng/common/cibuild.sh 
                   --configuration $(_BuildConfig)
                   $(_PublishArgs)

src/Tests/Directory.Build.targets

@@ -9,6 +9,7 @@
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>$(PackageId)</ToolCommandName>
+    <CanRunTestAsTool>true</CanRunTestAsTool>
 
     <!-- Put packages for tests in subfolder so we don't try to sign them -->
     <PackageOutputPath>$(PackageOutputPath)tests\</PackageOutputPath>
@@ -26,7 +27,7 @@
 
   </ItemGroup>
 
-  <Target Name="TestAsTool" DependsOnTargets="_InnerGetTestsToRun">
+  <Target Name="TestAsTool" DependsOnTargets="Pack;_InnerGetTestsToRun">
     <PropertyGroup>
       <TestLocalToolFolder>$(ArtifactsTmpDir)$(ToolCommandName)\</TestLocalToolFolder>
     </PropertyGroup>