@joebigelow / wix-1 / commits / 4cd4828e

Build simplification and parallelization

Rob Mensching committed Dec 21, 2021 at 12:44 UTC 4cd4828e6225a2ff5e81002a7f6f7401570b21c4
42 files changed +120 -167
.gitignore
+3
@@ -401,3 +401,6 @@ build/.tools/
401 src/test/burn/TestData/CacheTests/BundleC/fivegb.file
402 src/test/burn/TestData/Manual/BundleB/BAPayloads
403 src/test/burn/TestData/Manual/BundleB/PackagePayloads
404 +
405 +# Allow standard response file
406 +!src/Directory.Build.rsp
src/Directory.Build.rsp new
+4
@@ -0,0 +1,4 @@
1 +-nologo
2 +-nr:false
3 +-v:m
4 +
src/api/api.cmd
+4 -4
@@ -11,12 +11,12 @@
11 :: restore
12 :: build
13 :: pack
14 -msbuild -m -p:Configuration=%_C% api.proj || exit /b
14
16 -:: test
17 -dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b
18 -dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b
15 +msbuild api_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\api_build.binlog || exit /b
16
17 +:: test
18 +dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b
19 +dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b
20
21 @popd
22 @endlocal
src/api/api.proj deleted
-9
@@ -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>
src/api/api_t.proj new
+9
@@ -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>
src/api/burn/burn_t.proj renamed
+1 -1
@@ -1,7 +1,7 @@
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. -->
3
4 -<Project Sdk="Microsoft.Build.Traversal/3.0.23">
4 +<Project Sdk="Microsoft.Build.Traversal">
5 <ItemGroup>
6 <!-- Restore: Explicitly restore the test projects, which need some hand-holding. -->
7 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
src/api/wix/wix_t.proj renamed
+1 -1
@@ -1,4 +1,4 @@
1 -<Project Sdk="Microsoft.Build.Traversal/3.0.23">
1 +<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup>
3 <!-- Build -->
4 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
src/build_init.cmd
+1 -1
@@ -3,7 +3,7 @@
3
4 md ..\build\artifacts
5
6 -msbuild -Restore -v:m internal\SetBuildNumber\SetBuildNumber.proj
6 +msbuild -Restore internal\SetBuildNumber\SetBuildNumber.proj -nologo
7
8 @popd
9 @endlocal
src/burn/burn.cmd
+1 -7
@@ -12,13 +12,7 @@
12
13 nuget restore || exit /b
14
15 -msbuild -t:Test -p:Configuration=%_C%;Platform=x86 test\BurnUnitTest || exit /b
16 -
17 -msbuild -t:Build -p:Configuration=%_C%;Platform=x86 || exit /b
18 -msbuild -t:Build -p:Configuration=%_C%;Platform=x64 || exit /b
19 -msbuild -t:Build -p:Configuration=%_C%;Platform=arm64 || exit /b
20 -
21 -msbuild -t:PackNative -p:Configuration=%_C% stub\stub.vcxproj || exit /b
15 +msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\burn_build.binlog || exit /b
16
17 @popd
18 @endlocal
src/burn/burn_t.proj new
+11
@@ -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>
src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
-4
@@ -18,8 +18,4 @@
18 <ItemGroup>
19 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
20 </ItemGroup>
21 -
22 - <ItemGroup>
23 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
24 - </ItemGroup>
21 </Project>
src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
-4
@@ -13,8 +13,4 @@
13 <ItemGroup>
14 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
15 </ItemGroup>
16 -
17 - <ItemGroup>
18 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 - </ItemGroup>
16 </Project>
src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
-4
@@ -13,8 +13,4 @@
13 <ItemGroup>
14 <None Include="Compression.cd" />
15 </ItemGroup>
16 -
17 - <ItemGroup>
18 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 - </ItemGroup>
16 </Project>
src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
-4
@@ -9,8 +9,4 @@
9 <Description>Classes for reading and writing resource data in executable files</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
12 -
13 - <ItemGroup>
14 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
15 - </ItemGroup>
12 </Project>
src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
-4
@@ -13,8 +13,4 @@
13 <ItemGroup>
14 <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
15 </ItemGroup>
16 -
17 - <ItemGroup>
18 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
19 - </ItemGroup>
16 </Project>
src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
-4
@@ -15,8 +15,4 @@
15 <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
16 <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
17 </ItemGroup>
18 -
19 - <ItemGroup>
20 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
21 - </ItemGroup>
18 </Project>
src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
-4
@@ -22,8 +22,4 @@
22 <ItemGroup Condition=" '$(TargetFramework)'=='net20' ">
23 <Reference Include="System.Configuration" />
24 </ItemGroup>
25 -
26 - <ItemGroup>
27 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
28 - </ItemGroup>
25 </Project>
src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
+2 -5
@@ -38,9 +38,6 @@
38 </ProjectReference>
39 </ItemGroup>
40
41 - <ItemGroup>
42 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
43 - </ItemGroup>
44 -
41 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
46 -</Project>
\ No newline at end of file
42 + <Target Name="Pack" DependsOnTargets="Build" />
43 +</Project>
src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
+2 -5
@@ -36,9 +36,6 @@
36 </ProjectReference>
37 </ItemGroup>
38
39 - <ItemGroup>
40 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
41 - </ItemGroup>
42 -
39 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
44 -</Project>
\ No newline at end of file
40 + <Target Name="Pack" DependsOnTargets="Build" />
41 +</Project>
src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
+2 -5
@@ -31,9 +31,6 @@
31 </ProjectReference>
32 </ItemGroup>
33
34 - <ItemGroup>
35 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
36 - </ItemGroup>
37 -
34 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
39 -</Project>
\ No newline at end of file
35 + <Target Name="Pack" DependsOnTargets="Build" />
36 +</Project>
src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
+2 -5
@@ -27,9 +27,6 @@
27 </ProjectReference>
28 </ItemGroup>
29
30 - <ItemGroup>
31 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
32 - </ItemGroup>
33 -
30 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
35 -</Project>
\ No newline at end of file
31 + <Target Name="Pack" DependsOnTargets="Build" />
32 +</Project>
src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
+2 -5
@@ -37,9 +37,6 @@
37 </ProjectReference>
38 </ItemGroup>
39
40 - <ItemGroup>
41 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
42 - </ItemGroup>
43 -
40 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
45 -</Project>
\ No newline at end of file
41 + <Target Name="Pack" DependsOnTargets="Build" />
42 +</Project>
src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
+2 -5
@@ -34,9 +34,6 @@
34 </ProjectReference>
35 </ItemGroup>
36
37 - <ItemGroup>
38 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
39 - </ItemGroup>
40 -
37 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
42 -</Project>
\ No newline at end of file
38 + <Target Name="Pack" DependsOnTargets="Build" />
39 +</Project>
src/dtf/dtf.cmd
+1 -13
@@ -8,19 +8,7 @@
8
9 @echo Building dtf %_C%
10
11 -:: dtf
12 -
13 -nuget restore || exit /b
14 -
15 -msbuild -t:Build -p:Configuration=%_C% -m -v:m -nr:false || exit /b
16 -
17 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression -v:m || exit /b
18 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Cab -v:m || exit /b
19 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Zip -v:m || exit /b
20 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Resources -v:m || exit /b
21 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller -v:m || exit /b
22 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Linq -v:m || exit /b
23 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Package -v:m || exit /b
11 +msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\dtf_build.binlog|| exit /b
12
13 @popd
14 @endlocal
src/internal/SetBuildNumber/Directory.Packages.props.pp
+2 -2
@@ -50,11 +50,11 @@
50 <PackageVersion Include="NuGet.Versioning" Version="5.6.0" />
51 </ItemGroup>
52
53 - <ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" >
53 + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" >
54 <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3"/>
55 </ItemGroup>
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" />
59 </ItemGroup>
60
src/internal/SetBuildNumber/global.json.pp
+1
@@ -1,5 +1,6 @@
1 {
2 "msbuild-sdks": {
3 + "Microsoft.Build.Traversal": "3.0.23",
4 "WixToolset.Sdk": "{packageversion}"
5 },
6 "sdk": {
src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+2 -1
@@ -58,7 +58,8 @@
58 <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project>
59 </ProjectReference>
60 </ItemGroup>
61 -
61 +
62 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
63 <Import Project="build\WixBuildTools.TestSupport.Native.targets" />
64 + <Target Name="Pack" DependsOnTargets="Build" />
65 </Project>
src/internal/internal.cmd
+2 -3
@@ -9,15 +9,14 @@
9 @echo Building internal %_C%
10
11 :: internal
12 -
12 nuget restore || exit /b
13
14 :: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
15 :: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
16
18 -msbuild -t:Pack -p:Configuration=%_C% WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -v:m || exit /b
17 +msbuild -t:Pack WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -p:Configuration=%_C% -nologo || exit /b
18
20 -msbuild -t:Build -p:Configuration=%_C% WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -v:m || exit /b
19 +msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C% -nologo || exit /b
20
21 @popd
22 @endlocal
src/internal/internal.sln
+2
@@ -36,11 +36,13 @@ Global
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
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
40 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|ARM64.ActiveCfg = Debug|Win32
41 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32
42 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32
43 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|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
46 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|ARM64.ActiveCfg = Release|Win32
47 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32
48 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32
src/libs/dutil/dutil_t.proj renamed
src/libs/libs.cmd
+2 -6
@@ -6,13 +6,9 @@
6 @if /i "%1"=="release" set _C=Release
7 @if not "%1"=="" shift & goto parse_args
8
9 -@echo Building libs %_C% using %_N%
9 +@echo Building libs %_C%
10
11 -:: libs
12 -
13 -nuget restore || exit /b
14 -
15 -msbuild -m -p:Configuration=%_C% libs.proj || exit /b
11 +msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\libs_build.binlog || exit /b
12
13 @popd
14 @endlocal
src/libs/libs.proj deleted
-6
@@ -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>
src/libs/libs_t.proj new
+6
@@ -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>
src/libs/wcautil/wcautil_t.proj renamed
src/samples/samples.cmd
+1 -1
@@ -12,7 +12,7 @@
12
13 nuget restore || exit /b
14
15 -msbuild -t:Build -p:Configuration=%_C% || exit /b
15 +msbuild -t:Build -p:Configuration=%_C% -bl:..\..\samples_build.binlog || exit /b
16
17 @popd
18 @endlocal
src/test/burn/test_burn.cmd
+2 -2
@@ -10,8 +10,8 @@
10
11 @echo Burn integration tests %_C%
12
13 -msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror || exit /b
14 -msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj || exit /b
13 +msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:..\..\..\build\logs\test_burn_build.binlog || exit /b
14 +msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj -bl:..\..\..\build\logs\test_burn_data_build.binlog || exit /b
15
16 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit
17
src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+2 -5
@@ -17,15 +17,12 @@
17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
18 </ItemGroup>
19
20 - <ItemGroup Condition="'$(TargetFramework)'=='net472'">
20 + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" >
21 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
22 <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
23 <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
24 - <PackageReference Include="Microsoft.Build.Tasks.Core" />
25 - </ItemGroup>
24
27 - <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
28 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
25 + <PackageReference Include="Microsoft.Build.Tasks.Core" />
26 </ItemGroup>
27
28 <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' ">
src/wix/heat/heat.csproj
-4
@@ -45,8 +45,4 @@
45 <PackageReference Include="System.Diagnostics.PerformanceCounter" />
46 <PackageReference Include="System.DirectoryServices" />
47 </ItemGroup>
48 -
49 - <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
50 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
51 - </ItemGroup>
48 </Project>
src/wix/pack_t.proj new
+16
@@ -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>
src/wix/publish_t.proj new
+17
@@ -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>
src/wix/wix.cmd
+17 -39
@@ -6,82 +6,60 @@
6 @if /i "%1"=="release" set _C=Release
7 @if not "%1"=="" shift & goto parse_args
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\
11 @set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS
12
13 @echo Building wix %_C%
14
15 :: Restore
16 -msbuild -t:Restore -p:Configuration=%_C% wix.sln || exit /b
16 +msbuild -t:Restore wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_restore.binlog || exit /b
17
18
19 :: Build
20 -msbuild -p:Configuration=%_C% -p:Platform=x86 wixnative\wixnative.vcxproj || exit /b
21 -msbuild -p:Configuration=%_C% -p:Platform=x64 wixnative\wixnative.vcxproj || exit /b
22 -msbuild -p:Configuration=%_C% -p:Platform=ARM64 wixnative\wixnative.vcxproj || exit /b
20 +msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x86 || exit /b
21 +msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x64 || exit /b
22 +msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=ARM64 || exit /b
23
24 -msbuild -p:Configuration=%_C% || exit /b
24 +msbuild wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_build.binlog || exit /b
25
26
27 :: Pre-Publish Test
28 -
29 -dotnet test -c %_C% --no-build test\WixToolsetTest.Converters || exit /b
30 -dotnet test -c %_C% --no-build test\WixToolsetTest.Converters.Symbolizer || exit /b
31 -dotnet test -c %_C% --no-build test\WixToolsetTest.Core.Burn || exit /b
32 -dotnet test -c %_C% --no-build test\WixToolsetTest.Core.Native || exit /b
33 -dotnet test -c %_C% --no-build test\WixToolsetTest.CoreIntegration || exit /b
34 -dotnet test -c %_C% --no-build test\WixToolsetTest.Heat || exit /b
28 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Converters || exit /b
29 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Converters.Symbolizer || exit /b
30 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Core.Burn || exit /b
31 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Core.Native || exit /b
32 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.CoreIntegration || exit /b
33 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Heat || exit /b
34
35
36 :: Publish
38 -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:PublishDir=%_P%wix\ wix\wix.csproj || exit /b
37 +msbuild publish_t.proj -p:Configuration=%_C% -nologo -bl:..\..\build\logs\wix_publish.binlog || exit /b
38
40 -msbuild -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
41 -msbuild -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
42 -msbuild -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
39 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll
40 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
41 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
42
47 -msbuild -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
48 -msbuild -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
49 -msbuild -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
43 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll
44 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\heat %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
45 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
46
54 -msbuild -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
55 -msbuild -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
56 -msbuild -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
47 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll
48 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
49 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
50
61 -msbuild -t:Publish -p:Configuration=%_C% -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
51 +msbuild -t:Publish -p:Configuration=%_C% -v:m -nologo -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
52
53 :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
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
55
56
57 :: Test
68 -dotnet test -c %_C% --no-build test\WixToolsetTest.BuildTasks || exit /b
69 -dotnet test -c %_C% --no-build test\WixToolsetTest.Sdk || exit /b
58 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.BuildTasks || exit /b
59 +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Sdk || exit /b
60
61 :: Pack
72 -msbuild -t:Pack -p:Configuration=%_C% pack-wix\pack-wix.csproj || exit /b
73 -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
74 -
75 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b
76 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core\WixToolset.Core.csproj || exit /b
77 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Burn\WixToolset.Core.Burn.csproj || exit /b
78 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj || exit /b
79 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj || exit /b
80 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj || exit /b
81 -
82 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters\WixToolset.Converters.csproj || exit /b
83 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj || exit /b
84 -
62 +msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_pack.binlog || exit /b
63
64 @popd
65 @endlocal
src/wix/wix/wix.csproj
-4
@@ -20,10 +20,6 @@
20 <NoWarn>NU1701</NoWarn>
21 </PropertyGroup>
22
23 - <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
24 - <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
25 - </ItemGroup>
26 -
23 <ItemGroup>
24 <ProjectReference Include="..\WixToolset.Converters\WixToolset.Converters.csproj" />
25 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />