aboutsummaryrefslogtreecommitdiff
path: root/src
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
parent6d431a1488f770a0c2c753e2e3744fbb8d3eee0b (diff)
downloadwix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.gz
wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.bz2
wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.zip
Build simplification and parallelization
Diffstat (limited to 'src')
-rw-r--r--src/Directory.Build.rsp4
-rw-r--r--src/api/api.cmd8
-rw-r--r--src/api/api.proj9
-rw-r--r--src/api/api_t.proj9
-rw-r--r--src/api/burn/burn_t.proj (renamed from src/api/burn/burn.proj)2
-rw-r--r--src/api/wix/wix_t.proj (renamed from src/api/wix/wix.proj)2
-rw-r--r--src/build_init.cmd2
-rw-r--r--src/burn/burn.cmd8
-rw-r--r--src/burn/burn_t.proj11
-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
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp4
-rw-r--r--src/internal/SetBuildNumber/global.json.pp1
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj3
-rw-r--r--src/internal/internal.cmd5
-rw-r--r--src/internal/internal.sln2
-rw-r--r--src/libs/dutil/dutil_t.proj (renamed from src/libs/dutil/dutil.proj)0
-rw-r--r--src/libs/libs.cmd8
-rw-r--r--src/libs/libs.proj6
-rw-r--r--src/libs/libs_t.proj6
-rw-r--r--src/libs/wcautil/wcautil_t.proj (renamed from src/libs/wcautil/wcautil.proj)0
-rw-r--r--src/samples/samples.cmd2
-rw-r--r--src/test/burn/test_burn.cmd4
-rw-r--r--src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj7
-rw-r--r--src/wix/heat/heat.csproj4
-rw-r--r--src/wix/pack_t.proj16
-rw-r--r--src/wix/publish_t.proj17
-rw-r--r--src/wix/wix.cmd56
-rw-r--r--src/wix/wix/wix.csproj4
41 files changed, 117 insertions, 167 deletions
diff --git a/src/Directory.Build.rsp b/src/Directory.Build.rsp
new file mode 100644
index 00000000..e303021c
--- /dev/null
+++ b/src/Directory.Build.rsp
@@ -0,0 +1,4 @@
1-nologo
2-nr:false
3-v:m
4
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 @@
11:: restore 11:: restore
12:: build 12:: build
13:: pack 13:: pack
14msbuild -m -p:Configuration=%_C% api.proj || exit /b
15 14
16:: test 15msbuild api_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\api_build.binlog || exit /b
17dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
18dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b
19 16
17:: test
18dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b
19dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b
20 20
21@popd 21@popd
22@endlocal 22@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/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 @@
1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 <ProjectReference Include="burn\burn_t.proj" Targets="Restore" BuildInParallel="false" />
4 <ProjectReference Include="wix\wix_t.proj" Targets="Restore" BuildInParallel="false" />
5
6 <ProjectReference Include="burn\burn_t.proj" />
7 <ProjectReference Include="wix\wix_t.proj" />
8 </ItemGroup>
9</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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. --> 2<!-- 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. -->
3 3
4<Project Sdk="Microsoft.Build.Traversal/3.0.23"> 4<Project Sdk="Microsoft.Build.Traversal">
5 <ItemGroup> 5 <ItemGroup>
6 <!-- Restore: Explicitly restore the test projects, which need some hand-holding. --> 6 <!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
7 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" /> 7 <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 @@
1<Project Sdk="Microsoft.Build.Traversal/3.0.23"> 1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup> 2 <ItemGroup>
3 <!-- Build --> 3 <!-- Build -->
4 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" /> 4 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
diff --git a/src/build_init.cmd b/src/build_init.cmd
index 2c2c48f3..895af357 100644
--- a/src/build_init.cmd
+++ b/src/build_init.cmd
@@ -3,7 +3,7 @@
3 3
4md ..\build\artifacts 4md ..\build\artifacts
5 5
6msbuild -Restore -v:m internal\SetBuildNumber\SetBuildNumber.proj 6msbuild -Restore internal\SetBuildNumber\SetBuildNumber.proj -nologo
7 7
8@popd 8@popd
9@endlocal 9@endlocal
diff --git a/src/burn/burn.cmd b/src/burn/burn.cmd
index 10d56558..8c5010b5 100644
--- a/src/burn/burn.cmd
+++ b/src/burn/burn.cmd
@@ -12,13 +12,7 @@
12 12
13nuget restore || exit /b 13nuget restore || exit /b
14 14
15msbuild -t:Test -p:Configuration=%_C%;Platform=x86 test\BurnUnitTest || exit /b 15msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\burn_build.binlog || exit /b
16
17msbuild -t:Build -p:Configuration=%_C%;Platform=x86 || exit /b
18msbuild -t:Build -p:Configuration=%_C%;Platform=x64 || exit /b
19msbuild -t:Build -p:Configuration=%_C%;Platform=arm64 || exit /b
20
21msbuild -t:PackNative -p:Configuration=%_C% stub\stub.vcxproj || exit /b
22 16
23@popd 17@popd
24@endlocal 18@endlocal
diff --git a/src/burn/burn_t.proj b/src/burn/burn_t.proj
new file mode 100644
index 00000000..0eed26ed
--- /dev/null
+++ b/src/burn/burn_t.proj
@@ -0,0 +1,11 @@
1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 <ProjectReference Include="test\BurnUnitTest\BurnUnitTest.vcxproj" Targets="Test" />
4
5 <ProjectReference Include="burn.sln" Properties="Platform=x86" />
6 <ProjectReference Include="burn.sln" Properties="Platform=x64" />
7 <ProjectReference Include="burn.sln" Properties="Platform=ARM64" />
8
9 <ProjectReference Include="stub\stub.vcxproj" Targets="PackNative" />
10 </ItemGroup>
11</Project>
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
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index ff73265c..4743fb2e 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -50,11 +50,11 @@
50 <PackageVersion Include="NuGet.Versioning" Version="5.6.0" /> 50 <PackageVersion Include="NuGet.Versioning" Version="5.6.0" />
51 </ItemGroup> 51 </ItemGroup>
52 52
53 <ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" > 53 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" >
54 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/> 54 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/>
55 </ItemGroup> 55 </ItemGroup>
56 56
57 <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netcoreapp3.1'"> 57 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
58 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> 58 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
59 </ItemGroup> 59 </ItemGroup>
60 60
diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp
index a1d6244a..5907efb0 100644
--- a/src/internal/SetBuildNumber/global.json.pp
+++ b/src/internal/SetBuildNumber/global.json.pp
@@ -1,5 +1,6 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "Microsoft.Build.Traversal": "3.0.23",
3 "WixToolset.Sdk": "{packageversion}" 4 "WixToolset.Sdk": "{packageversion}"
4 }, 5 },
5 "sdk": { 6 "sdk": {
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
index d030f67b..282aa306 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
@@ -58,7 +58,8 @@
58 <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project> 58 <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project>
59 </ProjectReference> 59 </ProjectReference>
60 </ItemGroup> 60 </ItemGroup>
61 61
62 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 62 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
63 <Import Project="build\WixBuildTools.TestSupport.Native.targets" /> 63 <Import Project="build\WixBuildTools.TestSupport.Native.targets" />
64 <Target Name="Pack" DependsOnTargets="Build" />
64</Project> 65</Project>
diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd
index 634ed5fb..ef465daa 100644
--- a/src/internal/internal.cmd
+++ b/src/internal/internal.cmd
@@ -9,15 +9,14 @@
9@echo Building internal %_C% 9@echo Building internal %_C%
10 10
11:: internal 11:: internal
12
13nuget restore || exit /b 12nuget restore || exit /b
14 13
15:: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b 14:: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
16:: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b 15:: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
17 16
18msbuild -t:Pack -p:Configuration=%_C% WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -v:m || exit /b 17msbuild -t:Pack WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -p:Configuration=%_C% -nologo || exit /b
19 18
20msbuild -t:Build -p:Configuration=%_C% WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -v:m || exit /b 19msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C% -nologo || exit /b
21 20
22@popd 21@popd
23@endlocal 22@endlocal
diff --git a/src/internal/internal.sln b/src/internal/internal.sln
index ae53cc53..9d4fe69f 100644
--- a/src/internal/internal.sln
+++ b/src/internal/internal.sln
@@ -36,11 +36,13 @@ Global
36 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.ActiveCfg = Release|Any CPU 36 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.ActiveCfg = Release|Any CPU
37 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.Build.0 = Release|Any CPU 37 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.Build.0 = Release|Any CPU
38 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32 38 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32
39 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.Build.0 = Debug|Win32
39 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|ARM64.ActiveCfg = Debug|Win32 40 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|ARM64.ActiveCfg = Debug|Win32
40 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32 41 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32
41 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32 42 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32
42 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32 43 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32
43 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32 44 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32
45 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.Build.0 = Release|Win32
44 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|ARM64.ActiveCfg = Release|Win32 46 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|ARM64.ActiveCfg = Release|Win32
45 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32 47 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32
46 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32 48 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32
diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil_t.proj
index 90d66440..90d66440 100644
--- a/src/libs/dutil/dutil.proj
+++ b/src/libs/dutil/dutil_t.proj
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd
index affb72b1..ddc2e1d6 100644
--- a/src/libs/libs.cmd
+++ b/src/libs/libs.cmd
@@ -6,13 +6,9 @@
6@if /i "%1"=="release" set _C=Release 6@if /i "%1"=="release" set _C=Release
7@if not "%1"=="" shift & goto parse_args 7@if not "%1"=="" shift & goto parse_args
8 8
9@echo Building libs %_C% using %_N% 9@echo Building libs %_C%
10 10
11:: libs 11msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\libs_build.binlog || exit /b
12
13nuget restore || exit /b
14
15msbuild -m -p:Configuration=%_C% libs.proj || exit /b
16 12
17@popd 13@popd
18@endlocal 14@endlocal
diff --git a/src/libs/libs.proj b/src/libs/libs.proj
deleted file mode 100644
index e1291af7..00000000
--- a/src/libs/libs.proj
+++ /dev/null
@@ -1,6 +0,0 @@
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/libs_t.proj b/src/libs/libs_t.proj
new file mode 100644
index 00000000..8c35f1c3
--- /dev/null
+++ b/src/libs/libs_t.proj
@@ -0,0 +1,6 @@
1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 <ProjectReference Include="dutil\dutil_t.proj" />
4 <ProjectReference Include="wcautil\wcautil_t.proj" />
5 </ItemGroup>
6</Project>
diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil_t.proj
index ae0ebc08..ae0ebc08 100644
--- a/src/libs/wcautil/wcautil.proj
+++ b/src/libs/wcautil/wcautil_t.proj
diff --git a/src/samples/samples.cmd b/src/samples/samples.cmd
index 8ce4ffe0..62886301 100644
--- a/src/samples/samples.cmd
+++ b/src/samples/samples.cmd
@@ -12,7 +12,7 @@
12 12
13nuget restore || exit /b 13nuget restore || exit /b
14 14
15msbuild -t:Build -p:Configuration=%_C% || exit /b 15msbuild -t:Build -p:Configuration=%_C% -bl:..\..\samples_build.binlog || exit /b
16 16
17@popd 17@popd
18@endlocal 18@endlocal
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd
index 5014fb73..7caf1cc8 100644
--- a/src/test/burn/test_burn.cmd
+++ b/src/test/burn/test_burn.cmd
@@ -10,8 +10,8 @@
10 10
11@echo Burn integration tests %_C% 11@echo Burn integration tests %_C%
12 12
13msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror || exit /b 13msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:..\..\..\build\logs\test_burn_build.binlog || exit /b
14msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj || exit /b 14msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj -bl:..\..\..\build\logs\test_burn_data_build.binlog || exit /b
15 15
16@if not "%RuntimeTestsEnabled%"=="true" goto :LExit 16@if not "%RuntimeTestsEnabled%"=="true" goto :LExit
17 17
diff --git a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index c8fc64c3..b35e68d2 100644
--- a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -17,15 +17,12 @@
17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" /> 17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
18 </ItemGroup> 18 </ItemGroup>
19 19
20 <ItemGroup Condition="'$(TargetFramework)'=='net472'"> 20 <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" >
21 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> 21 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
22 <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" /> 22 <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
23 <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" /> 23 <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
24 <PackageReference Include="Microsoft.Build.Tasks.Core" />
25 </ItemGroup>
26 24
27 <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'"> 25 <PackageReference Include="Microsoft.Build.Tasks.Core" />
28 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
29 </ItemGroup> 26 </ItemGroup>
30 27
31 <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' "> 28 <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' ">
diff --git a/src/wix/heat/heat.csproj b/src/wix/heat/heat.csproj
index 341a2083..88fd2eb0 100644
--- a/src/wix/heat/heat.csproj
+++ b/src/wix/heat/heat.csproj
@@ -45,8 +45,4 @@
45 <PackageReference Include="System.Diagnostics.PerformanceCounter" /> 45 <PackageReference Include="System.Diagnostics.PerformanceCounter" />
46 <PackageReference Include="System.DirectoryServices" /> 46 <PackageReference Include="System.DirectoryServices" />
47 </ItemGroup> 47 </ItemGroup>
48
49 <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
50 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
51 </ItemGroup>
52</Project> 48</Project>
diff --git a/src/wix/pack_t.proj b/src/wix/pack_t.proj
new file mode 100644
index 00000000..796eb615
--- /dev/null
+++ b/src/wix/pack_t.proj
@@ -0,0 +1,16 @@
1<Project Sdk="Microsoft.Build.Traversal/3.0.23">
2 <ItemGroup>
3 <ProjectReference Include="pack-wix\pack-wix.csproj" Properties="NoBuild=true" Targets="Pack" />
4 <ProjectReference Include="WixToolset.Sdk\WixToolset.Sdk.csproj" Properties="NoBuild=true" Targets="Pack" />
5
6 <ProjectReference Include="WixToolset.Core.Native\WixToolset.Core.Native.csproj" Properties="NoBuild=true" Targets="Pack" />
7 <ProjectReference Include="WixToolset.Core\WixToolset.Core.csproj" Properties="NoBuild=true" Targets="Pack" />
8 <ProjectReference Include="WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" Properties="NoBuild=true" Targets="Pack" />
9 <ProjectReference Include="WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj" Properties="NoBuild=true" Targets="Pack" />
10 <ProjectReference Include="WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj" Properties="NoBuild=true" Targets="Pack" />
11 <ProjectReference Include="WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" Properties="NoBuild=true" Targets="Pack" />
12
13 <ProjectReference Include="WixToolset.Converters\WixToolset.Converters.csproj" Properties="NoBuild=true" Targets="Pack" />
14 <ProjectReference Include="WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj" Properties="NoBuild=true" Targets="Pack" />
15 </ItemGroup>
16</Project>
diff --git a/src/wix/publish_t.proj b/src/wix/publish_t.proj
new file mode 100644
index 00000000..e7585614
--- /dev/null
+++ b/src/wix/publish_t.proj
@@ -0,0 +1,17 @@
1<Project Sdk="Microsoft.Build.Traversal/3.0.23">
2 <ItemGroup>
3 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=netcoreapp3.1;PublishDir=$(BaseOutputPath)$(Configuration)\publish\wix\" Targets="Publish" />
4
5 <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\buildtasks\" Targets="Publish" />
6 <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\heat\" Targets="Publish" />
7 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\wix\" Targets="Publish" />
8
9 <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\buildtasks\" Targets="Publish" />
10 <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\heat\" Targets="Publish" />
11 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\wix\" Targets="Publish" />
12
13 <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\" Targets="Publish" />
14 <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\heat\" Targets="Publish" />
15 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\wix\" Targets="Publish" />
16 </ItemGroup>
17</Project>
diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd
index 11b5582f..14ba1eb1 100644
--- a/src/wix/wix.cmd
+++ b/src/wix/wix.cmd
@@ -6,82 +6,60 @@
6@if /i "%1"=="release" set _C=Release 6@if /i "%1"=="release" set _C=Release
7@if not "%1"=="" shift & goto parse_args 7@if not "%1"=="" shift & goto parse_args
8 8
9@set _P_OBJ=%~dp0..\..\build\wix\obj\publish\%_C%\ 9@set _P_OBJ=%~dp0..\..\build\wix\obj\publish_t\%_C%\
10@set _P=%~dp0..\..\build\wix\%_C%\publish\ 10@set _P=%~dp0..\..\build\wix\%_C%\publish\
11@set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS 11@set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS
12 12
13@echo Building wix %_C% 13@echo Building wix %_C%
14 14
15:: Restore 15:: Restore
16msbuild -t:Restore -p:Configuration=%_C% wix.sln || exit /b 16msbuild -t:Restore wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_restore.binlog || exit /b
17 17
18 18
19:: Build 19:: Build
20msbuild -p:Configuration=%_C% -p:Platform=x86 wixnative\wixnative.vcxproj || exit /b 20msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x86 || exit /b
21msbuild -p:Configuration=%_C% -p:Platform=x64 wixnative\wixnative.vcxproj || exit /b 21msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x64 || exit /b
22msbuild -p:Configuration=%_C% -p:Platform=ARM64 wixnative\wixnative.vcxproj || exit /b 22msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=ARM64 || exit /b
23 23
24msbuild -p:Configuration=%_C% || exit /b 24msbuild wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_build.binlog || exit /b
25 25
26 26
27:: Pre-Publish Test 27:: Pre-Publish Test
28 28dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Converters || exit /b
29dotnet test -c %_C% --no-build test\WixToolsetTest.Converters || exit /b 29dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Converters.Symbolizer || exit /b
30dotnet test -c %_C% --no-build test\WixToolsetTest.Converters.Symbolizer || exit /b 30dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Core.Burn || exit /b
31dotnet test -c %_C% --no-build test\WixToolsetTest.Core.Burn || exit /b 31dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Core.Native || exit /b
32dotnet test -c %_C% --no-build test\WixToolsetTest.Core.Native || exit /b 32dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.CoreIntegration || exit /b
33dotnet test -c %_C% --no-build test\WixToolsetTest.CoreIntegration || exit /b 33dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Heat || exit /b
34dotnet test -c %_C% --no-build test\WixToolsetTest.Heat || exit /b
35 34
36 35
37:: Publish 36:: Publish
38msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:PublishDir=%_P%wix\ wix\wix.csproj || exit /b 37msbuild publish_t.proj -p:Configuration=%_C% -nologo -bl:..\..\build\logs\wix_publish.binlog || exit /b
39 38
40msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
41msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\heat\ heat\heat.csproj || exit /b
42msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\wix\ wix\wix.csproj || exit /b
43robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll 39robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll
44robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% 40robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
45robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% 41robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
46 42
47msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
48msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\heat\ heat\heat.csproj || exit /b
49msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\wix\ wix\wix.csproj || exit /b
50robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll 43robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll
51robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\heat %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% 44robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\heat %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
52robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% 45robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
53 46
54msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
55msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\heat\ heat\heat.csproj || exit /b
56msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\wix\ wix\wix.csproj || exit /b
57robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll 47robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll
58robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% 48robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
59robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% 49robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
60 50
61msbuild -t:Publish -p:Configuration=%_C% -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b 51msbuild -t:Publish -p:Configuration=%_C% -v:m -nologo -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
62 52
63:: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test 53:: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
64:: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net472\ wix\wix.csproj || exit /b 54:: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net472\ wix\wix.csproj || exit /b
65 55
66 56
67:: Test 57:: Test
68dotnet test -c %_C% --no-build test\WixToolsetTest.BuildTasks || exit /b 58dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.BuildTasks || exit /b
69dotnet test -c %_C% --no-build test\WixToolsetTest.Sdk || exit /b 59dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Sdk || exit /b
70 60
71:: Pack 61:: Pack
72msbuild -t:Pack -p:Configuration=%_C% pack-wix\pack-wix.csproj || exit /b 62msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_pack.binlog || exit /b
73msbuild -t:Pack -p:Configuration=%_C% WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
74
75msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b
76msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core\WixToolset.Core.csproj || exit /b
77msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Burn\WixToolset.Core.Burn.csproj || exit /b
78msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj || exit /b
79msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj || exit /b
80msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj || exit /b
81
82msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters\WixToolset.Converters.csproj || exit /b
83msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj || exit /b
84
85 63
86@popd 64@popd
87@endlocal 65@endlocal
diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj
index cdf4fbe7..41699a31 100644
--- a/src/wix/wix/wix.csproj
+++ b/src/wix/wix/wix.csproj
@@ -20,10 +20,6 @@
20 <NoWarn>NU1701</NoWarn> 20 <NoWarn>NU1701</NoWarn>
21 </PropertyGroup> 21 </PropertyGroup>
22 22
23 <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
24 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
25 </ItemGroup>
26
27 <ItemGroup> 23 <ItemGroup>
28 <ProjectReference Include="..\WixToolset.Converters\WixToolset.Converters.csproj" /> 24 <ProjectReference Include="..\WixToolset.Converters\WixToolset.Converters.csproj" />
29 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> 25 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 08:10:59 +0000