Build simplification and parallelization

5 files changed, 15 insertions, 15 deletions

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_t.proj
index 49bd2876..46ccf8b2 100644
--- a/src/api/burn/burn.proj
+++ b/src/api/burn/burn_t.proj
@@ -1,7 +1,7 @@
 <?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">
+<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" />
diff --git a/src/api/wix/wix.proj b/src/api/wix/wix_t.proj
index ea07e810..174b8b0e 100644
--- a/src/api/wix/wix.proj
+++ b/src/api/wix/wix_t.proj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.Traversal/3.0.23">
+<Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
     <!-- Build -->
     <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />