From 5e5c542f75a33c0fb8b0ce50f6d66a310bf37ee7 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 12 Nov 2022 20:29:49 -0800
Subject: Parallelize building test code

---
 src/test/burn/TestData/TestData.proj | 12 ++----------
 src/test/burn/test_burn.cmd          |  4 ++--
 src/test/msi/TestData/TestData.proj  | 12 ++----------
 src/test/wix/WixE2E/WixE2EFixture.cs |  4 ++--
 4 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'src/test')

diff --git a/src/test/burn/TestData/TestData.proj b/src/test/burn/TestData/TestData.proj
index 9e130987..6eeb18fd 100644
--- a/src/test/burn/TestData/TestData.proj
+++ b/src/test/burn/TestData/TestData.proj
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <TestDataProject Include="**\*.wixproj" />
+    <ProjectReference Include="**\*.wixproj" />
   </ItemGroup>
-
-  <Target Name="Build">
-    <MSBuild Projects="%(TestDataProject.Identity)" />
-  </Target>
-
-  <Target Name="Restore">
-    <MSBuild Projects="%(TestDataProject.Identity)" Targets="Restore" />
-  </Target>
 </Project>
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd
index 311a6b32..4d005da2 100644
--- a/src/test/burn/test_burn.cmd
+++ b/src/test/burn/test_burn.cmd
@@ -13,8 +13,8 @@
 
 @echo Burn integration tests %_C%
 
-msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
-msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b
+msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
+msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b
 
 "%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe"
 mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe"
diff --git a/src/test/msi/TestData/TestData.proj b/src/test/msi/TestData/TestData.proj
index 9e130987..6eeb18fd 100644
--- a/src/test/msi/TestData/TestData.proj
+++ b/src/test/msi/TestData/TestData.proj
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <TestDataProject Include="**\*.wixproj" />
+    <ProjectReference Include="**\*.wixproj" />
   </ItemGroup>
-
-  <Target Name="Build">
-    <MSBuild Projects="%(TestDataProject.Identity)" />
-  </Target>
-
-  <Target Name="Restore">
-    <MSBuild Projects="%(TestDataProject.Identity)" Targets="Restore" />
-  </Target>
 </Project>
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index 88902206..f9094fb2 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -211,9 +211,9 @@ namespace WixE2E
             }
         }
 
-        private static MsbuildRunnerResult RestoreAndBuild(string projectPath, bool x64 = true)
+        private static MsbuildRunnerResult RestoreAndBuild(string projectPath, bool x64 = true, bool suppressValidation = true)
         {
-            return MsbuildRunner.Execute(projectPath, new[] { "-Restore", "-v:m", "-bl" }, x64);
+            return MsbuildRunner.Execute(projectPath, new[] { "-Restore", "-v:m", "-bl", $"-p:SuppressValidation={suppressValidation}" }, x64);
         }
     }
 }
-- 
cgit v1.2.3-55-g6feb