@joebigelow / wix-1 / commits / 1bdcbeb0

Pretty up build output

Rob Mensching committed Dec 6, 2023 at 11:53 UTC 1bdcbeb08dfdcbec0929db19569e0eaa13de9c0e
24 files changed +51 -51
src/api/api.cmd
+1 -1
@@ -23,7 +23,7 @@
23 :: Build
24 :: Pack
25
26 -msbuild api_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\api_build.binlog || exit /b
26 +msbuild api_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\api_build.binlog || exit /b
27
28 :: Test
29 dotnet test ^
src/burn/burn.cmd
+1 -1
@@ -23,7 +23,7 @@
23
24 nuget restore || exit /b
25
26 -msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\burn_build.binlog || exit /b
26 +msbuild burn_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\burn_build.binlog || exit /b
27
28 dotnet test ^
29 %_B%\x86\BurnUnitTest.dll ^
src/dtf/dtf.cmd
+2 -2
@@ -8,9 +8,9 @@
8
9 @echo Building dtf %_C%
10
11 -msbuild -Restore SfxCA\sfxca_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\dtf_sfxca.binlog || exit /b
11 +msbuild -Restore SfxCA\sfxca_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:..\..\build\logs\dtf_sfxca.binlog || exit /b
12
13 -msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\dtf_build.binlog || exit /b
13 +msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:..\..\build\logs\dtf_build.binlog || exit /b
14
15 @popd
16 @endlocal
src/ext/Bal/bal.cmd
+5 -5
@@ -23,9 +23,9 @@
23 nuget restore dnchost\packages.config || exit /b
24
25 :: Build
26 -msbuild -Restore -p:Configuration=%_C% -bl:%_L%\ext_bal_build.binlog || exit /b
26 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_bal_build.binlog || exit /b
27
28 -msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -m -bl:%_L%\bal_examples_build.binlog || exit /b
28 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\examples\examples.proj -m -bl:%_L%\bal_examples_build.binlog || exit /b
29
30 :: Test
31 dotnet test ^
@@ -35,9 +35,9 @@ dotnet test ^
35 --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b
36
37 :: Pack
38 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b
39 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj || exit /b
40 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
38 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b
39 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj || exit /b
40 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
41
42 @goto :end
43
src/ext/ComPlus/complus.cmd
+2 -2
@@ -9,13 +9,13 @@
9 @echo ComPlus.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b
16
17 :: Pack
18 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.ComPlus.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.ComPlus.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
\ No newline at end of file
src/ext/Dependency/dependency.cmd
+2 -2
@@ -9,13 +9,13 @@
9 @echo Dependency.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b
16
17 :: Pack
18 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Dependency.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Dependency.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/DirectX/directx.cmd
+3 -3
@@ -9,16 +9,16 @@
9 @echo DirectX.wixext build %_C%
10
11 :: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
12 +msbuild -t:Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj || exit /b
15 +msbuild -t:Build -p:Configuration=%_C% -tl -nologo -warnaserror test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj || exit /b
16
17 :: Test
18 dotnet test -c %_C% --no-build test\WixToolsetTest.DirectX || exit /b
19
20 :: Pack
21 -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DirectX.wixext.csproj || exit /b
21 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror wixext\WixToolset.DirectX.wixext.csproj || exit /b
22
23 @popd
24 @endlocal
src/ext/Firewall/firewall.cmd
+2 -2
@@ -9,13 +9,13 @@
9 @echo Firewall.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b
16
17 :: Pack
18 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Firewall.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Firewall.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Http/http.cmd
+2 -2
@@ -9,13 +9,13 @@
9 @echo Http.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b
16
17 :: Pack
18 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Http.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Http.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Iis/iis.cmd
+1 -1
@@ -9,7 +9,7 @@
9 @echo Iis.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% -nologo || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test test\WixToolsetTest.Iis -c %_C% --no-build --nologo || exit /b
src/ext/Msmq/msmq.cmd
+1 -1
@@ -9,7 +9,7 @@
9 @echo Msmq.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% -nologo || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test test\WixToolsetTest.Msmq -c %_C% --no-build --nologo || exit /b
src/ext/NetFx/netfx.cmd
+2 -2
@@ -23,7 +23,7 @@
23 nuget restore netcoresearch\packages.config || exit /b
24
25 :: Build
26 -msbuild -Restore -p:Configuration=%_C% -bl:%_L%\ext_netfx_build.binlog || exit /b
26 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_netfx_build.binlog || exit /b
27
28 :: Test
29 dotnet test ^
@@ -31,7 +31,7 @@ dotnet test ^
31 --nologo -l "trx;LogFileName=%_L%\TestResults\netfx.wixext.trx" || exit /b
32
33 :: Pack
34 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b
34 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b
35
36 @goto :end
37
src/ext/PowerShell/ps.cmd
+2 -2
@@ -9,13 +9,13 @@
9 @echo PowerShell.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b
16
17 :: Pack
18 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.PowerShell.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.PowerShell.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Sql/sql.cmd
+2 -2
@@ -9,13 +9,13 @@
9 @echo Sql.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b
16
17 :: Pack
18 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Sql.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Sql.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/UI/ui.cmd
+2 -2
@@ -20,13 +20,13 @@
20 @echo UI.wixext build %_C%
21
22 :: Build
23 -msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\ext_ui_build.binlog || exit /b
23 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_ui_build.binlog || exit /b
24
25 :: Test
26 :: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
27
28 :: Pack
29 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
29 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
30
31 @goto :end
32
src/ext/Util/util.cmd
+2 -2
@@ -20,7 +20,7 @@
20 @echo Building ext\Util %_C% using %_N%
21
22 :: Build
23 -msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\ext_util_build.binlog || exit /b
23 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_util_build.binlog || exit /b
24
25 :: Test
26 dotnet test ^
@@ -28,7 +28,7 @@ dotnet test ^
28 --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b
29
30 :: Pack
31 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
31 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
32
33 @goto :end
34
src/ext/VisualStudio/vs.cmd
+2 -2
@@ -9,13 +9,13 @@
9 @echo VisualStudio.wixext build %_C%
10
11 :: Build
12 -msbuild -Restore -p:Configuration=%_C% || exit /b
12 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b
16
17 :: Pack
18 -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.VisualStudio.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.VisualStudio.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/internal/internal.cmd
+1 -1
@@ -25,7 +25,7 @@ nuget restore || exit /b
25 :: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
26 :: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
27
28 -msbuild internal_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\internal_build.binlog || exit /b
28 +msbuild internal_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\internal_build.binlog || exit /b
29
30 @goto :end
31
src/libs/libs.cmd
+1 -1
@@ -19,7 +19,7 @@
19
20 @echo Building libs %_C%
21
22 -msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b
22 +msbuild -Restore libs_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b
23
24 dotnet test ^
25 %_B%\net6.0\WixToolsetTest.Versioning.dll ^
src/setup/setup.cmd
+2 -2
@@ -18,9 +18,9 @@
18 @echo Building setup %_C%
19
20 :: Build
21 -msbuild -Restore MetadataTask\MetadataTask.csproj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\setup_task.binlog || exit /b
21 +msbuild -Restore MetadataTask\MetadataTask.csproj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\setup_task.binlog || exit /b
22
23 -msbuild -Restore setup.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\setup_build.binlog || exit /b
23 +msbuild -Restore setup.sln -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\setup_build.binlog || exit /b
24
25 :: Publish
26
src/test/burn/test_burn.cmd
+2 -2
@@ -13,8 +13,8 @@
13
14 @echo Burn integration tests %_C%
15
16 -msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
17 -msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b
16 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
17 +msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_data_build.binlog || exit /b
18
19 "%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe"
20 mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe"
src/test/msi/test_msi.cmd
+2 -2
@@ -11,8 +11,8 @@
11
12 @echo Msi integration tests %_C%
13
14 -msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_msi_build.binlog || exit /b
15 -msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_msi_data_build.binlog || exit /b
14 +msbuild -t:Build -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\test_msi_build.binlog || exit /b
15 +msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_msi_data_build.binlog || exit /b
16
17 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit
18
src/tools/tools.cmd
+3 -3
@@ -20,10 +20,10 @@
20 @echo Building tools %_C%
21
22 :: Build
23 -msbuild -Restore tools.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\tools_build.binlog || exit /b
23 +msbuild -Restore tools.sln -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\tools_build.binlog || exit /b
24
25 :: Publish
26 -msbuild publish_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\tools_publish.binlog || exit /b
26 +msbuild publish_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\tools_publish.binlog || exit /b
27
28 :: Test
29 dotnet test ^
@@ -32,7 +32,7 @@ dotnet test ^
32 --nologo -l "trx;LogFileName=%_L%\TestResults\tools.trx" || exit /b
33
34 :: Pack
35 -msbuild -t:Pack WixToolset.Heat -p:Configuration=%_C% -p:NoBuild=true -nologo -m -warnaserror -bl:%_L%\tools_pack.binlog || exit /b
35 +msbuild -t:Pack WixToolset.Heat -p:Configuration=%_C% -p:NoBuild=true -tl -nologo -m -warnaserror -bl:%_L%\tools_pack.binlog || exit /b
36
37 @goto :end
38
src/wix/wix.cmd
+6 -6
@@ -20,17 +20,17 @@
20 @echo Building wix %_C%
21
22 :: Restore
23 -msbuild -t:Restore wix.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wix_restore.binlog || exit /b
23 +msbuild -t:Restore wix.sln -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\wix_restore.binlog || exit /b
24
25
26 :: Build
27 -msbuild wixnative\wixnative_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wixnative_build.binlog || exit /b
27 +msbuild wixnative\wixnative_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\wixnative_build.binlog || exit /b
28
29 -msbuild wix.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wix_build.binlog || exit /b
29 +msbuild wix.sln -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\wix_build.binlog || exit /b
30
31 -msbuild publish_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\wix_publish.binlog || exit /b
31 +msbuild publish_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\wix_publish.binlog || exit /b
32
33 -msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b
33 +msbuild -t:Publish -p:Configuration=%_C% -tl -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b
34
35 :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
36 :: 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
@@ -49,7 +49,7 @@ dotnet test ^
49
50
51 :: Pack
52 -msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wix_pack.binlog || exit /b
52 +msbuild pack_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\wix_pack.binlog || exit /b
53
54 @goto :end
55