From 4cd4828e6225a2ff5e81002a7f6f7401570b21c4 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 21 Dec 2021 12:44:27 -0800
Subject: Build simplification and parallelization

---
 src/api/api.cmd          |  8 ++++----
 src/api/api.proj         |  9 ---------
 src/api/api_t.proj       |  9 +++++++++
 src/api/burn/burn.proj   | 34 ----------------------------------
 src/api/burn/burn_t.proj | 34 ++++++++++++++++++++++++++++++++++
 src/api/wix/wix.proj     | 12 ------------
 src/api/wix/wix_t.proj   | 12 ++++++++++++
 7 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 src/api/api.proj
 create mode 100644 src/api/api_t.proj
 delete mode 100644 src/api/burn/burn.proj
 create mode 100644 src/api/burn/burn_t.proj
 delete mode 100644 src/api/wix/wix.proj
 create mode 100644 src/api/wix/wix_t.proj

(limited to 'src/api')

diff --git a/src/api/api.cmd b/src/api/api.cmd
index 75303ea2..7a4bbb43 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -11,12 +11,12 @@
 :: restore
 :: build
 :: pack
-msbuild -m -p:Configuration=%_C% api.proj || exit /b
 
-:: test
-dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
-dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b
+msbuild api_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\api_build.binlog || exit /b
 
+:: test
+dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b
+dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b
 
 @popd
 @endlocal
diff --git a/src/api/api.proj b/src/api/api.proj
deleted file mode 100644
index 6d7a4188..00000000
--- a/src/api/api.proj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal/3.0.23">
-  <ItemGroup>
-    <ProjectReference Include="burn\burn.proj" Targets="Restore" BuildInParallel="false" />
-    <ProjectReference Include="wix\wix.proj" Targets="Restore" BuildInParallel="false" />
-
-    <ProjectReference Include="burn\burn.proj" />
-    <ProjectReference Include="wix\wix.proj" />
-  </ItemGroup>
-</Project>
diff --git a/src/api/api_t.proj b/src/api/api_t.proj
new file mode 100644
index 00000000..d89feccf
--- /dev/null
+++ b/src/api/api_t.proj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="burn\burn_t.proj" Targets="Restore" BuildInParallel="false" />
+    <ProjectReference Include="wix\wix_t.proj" Targets="Restore" BuildInParallel="false" />
+
+    <ProjectReference Include="burn\burn_t.proj" />
+    <ProjectReference Include="wix\wix_t.proj" />
+  </ItemGroup>
+</Project>
diff --git a/src/api/burn/burn.proj b/src/api/burn/burn.proj
deleted file mode 100644
index 49bd2876..00000000
--- a/src/api/burn/burn.proj
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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 Sdk="Microsoft.Build.Traversal/3.0.23">
-  <ItemGroup>
-    <!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
-    <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
-    <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
-
-    <!-- Build -->
-
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
-
-    <!-- Let mbanative build balutil for latest toolset. -->
-    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" />
-    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" />
-
-    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" />
-    <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" />
-
-    <!-- Test -->
-    <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Test" />
-    <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Test" />
-
-    <!-- Pack -->
-    <ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" />
-    <ProjectReference Include="bextutil\bextutil.vcxproj" Targets="PackNative" />
-    <ProjectReference Include="WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj" Targets="Restore;PackNative" />
-    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="NoBuild=true" Targets="Pack" />
-  </ItemGroup>
-</Project>
diff --git a/src/api/burn/burn_t.proj b/src/api/burn/burn_t.proj
new file mode 100644
index 00000000..46ccf8b2
--- /dev/null
+++ b/src/api/burn/burn_t.proj
@@ -0,0 +1,34 @@
+<?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 Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
+    <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
+    <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
+
+    <!-- Build -->
+
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
+
+    <!-- Let mbanative build balutil for latest toolset. -->
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" />
+
+    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" />
+    <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" />
+
+    <!-- Test -->
+    <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Test" />
+    <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Test" />
+
+    <!-- Pack -->
+    <ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Targets="PackNative" />
+    <ProjectReference Include="WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj" Targets="Restore;PackNative" />
+    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="NoBuild=true" Targets="Pack" />
+  </ItemGroup>
+</Project>
diff --git a/src/api/wix/wix.proj b/src/api/wix/wix.proj
deleted file mode 100644
index ea07e810..00000000
--- a/src/api/wix/wix.proj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal/3.0.23">
-  <ItemGroup>
-    <!-- Build -->
-    <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
-    <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
-    <ProjectReference Include="test\WixToolsetTest.Data\WixToolsetTest.Data.csproj" />
-
-    <!-- Pack -->
-    <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" />
-    <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" Targets="Pack" />
-  </ItemGroup>
-</Project>
diff --git a/src/api/wix/wix_t.proj b/src/api/wix/wix_t.proj
new file mode 100644
index 00000000..174b8b0e
--- /dev/null
+++ b/src/api/wix/wix_t.proj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <!-- Build -->
+    <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
+    <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
+    <ProjectReference Include="test\WixToolsetTest.Data\WixToolsetTest.Data.csproj" />
+
+    <!-- Pack -->
+    <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" />
+    <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" Targets="Pack" />
+  </ItemGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb