aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libs/dutil/dutil.proj18
-rw-r--r--src/libs/libs.cmd33
-rw-r--r--src/libs/libs.proj6
-rw-r--r--src/libs/wcautil/wcautil.proj16
4 files changed, 41 insertions, 32 deletions
diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil.proj
new file mode 100644
index 00000000..9f4d884d
--- /dev/null
+++ b/src/libs/dutil/dutil.proj
@@ -0,0 +1,18 @@
1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
4 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
5
6 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
7 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
8 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
9
10 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
11 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
12 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
13
14 <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" />
15
16 <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Targets="PackNative" />
17 </ItemGroup>
18</Project>
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd
index 544c4b32..affb72b1 100644
--- a/src/libs/libs.cmd
+++ b/src/libs/libs.cmd
@@ -12,38 +12,7 @@
12 12
13nuget restore || exit /b 13nuget restore || exit /b
14 14
15:: dutil 15msbuild -m -p:Configuration=%_C% libs.proj || exit /b
16
17msbuild -t:Test -p:Configuration=%_C% dutil\test\DUtilUnitTest || exit /b
18
19msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
20msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
21msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
22
23msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
24msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
25msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
26
27msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
28msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
29
30msbuild -p:Configuration=%_C% -t:PackNative dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
31
32
33:: wcautil
34
35msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
36msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
37msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
38
39msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
40msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
41msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
42
43msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
44msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
45
46msbuild -t:PackNative -p:Configuration=%_C% wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
47 16
48@popd 17@popd
49@endlocal 18@endlocal
diff --git a/src/libs/libs.proj b/src/libs/libs.proj
new file mode 100644
index 00000000..e1291af7
--- /dev/null
+++ b/src/libs/libs.proj
@@ -0,0 +1,6 @@
1<Project Sdk="Microsoft.Build.Traversal/3.0.23">
2 <ItemGroup>
3 <ProjectReference Include="dutil\dutil.proj" />
4 <ProjectReference Include="wcautil\wcautil.proj" />
5 </ItemGroup>
6</Project>
diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil.proj
new file mode 100644
index 00000000..839c63a4
--- /dev/null
+++ b/src/libs/wcautil/wcautil.proj
@@ -0,0 +1,16 @@
1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
4 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
5
6 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
7 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
8 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
9
10 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
11 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
12 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
13
14 <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" />
15 </ItemGroup>
16</Project>