aboutsummaryrefslogtreecommitdiff
path: root/src/dtf
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-12-21 12:44:27 -0800
committerRob Mensching <rob@firegiant.com>2021-12-30 08:15:54 -0800
commit4cd4828e6225a2ff5e81002a7f6f7401570b21c4 (patch)
tree54acd62489f52661881372b6d22bf6e670017ef2 /src/dtf
parent6d431a1488f770a0c2c753e2e3744fbb8d3eee0b (diff)
downloadwix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.gz
wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.bz2
wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.zip
Build simplification and parallelization
Diffstat (limited to 'src/dtf')
-rw-r--r--src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj4
-rw-r--r--src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj4
-rw-r--r--src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj4
-rw-r--r--src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj4
-rw-r--r--src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj4
-rw-r--r--src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj4
-rw-r--r--src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj4
-rw-r--r--src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj7
-rw-r--r--src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj7
-rw-r--r--src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj7
-rw-r--r--src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj7
-rw-r--r--src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj7
-rw-r--r--src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj7
-rw-r--r--src/dtf/dtf.cmd14
14 files changed, 13 insertions, 71 deletions
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
index bacfd90c..08a88b30 100644
--- a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
@@ -18,8 +18,4 @@
18 <ItemGroup> 18 <ItemGroup>
19 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> 19 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
20 </ItemGroup> 20 </ItemGroup>
21
22 <ItemGroup>
23 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
24 </ItemGroup>
25</Project> 21</Project>
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
index 476b63b0..aa97019d 100644
--- a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
@@ -13,8 +13,4 @@
13 <ItemGroup> 13 <ItemGroup>
14 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> 14 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
15 </ItemGroup> 15 </ItemGroup>
16
17 <ItemGroup>
18 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 </ItemGroup>
20</Project> 16</Project>
diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
index c3d36d29..907e7a04 100644
--- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
+++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
@@ -13,8 +13,4 @@
13 <ItemGroup> 13 <ItemGroup>
14 <None Include="Compression.cd" /> 14 <None Include="Compression.cd" />
15 </ItemGroup> 15 </ItemGroup>
16
17 <ItemGroup>
18 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 </ItemGroup>
20</Project> 16</Project>
diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
index 411457a6..89bff841 100644
--- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
+++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
@@ -9,8 +9,4 @@
9 <Description>Classes for reading and writing resource data in executable files</Description> 9 <Description>Classes for reading and writing resource data in executable files</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile> 10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup> 11 </PropertyGroup>
12
13 <ItemGroup>
14 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
15 </ItemGroup>
16</Project> 12</Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
index 7aa376bb..fbc85880 100644
--- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
@@ -13,8 +13,4 @@
13 <ItemGroup> 13 <ItemGroup>
14 <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" /> 14 <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
15 </ItemGroup> 15 </ItemGroup>
16
17 <ItemGroup>
18 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 </ItemGroup>
20</Project> 16</Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
index 9e0b1a40..b3952177 100644
--- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
@@ -15,8 +15,4 @@
15 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" /> 15 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
16 <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" /> 16 <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
17 </ItemGroup> 17 </ItemGroup>
18
19 <ItemGroup>
20 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
21 </ItemGroup>
22</Project> 18</Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
index 324a7eed..117a4114 100644
--- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
@@ -22,8 +22,4 @@
22 <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> 22 <ItemGroup Condition=" '$(TargetFramework)'=='net20' ">
23 <Reference Include="System.Configuration" /> 23 <Reference Include="System.Configuration" />
24 </ItemGroup> 24 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
28 </ItemGroup>
29</Project> 25</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
index 9cd09e12..e751d405 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
+++ b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
@@ -38,9 +38,6 @@
38 </ProjectReference> 38 </ProjectReference>
39 </ItemGroup> 39 </ItemGroup>
40 40
41 <ItemGroup>
42 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
43 </ItemGroup>
44
45 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 41 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
46</Project> \ No newline at end of file 42 <Target Name="Pack" DependsOnTargets="Build" />
43</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
index 4c7e48dc..6ee102ae 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
+++ b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
@@ -36,9 +36,6 @@
36 </ProjectReference> 36 </ProjectReference>
37 </ItemGroup> 37 </ItemGroup>
38 38
39 <ItemGroup>
40 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
41 </ItemGroup>
42
43 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 39 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
44</Project> \ No newline at end of file 40 <Target Name="Pack" DependsOnTargets="Build" />
41</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
index 9ca24363..194628a7 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
+++ b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
@@ -31,9 +31,6 @@
31 </ProjectReference> 31 </ProjectReference>
32 </ItemGroup> 32 </ItemGroup>
33 33
34 <ItemGroup>
35 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
36 </ItemGroup>
37
38 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 34 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
39</Project> \ No newline at end of file 35 <Target Name="Pack" DependsOnTargets="Build" />
36</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
index aa3389d9..27e0b499 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
@@ -27,9 +27,6 @@
27 </ProjectReference> 27 </ProjectReference>
28 </ItemGroup> 28 </ItemGroup>
29 29
30 <ItemGroup>
31 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
32 </ItemGroup>
33
34 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 30 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
35</Project> \ No newline at end of file 31 <Target Name="Pack" DependsOnTargets="Build" />
32</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
index db3923aa..a59e64d4 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
@@ -37,9 +37,6 @@
37 </ProjectReference> 37 </ProjectReference>
38 </ItemGroup> 38 </ItemGroup>
39 39
40 <ItemGroup>
41 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
42 </ItemGroup>
43
44 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 40 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
45</Project> \ No newline at end of file 41 <Target Name="Pack" DependsOnTargets="Build" />
42</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
index d9aeae3b..0d2a50fb 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
@@ -34,9 +34,6 @@
34 </ProjectReference> 34 </ProjectReference>
35 </ItemGroup> 35 </ItemGroup>
36 36
37 <ItemGroup>
38 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
39 </ItemGroup>
40
41 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 37 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
42</Project> \ No newline at end of file 38 <Target Name="Pack" DependsOnTargets="Build" />
39</Project>
diff --git a/src/dtf/dtf.cmd b/src/dtf/dtf.cmd
index 21f452cb..13f97ff0 100644
--- a/src/dtf/dtf.cmd
+++ b/src/dtf/dtf.cmd
@@ -8,19 +8,7 @@
8 8
9@echo Building dtf %_C% 9@echo Building dtf %_C%
10 10
11:: dtf 11msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\dtf_build.binlog|| exit /b
12
13nuget restore || exit /b
14
15msbuild -t:Build -p:Configuration=%_C% -m -v:m -nr:false || exit /b
16
17msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression -v:m || exit /b
18msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Cab -v:m || exit /b
19msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Zip -v:m || exit /b
20msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Resources -v:m || exit /b
21msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller -v:m || exit /b
22msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Linq -v:m || exit /b
23msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Package -v:m || exit /b
24 12
25@popd 13@popd
26@endlocal 14@endlocal
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 23:56:10 +0000