From 2161d9d1789d28b1e56f4edff47572b12585a680 Mon Sep 17 00:00:00 2001
From: Egor Chesakov <Egor.Chesakov@microsoft.com>
Date: Thu, 6 Dec 2018 10:22:50 -0800
Subject: Run MSBuild in parallel when submitting jobs to Helix (#21390)

---
 tests/helixpublishwitharcade.proj | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'tests/helixpublishwitharcade.proj')

diff --git a/tests/helixpublishwitharcade.proj b/tests/helixpublishwitharcade.proj
index 38fb8d2589..50d7818f17 100644
--- a/tests/helixpublishwitharcade.proj
+++ b/tests/helixpublishwitharcade.proj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.DotNet.Helix.Sdk">
+<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="SubmitTestsToHelix">
 
   <!-- This project uses the helix SDK ,documented at
        https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.Helix/Sdk,
@@ -51,20 +51,17 @@
   <Target Name="SubmitTestsToHelix">
     <ItemGroup>
       <Scenarios Include="$(Scenarios)" />
+      <ProjectsToBuild Include="$(MSBuildProjectFile)">
+        <Properties>Scenario=%(Scenarios.Identity)</Properties>
+      </ProjectsToBuild>
     </ItemGroup>
 
-    <!-- If no scenario was specified, just run the normal test
-         scenario -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Test"
-             Condition=" '@(Scenarios->Count())' == '0' " />
-
-    <!-- If scenarios were specified, submit jobs for each
-         scenario. -->
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Test"
-             Properties="Scenario=%(Scenarios.Identity)"
-             BuildInParallel="true"
-             Condition=" '@(Scenarios->Count())' != '0' " />
+    <PropertyGroup>
+      <BuildInParallel>false</BuildInParallel>
+      <BuildInParallel Condition=" '@(ProjectsToBuild->Count())' > '1' ">true</BuildInParallel>
+    </PropertyGroup>
 
+    <MSBuild Projects="@(ProjectsToBuild)" Targets="Test" BuildInParallel="$(BuildInParallel)" StopOnFirstFailure="false" UnloadProjectsOnCompletion="true" />
   </Target>
 
   <Target Name="BuildHelixWorkItem"
-- 
cgit v1.2.3