From 5b2b06c9bffb4e6f17409cec41bc0b4b8dab4c90 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 11 Jul 2021 17:16:48 -0400
Subject: Build api segment via traversal projects.

79s -> 21s on my octocore machine.
---
 src/api/api.cmd                     | 31 +++++-----------------------
 src/api/api.proj                    |  9 +++++++++
 src/api/burn/balutil/balutil.nuspec |  4 ++--
 src/api/burn/burn.proj              | 40 +++++++++++++++++++++++++++++++++++++
 src/api/wix/wix.proj                | 11 ++++++++++
 5 files changed, 67 insertions(+), 28 deletions(-)
 create mode 100644 src/api/api.proj
 create mode 100644 src/api/burn/burn.proj
 create mode 100644 src/api/wix/wix.proj

diff --git a/src/api/api.cmd b/src/api/api.cmd
index db8d5183..75303ea2 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -8,36 +8,15 @@
 
 @echo Building api %_C%
 
-:: burn
-
-nuget restore burn\api_burn.sln || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 burn\api_burn.sln || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 burn\api_burn.sln || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 burn\api_burn.sln || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 burn\api_burn.sln || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 burn\api_burn.sln || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 burn\api_burn.sln || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 burn\api_burn.sln || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 burn\api_burn.sln || exit /b
+:: 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
-
-msbuild -t:PackNative -p:Configuration=%_C% burn\balutil\balutil.vcxproj || exit /b
-msbuild -t:PackNative -p:Configuration=%_C% burn\bextutil\bextutil.vcxproj || exit /b
-msbuild -t:PackNative -Restore -p:Configuration=%_C% burn\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b
-msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b
-
-
-:: wix
-
-msbuild -Restore -p:Configuration=%_C% wix\api_wix.sln || exit /b
-
 dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b
 
-msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wix\api_wix.sln || exit /b
 
 @popd
 @endlocal
diff --git a/src/api/api.proj b/src/api/api.proj
new file mode 100644
index 00000000..6d7a4188
--- /dev/null
+++ b/src/api/api.proj
@@ -0,0 +1,9 @@
+<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/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
index 82509140..2474b2ea 100644
--- a/src/api/burn/balutil/balutil.nuspec
+++ b/src/api/burn/balutil/balutil.nuspec
@@ -20,11 +20,11 @@
   <files>
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <!-- <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" />
     <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" />
     <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" />
     <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" />
-    <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> -->
+    <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />
     <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" />
     <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" />
     <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
diff --git a/src/api/burn/burn.proj b/src/api/burn/burn.proj
new file mode 100644
index 00000000..6020efa2
--- /dev/null
+++ b/src/api/burn/burn.proj
@@ -0,0 +1,40 @@
+<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 -->
+
+    <!-- Let bextutil build balutil. -->
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
+    
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
+    <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
+    <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" />
+
+    <!-- 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
new file mode 100644
index 00000000..3db83283
--- /dev/null
+++ b/src/api/wix/wix.proj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.Build.Traversal/3.0.23">
+  <ItemGroup>
+    <!-- Build -->
+    <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
+    <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.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