From b452e816019d35aba71693bfc8826a8a52df457c Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 12 Jul 2021 12:20:55 -0400
Subject: Revert "Build api segment via traversal projects."

This reverts commit 250b850f52253a101ddc4857cb6a2e66b0b37739.
---
 src/api/api.cmd        | 31 ++++++++++++++++++++++++++-----
 src/api/api.proj       |  9 ---------
 src/api/burn/burn.proj | 42 ------------------------------------------
 src/api/wix/wix.proj   | 11 -----------
 4 files changed, 26 insertions(+), 67 deletions(-)
 delete mode 100644 src/api/api.proj
 delete mode 100644 src/api/burn/burn.proj
 delete mode 100644 src/api/wix/wix.proj

diff --git a/src/api/api.cmd b/src/api/api.cmd
index 75303ea2..db8d5183 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -8,15 +8,36 @@
 
 @echo Building api %_C%
 
-:: restore
-:: build
-:: pack
-msbuild -m -p:Configuration=%_C% api.proj || exit /b
+:: 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
 
-:: 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
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/burn/burn.proj b/src/api/burn/burn.proj
deleted file mode 100644
index 8dca9ac6..00000000
--- a/src/api/burn/burn.proj
+++ /dev/null
@@ -1,42 +0,0 @@
-<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=x86" />
-    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=x64" />
-    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=ARM64" />
-
-    <!-- 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 3db83283..00000000
--- a/src/api/wix/wix.proj
+++ /dev/null
@@ -1,11 +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" />
-
-    <!-- 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