4 files changed, 26 insertions, 67 deletions
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
+:: burn
-:: build
-:: pack
+nuget restore burn\api_burn.sln || exit /b
-msbuild -m -p:Configuration=%_C% api.proj || 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>

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 @@
8		8
9	@echo Building api %_C%	9	@echo Building api %_C%
10		10
11	:: restore	11	:: burn
12	:: build	12
13	:: pack	13	nuget restore burn\api_burn.sln \|\| exit /b
14	msbuild -m -p:Configuration=%_C% api.proj \|\| exit /b	14
		15	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 burn\api_burn.sln \|\| exit /b
		16	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 burn\api_burn.sln \|\| exit /b
		17	msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 burn\api_burn.sln \|\| exit /b
		18
		19	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 burn\api_burn.sln \|\| exit /b
		20	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 burn\api_burn.sln \|\| exit /b
		21	msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 burn\api_burn.sln \|\| exit /b
		22
		23	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 burn\api_burn.sln \|\| exit /b
		24	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 burn\api_burn.sln \|\| exit /b
15		25
16	:: test
17	dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj \|\| exit /b	26	dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj \|\| exit /b
		27
		28	msbuild -t:PackNative -p:Configuration=%_C% burn\balutil\balutil.vcxproj \|\| exit /b
		29	msbuild -t:PackNative -p:Configuration=%_C% burn\bextutil\bextutil.vcxproj \|\| exit /b
		30	msbuild -t:PackNative -Restore -p:Configuration=%_C% burn\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj \|\| exit /b
		31	msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj \|\| exit /b
		32
		33
		34	:: wix
		35
		36	msbuild -Restore -p:Configuration=%_C% wix\api_wix.sln \|\| exit /b
		37
18	dotnet test -c %_C% --no-build wix\api_wix.sln \|\| exit /b	38	dotnet test -c %_C% --no-build wix\api_wix.sln \|\| exit /b
19		39
		40	msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wix\api_wix.sln \|\| exit /b
20		41
21	@popd	42	@popd
22	@endlocal	43	@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 @@
1	<Project Sdk="Microsoft.Build.Traversal/3.0.23">
2	<ItemGroup>
3	<ProjectReference Include="burn\burn.proj" Targets="Restore" BuildInParallel="false" />
4	<ProjectReference Include="wix\wix.proj" Targets="Restore" BuildInParallel="false" />
5
6	<ProjectReference Include="burn\burn.proj" />
7	<ProjectReference Include="wix\wix.proj" />
8	</ItemGroup>
9	</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 @@
1	<Project Sdk="Microsoft.Build.Traversal/3.0.23">
2	<ItemGroup>
3	<!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
4	<ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
5	<ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
6
7	<!-- Build -->
8
9	<!-- Let bextutil build balutil. -->
10	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
11	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
12	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
13	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
14	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
15	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" />
16	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
17	<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
18
19	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
20	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
21	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
22	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
23	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
24	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" />
25	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" />
26	<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" />
27
28	<ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=x86" />
29	<ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=x64" />
30	<ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=ARM64" />
31
32	<!-- Test -->
33	<ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Test" />
34	<ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Test" />
35
36	<!-- Pack -->
37	<ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" />
38	<ProjectReference Include="bextutil\bextutil.vcxproj" Targets="PackNative" />
39	<ProjectReference Include="WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj" Targets="Restore;PackNative" />
40	<ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="NoBuild=true" Targets="Pack" />
41	</ItemGroup>
42	</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 @@
1	<Project Sdk="Microsoft.Build.Traversal/3.0.23">
2	<ItemGroup>
3	<!-- Build -->
4	<ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
5	<ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
6
7	<!-- Pack -->
8	<ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" />
9	<ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" Targets="Pack" />
10	</ItemGroup>
11	</Project>