From 4cd4828e6225a2ff5e81002a7f6f7401570b21c4 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 21 Dec 2021 12:44:27 -0800 Subject: Build simplification and parallelization --- src/Directory.Build.rsp | 4 ++ src/api/api.cmd | 8 ++-- src/api/api.proj | 9 ---- src/api/api_t.proj | 9 ++++ src/api/burn/burn.proj | 34 ------------- src/api/burn/burn_t.proj | 34 +++++++++++++ src/api/wix/wix.proj | 12 ----- src/api/wix/wix_t.proj | 12 +++++ src/build_init.cmd | 2 +- src/burn/burn.cmd | 8 +--- src/burn/burn_t.proj | 11 +++++ .../WixToolset.Dtf.Compression.Cab.csproj | 4 -- .../WixToolset.Dtf.Compression.Zip.csproj | 4 -- .../WixToolset.Dtf.Compression.csproj | 4 -- .../WixToolset.Dtf.Resources.csproj | 4 -- .../WixToolset.Dtf.WindowsInstaller.Linq.csproj | 4 -- .../WixToolset.Dtf.WindowsInstaller.Package.csproj | 4 -- .../WixToolset.Dtf.WindowsInstaller.csproj | 4 -- .../WixToolsetTests.Dtf.Compression.Cab.csproj | 7 +-- .../WixToolsetTests.Dtf.Compression.Zip.csproj | 7 +-- .../WixToolsetTests.Dtf.Compression.csproj | 7 +-- ...Tests.Dtf.WindowsInstaller.CustomActions.csproj | 7 +-- ...ixToolsetTests.Dtf.WindowsInstaller.Linq.csproj | 7 +-- .../WixToolsetTests.Dtf.WindowsInstaller.csproj | 7 +-- src/dtf/dtf.cmd | 14 +----- .../SetBuildNumber/Directory.Packages.props.pp | 4 +- src/internal/SetBuildNumber/global.json.pp | 1 + .../WixBuildTools.TestSupport.Native.vcxproj | 3 +- src/internal/internal.cmd | 5 +- src/internal/internal.sln | 2 + src/libs/dutil/dutil.proj | 11 ----- src/libs/dutil/dutil_t.proj | 11 +++++ src/libs/libs.cmd | 8 +--- src/libs/libs.proj | 6 --- src/libs/libs_t.proj | 6 +++ src/libs/wcautil/wcautil.proj | 9 ---- src/libs/wcautil/wcautil_t.proj | 9 ++++ src/samples/samples.cmd | 2 +- src/test/burn/test_burn.cmd | 4 +- .../WixToolset.BuildTasks.csproj | 7 +-- src/wix/heat/heat.csproj | 4 -- src/wix/pack_t.proj | 16 +++++++ src/wix/publish_t.proj | 17 +++++++ src/wix/wix.cmd | 56 +++++++--------------- src/wix/wix/wix.csproj | 4 -- 45 files changed, 181 insertions(+), 231 deletions(-) create mode 100644 src/Directory.Build.rsp delete mode 100644 src/api/api.proj create mode 100644 src/api/api_t.proj delete mode 100644 src/api/burn/burn.proj create mode 100644 src/api/burn/burn_t.proj delete mode 100644 src/api/wix/wix.proj create mode 100644 src/api/wix/wix_t.proj create mode 100644 src/burn/burn_t.proj delete mode 100644 src/libs/dutil/dutil.proj create mode 100644 src/libs/dutil/dutil_t.proj delete mode 100644 src/libs/libs.proj create mode 100644 src/libs/libs_t.proj delete mode 100644 src/libs/wcautil/wcautil.proj create mode 100644 src/libs/wcautil/wcautil_t.proj create mode 100644 src/wix/pack_t.proj create mode 100644 src/wix/publish_t.proj (limited to 'src') 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 @@ +-nologo +-nr:false +-v:m + 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 @@ :: restore :: build :: pack -msbuild -m -p:Configuration=%_C% api.proj || exit /b -:: test -dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b -dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b +msbuild api_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\api_build.binlog || exit /b +:: test +dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b +dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b @popd @endlocal diff --git a/src/api/api.proj b/src/api/api.proj deleted file mode 100644 index 6d7a4188..00000000 --- a/src/api/api.proj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - 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 @@ + + + + + + + + + diff --git a/src/api/burn/burn.proj b/src/api/burn/burn.proj deleted file mode 100644 index 49bd2876..00000000 --- a/src/api/burn/burn.proj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/api/burn/burn_t.proj b/src/api/burn/burn_t.proj new file mode 100644 index 00000000..46ccf8b2 --- /dev/null +++ b/src/api/burn/burn_t.proj @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/api/wix/wix.proj b/src/api/wix/wix.proj deleted file mode 100644 index ea07e810..00000000 --- a/src/api/wix/wix.proj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/api/wix/wix_t.proj b/src/api/wix/wix_t.proj new file mode 100644 index 00000000..174b8b0e --- /dev/null +++ b/src/api/wix/wix_t.proj @@ -0,0 +1,12 @@ + + + + + + + + + + + + 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 @@ md ..\build\artifacts -msbuild -Restore -v:m internal\SetBuildNumber\SetBuildNumber.proj +msbuild -Restore internal\SetBuildNumber\SetBuildNumber.proj -nologo @popd @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 @@ nuget restore || exit /b -msbuild -t:Test -p:Configuration=%_C%;Platform=x86 test\BurnUnitTest || exit /b - -msbuild -t:Build -p:Configuration=%_C%;Platform=x86 || exit /b -msbuild -t:Build -p:Configuration=%_C%;Platform=x64 || exit /b -msbuild -t:Build -p:Configuration=%_C%;Platform=arm64 || exit /b - -msbuild -t:PackNative -p:Configuration=%_C% stub\stub.vcxproj || exit /b +msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\burn_build.binlog || exit /b @popd @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 @@ + + + + + + + + + + + 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 @@ - - - - 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 @@ - - - - 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 @@ - - - - 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 @@ Classes for reading and writing resource data in executable files true - - - - 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 @@ - - - - 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 @@ - - - - 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 @@ - - - - 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 @@ - - - - - \ No newline at end of file + + 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 @@ - - - - - \ No newline at end of file + + 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 @@ - - - - - \ No newline at end of file + + 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 @@ - - - - - \ No newline at end of file + + 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 @@ - - - - - \ No newline at end of file + + 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 @@ - - - - - \ No newline at end of file + + 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 @@ @echo Building dtf %_C% -:: dtf - -nuget restore || exit /b - -msbuild -t:Build -p:Configuration=%_C% -m -v:m -nr:false || exit /b - -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression -v:m || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Cab -v:m || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Compression.Zip -v:m || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.Resources -v:m || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller -v:m || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Linq -v:m || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Dtf.WindowsInstaller.Package -v:m || exit /b +msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\dtf_build.binlog|| exit /b @popd @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 @@ - + - + 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 @@ { "msbuild-sdks": { + "Microsoft.Build.Traversal": "3.0.23", "WixToolset.Sdk": "{packageversion}" }, "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 @@ {6C57EF2C-979A-4106-A9E5-FE342810619A} - + + 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 @@ @echo Building internal %_C% :: internal - nuget restore || exit /b :: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b :: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -v:m || exit /b +msbuild -t:Pack WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -p:Configuration=%_C% -nologo || exit /b -msbuild -t:Build -p:Configuration=%_C% WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -v:m || exit /b +msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C% -nologo || exit /b @popd @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 {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.ActiveCfg = Release|Any CPU {8E082709-7355-41D5-AF86-6BBF9C89BDD7}.Release|x86.Build.0 = Release|Any CPU {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.Build.0 = Debug|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|ARM64.ActiveCfg = Debug|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32 + {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.Build.0 = Release|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|ARM64.ActiveCfg = Release|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32 {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32 diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil.proj deleted file mode 100644 index 90d66440..00000000 --- a/src/libs/dutil/dutil.proj +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/libs/dutil/dutil_t.proj b/src/libs/dutil/dutil_t.proj new file mode 100644 index 00000000..90d66440 --- /dev/null +++ b/src/libs/dutil/dutil_t.proj @@ -0,0 +1,11 @@ + + + + + + + + + + + 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 @@ @if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args -@echo Building libs %_C% using %_N% +@echo Building libs %_C% -:: libs - -nuget restore || exit /b - -msbuild -m -p:Configuration=%_C% libs.proj || exit /b +msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\libs_build.binlog || exit /b @popd @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 @@ - - - - - - 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 @@ + + + + + + diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil.proj deleted file mode 100644 index ae0ebc08..00000000 --- a/src/libs/wcautil/wcautil.proj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/libs/wcautil/wcautil_t.proj b/src/libs/wcautil/wcautil_t.proj new file mode 100644 index 00000000..ae0ebc08 --- /dev/null +++ b/src/libs/wcautil/wcautil_t.proj @@ -0,0 +1,9 @@ + + + + + + + + + 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 @@ nuget restore || exit /b -msbuild -t:Build -p:Configuration=%_C% || exit /b +msbuild -t:Build -p:Configuration=%_C% -bl:..\..\samples_build.binlog || exit /b @popd @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 @@ @echo Burn integration tests %_C% -msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror || exit /b -msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj || exit /b +msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:..\..\..\build\logs\test_burn_build.binlog || exit /b +msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj -bl:..\..\..\build\logs\test_burn_data_build.binlog || exit /b @if not "%RuntimeTestsEnabled%"=="true" goto :LExit 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 @@ - + - - - - + 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 @@ - - - - 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 @@ + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + 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 @@ @if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args -@set _P_OBJ=%~dp0..\..\build\wix\obj\publish\%_C%\ +@set _P_OBJ=%~dp0..\..\build\wix\obj\publish_t\%_C%\ @set _P=%~dp0..\..\build\wix\%_C%\publish\ @set _RCO=/S /R:1 /W:1 /NP /XO /NS /NC /NFL /NDL /NJH /NJS @echo Building wix %_C% :: Restore -msbuild -t:Restore -p:Configuration=%_C% wix.sln || exit /b +msbuild -t:Restore wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_restore.binlog || exit /b :: Build -msbuild -p:Configuration=%_C% -p:Platform=x86 wixnative\wixnative.vcxproj || exit /b -msbuild -p:Configuration=%_C% -p:Platform=x64 wixnative\wixnative.vcxproj || exit /b -msbuild -p:Configuration=%_C% -p:Platform=ARM64 wixnative\wixnative.vcxproj || exit /b +msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x86 || exit /b +msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x64 || exit /b +msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=ARM64 || exit /b -msbuild -p:Configuration=%_C% || exit /b +msbuild wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_build.binlog || exit /b :: Pre-Publish Test - -dotnet test -c %_C% --no-build test\WixToolsetTest.Converters || exit /b -dotnet test -c %_C% --no-build test\WixToolsetTest.Converters.Symbolizer || exit /b -dotnet test -c %_C% --no-build test\WixToolsetTest.Core.Burn || exit /b -dotnet test -c %_C% --no-build test\WixToolsetTest.Core.Native || exit /b -dotnet test -c %_C% --no-build test\WixToolsetTest.CoreIntegration || exit /b -dotnet test -c %_C% --no-build test\WixToolsetTest.Heat || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Converters || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Converters.Symbolizer || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Core.Burn || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Core.Native || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.CoreIntegration || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Heat || exit /b :: Publish -msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:PublishDir=%_P%wix\ wix\wix.csproj || exit /b +msbuild publish_t.proj -p:Configuration=%_C% -nologo -bl:..\..\build\logs\wix_publish.binlog || exit /b -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 -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 -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 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% -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 -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 -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 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\heat %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% -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 -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 -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 robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% -msbuild -t:Publish -p:Configuration=%_C% -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b +msbuild -t:Publish -p:Configuration=%_C% -v:m -nologo -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test :: 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 :: Test -dotnet test -c %_C% --no-build test\WixToolsetTest.BuildTasks || exit /b -dotnet test -c %_C% --no-build test\WixToolsetTest.Sdk || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.BuildTasks || exit /b +dotnet test -c %_C% --no-build --nologo -v m test\WixToolsetTest.Sdk || exit /b :: Pack -msbuild -t:Pack -p:Configuration=%_C% pack-wix\pack-wix.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b - -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core\WixToolset.Core.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.Burn\WixToolset.Core.Burn.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.ExtensionCache\WixToolset.Core.ExtensionCache.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.TestPackage\WixToolset.Core.TestPackage.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj || exit /b - -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters\WixToolset.Converters.csproj || exit /b -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Converters.Symbolizer\WixToolset.Converters.Symbolizer.csproj || exit /b - +msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_pack.binlog || exit /b @popd @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 @@ NU1701 - - - - -- cgit v1.2.3-55-g6feb