diff options
author | Rob Mensching <rob@firegiant.com> | 2023-12-06 11:53:44 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-12-16 14:32:21 -0800 |
commit | 1bdcbeb08dfdcbec0929db19569e0eaa13de9c0e (patch) | |
tree | d8c1f3684b9056d1255d158afe723af1bcad71b8 | |
parent | 6cd11a8a8bfb7f16ff1e866a58a10431a1738058 (diff) | |
download | wix-1bdcbeb08dfdcbec0929db19569e0eaa13de9c0e.tar.gz wix-1bdcbeb08dfdcbec0929db19569e0eaa13de9c0e.tar.bz2 wix-1bdcbeb08dfdcbec0929db19569e0eaa13de9c0e.zip |
Pretty up build output
-rw-r--r-- | src/api/api.cmd | 2 | ||||
-rw-r--r-- | src/burn/burn.cmd | 2 | ||||
-rw-r--r-- | src/dtf/dtf.cmd | 4 | ||||
-rw-r--r-- | src/ext/Bal/bal.cmd | 10 | ||||
-rw-r--r-- | src/ext/ComPlus/complus.cmd | 4 | ||||
-rw-r--r-- | src/ext/Dependency/dependency.cmd | 4 | ||||
-rw-r--r-- | src/ext/DirectX/directx.cmd | 6 | ||||
-rw-r--r-- | src/ext/Firewall/firewall.cmd | 4 | ||||
-rw-r--r-- | src/ext/Http/http.cmd | 4 | ||||
-rw-r--r-- | src/ext/Iis/iis.cmd | 2 | ||||
-rw-r--r-- | src/ext/Msmq/msmq.cmd | 2 | ||||
-rw-r--r-- | src/ext/NetFx/netfx.cmd | 4 | ||||
-rw-r--r-- | src/ext/PowerShell/ps.cmd | 4 | ||||
-rw-r--r-- | src/ext/Sql/sql.cmd | 4 | ||||
-rw-r--r-- | src/ext/UI/ui.cmd | 4 | ||||
-rw-r--r-- | src/ext/Util/util.cmd | 4 | ||||
-rw-r--r-- | src/ext/VisualStudio/vs.cmd | 4 | ||||
-rw-r--r-- | src/internal/internal.cmd | 2 | ||||
-rw-r--r-- | src/libs/libs.cmd | 2 | ||||
-rw-r--r-- | src/setup/setup.cmd | 4 | ||||
-rw-r--r-- | src/test/burn/test_burn.cmd | 4 | ||||
-rw-r--r-- | src/test/msi/test_msi.cmd | 4 | ||||
-rw-r--r-- | src/tools/tools.cmd | 6 | ||||
-rw-r--r-- | src/wix/wix.cmd | 12 |
24 files changed, 51 insertions, 51 deletions
diff --git a/src/api/api.cmd b/src/api/api.cmd index 0c3bb31b..c0ba7f29 100644 --- a/src/api/api.cmd +++ b/src/api/api.cmd | |||
@@ -23,7 +23,7 @@ | |||
23 | :: Build | 23 | :: Build |
24 | :: Pack | 24 | :: Pack |
25 | 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 | 27 | ||
28 | :: Test | 28 | :: Test |
29 | dotnet test ^ | 29 | dotnet test ^ |
diff --git a/src/burn/burn.cmd b/src/burn/burn.cmd index f1753106..059c948c 100644 --- a/src/burn/burn.cmd +++ b/src/burn/burn.cmd | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | nuget restore || exit /b | 24 | nuget restore || exit /b |
25 | 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 | 27 | ||
28 | dotnet test ^ | 28 | dotnet test ^ |
29 | %_B%\x86\BurnUnitTest.dll ^ | 29 | %_B%\x86\BurnUnitTest.dll ^ |
diff --git a/src/dtf/dtf.cmd b/src/dtf/dtf.cmd index 6b55ecfe..d72c803b 100644 --- a/src/dtf/dtf.cmd +++ b/src/dtf/dtf.cmd | |||
@@ -8,9 +8,9 @@ | |||
8 | 8 | ||
9 | @echo Building dtf %_C% | 9 | @echo Building dtf %_C% |
10 | 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 | 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 | 14 | ||
15 | @popd | 15 | @popd |
16 | @endlocal | 16 | @endlocal |
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index eebef70f..2759d499 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd | |||
@@ -23,9 +23,9 @@ | |||
23 | nuget restore dnchost\packages.config || exit /b | 23 | nuget restore dnchost\packages.config || exit /b |
24 | 24 | ||
25 | :: Build | 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 | 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 | 29 | ||
30 | :: Test | 30 | :: Test |
31 | dotnet test ^ | 31 | dotnet test ^ |
@@ -35,9 +35,9 @@ dotnet test ^ | |||
35 | --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b | 35 | --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b |
36 | 36 | ||
37 | :: Pack | 37 | :: Pack |
38 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.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% -p:NoBuild=true WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.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% -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.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 | 41 | ||
42 | @goto :end | 42 | @goto :end |
43 | 43 | ||
diff --git a/src/ext/ComPlus/complus.cmd b/src/ext/ComPlus/complus.cmd index 67e55339..3b3a5772 100644 --- a/src/ext/ComPlus/complus.cmd +++ b/src/ext/ComPlus/complus.cmd | |||
@@ -9,13 +9,13 @@ | |||
9 | @echo ComPlus.wixext build %_C% | 9 | @echo ComPlus.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b |
16 | 16 | ||
17 | :: Pack | 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 | 19 | ||
20 | @popd | 20 | @popd |
21 | @endlocal \ No newline at end of file | 21 | @endlocal \ No newline at end of file |
diff --git a/src/ext/Dependency/dependency.cmd b/src/ext/Dependency/dependency.cmd index f219fd57..0ebcbfd5 100644 --- a/src/ext/Dependency/dependency.cmd +++ b/src/ext/Dependency/dependency.cmd | |||
@@ -9,13 +9,13 @@ | |||
9 | @echo Dependency.wixext build %_C% | 9 | @echo Dependency.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b |
16 | 16 | ||
17 | :: Pack | 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 | 19 | ||
20 | @popd | 20 | @popd |
21 | @endlocal | 21 | @endlocal |
diff --git a/src/ext/DirectX/directx.cmd b/src/ext/DirectX/directx.cmd index bc1068d7..56889513 100644 --- a/src/ext/DirectX/directx.cmd +++ b/src/ext/DirectX/directx.cmd | |||
@@ -9,16 +9,16 @@ | |||
9 | @echo DirectX.wixext build %_C% | 9 | @echo DirectX.wixext build %_C% |
10 | 10 | ||
11 | :: Restore | 11 | :: Restore |
12 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -t:Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Build | 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 | 16 | ||
17 | :: Test | 17 | :: Test |
18 | dotnet test -c %_C% --no-build test\WixToolsetTest.DirectX || exit /b | 18 | dotnet test -c %_C% --no-build test\WixToolsetTest.DirectX || exit /b |
19 | 19 | ||
20 | :: Pack | 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 | 22 | ||
23 | @popd | 23 | @popd |
24 | @endlocal | 24 | @endlocal |
diff --git a/src/ext/Firewall/firewall.cmd b/src/ext/Firewall/firewall.cmd index 8e838bcf..92926a8c 100644 --- a/src/ext/Firewall/firewall.cmd +++ b/src/ext/Firewall/firewall.cmd | |||
@@ -9,13 +9,13 @@ | |||
9 | @echo Firewall.wixext build %_C% | 9 | @echo Firewall.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b |
16 | 16 | ||
17 | :: Pack | 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 | 19 | ||
20 | @popd | 20 | @popd |
21 | @endlocal | 21 | @endlocal |
diff --git a/src/ext/Http/http.cmd b/src/ext/Http/http.cmd index 12919b6b..afcffb24 100644 --- a/src/ext/Http/http.cmd +++ b/src/ext/Http/http.cmd | |||
@@ -9,13 +9,13 @@ | |||
9 | @echo Http.wixext build %_C% | 9 | @echo Http.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b |
16 | 16 | ||
17 | :: Pack | 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 | 19 | ||
20 | @popd | 20 | @popd |
21 | @endlocal | 21 | @endlocal |
diff --git a/src/ext/Iis/iis.cmd b/src/ext/Iis/iis.cmd index 49e3e0b7..0ae87a77 100644 --- a/src/ext/Iis/iis.cmd +++ b/src/ext/Iis/iis.cmd | |||
@@ -9,7 +9,7 @@ | |||
9 | @echo Iis.wixext build %_C% | 9 | @echo Iis.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% -nologo || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test test\WixToolsetTest.Iis -c %_C% --no-build --nologo || exit /b | 15 | dotnet test test\WixToolsetTest.Iis -c %_C% --no-build --nologo || exit /b |
diff --git a/src/ext/Msmq/msmq.cmd b/src/ext/Msmq/msmq.cmd index 963e3ecf..3ebceab4 100644 --- a/src/ext/Msmq/msmq.cmd +++ b/src/ext/Msmq/msmq.cmd | |||
@@ -9,7 +9,7 @@ | |||
9 | @echo Msmq.wixext build %_C% | 9 | @echo Msmq.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% -nologo || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test test\WixToolsetTest.Msmq -c %_C% --no-build --nologo || exit /b | 15 | dotnet test test\WixToolsetTest.Msmq -c %_C% --no-build --nologo || exit /b |
diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd index 0b3fb28f..d81959cc 100644 --- a/src/ext/NetFx/netfx.cmd +++ b/src/ext/NetFx/netfx.cmd | |||
@@ -23,7 +23,7 @@ | |||
23 | nuget restore netcoresearch\packages.config || exit /b | 23 | nuget restore netcoresearch\packages.config || exit /b |
24 | 24 | ||
25 | :: Build | 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 | 27 | ||
28 | :: Test | 28 | :: Test |
29 | dotnet test ^ | 29 | dotnet test ^ |
@@ -31,7 +31,7 @@ dotnet test ^ | |||
31 | --nologo -l "trx;LogFileName=%_L%\TestResults\netfx.wixext.trx" || exit /b | 31 | --nologo -l "trx;LogFileName=%_L%\TestResults\netfx.wixext.trx" || exit /b |
32 | 32 | ||
33 | :: Pack | 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 | 35 | ||
36 | @goto :end | 36 | @goto :end |
37 | 37 | ||
diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd index cfb1274b..4a8aa61e 100644 --- a/src/ext/PowerShell/ps.cmd +++ b/src/ext/PowerShell/ps.cmd | |||
@@ -9,13 +9,13 @@ | |||
9 | @echo PowerShell.wixext build %_C% | 9 | @echo PowerShell.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b |
16 | 16 | ||
17 | :: Pack | 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 | 19 | ||
20 | @popd | 20 | @popd |
21 | @endlocal | 21 | @endlocal |
diff --git a/src/ext/Sql/sql.cmd b/src/ext/Sql/sql.cmd index 97ed8448..41af0223 100644 --- a/src/ext/Sql/sql.cmd +++ b/src/ext/Sql/sql.cmd | |||
@@ -9,13 +9,13 @@ | |||
9 | @echo Sql.wixext build %_C% | 9 | @echo Sql.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b |
16 | 16 | ||
17 | :: Pack | 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 | 19 | ||
20 | @popd | 20 | @popd |
21 | @endlocal | 21 | @endlocal |
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd index b119649e..67ee3810 100644 --- a/src/ext/UI/ui.cmd +++ b/src/ext/UI/ui.cmd | |||
@@ -20,13 +20,13 @@ | |||
20 | @echo UI.wixext build %_C% | 20 | @echo UI.wixext build %_C% |
21 | 21 | ||
22 | :: Build | 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 | 24 | ||
25 | :: Test | 25 | :: Test |
26 | :: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b | 26 | :: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b |
27 | 27 | ||
28 | :: Pack | 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 | 30 | ||
31 | @goto :end | 31 | @goto :end |
32 | 32 | ||
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd index 54ede2bf..3c66e7d8 100644 --- a/src/ext/Util/util.cmd +++ b/src/ext/Util/util.cmd | |||
@@ -20,7 +20,7 @@ | |||
20 | @echo Building ext\Util %_C% using %_N% | 20 | @echo Building ext\Util %_C% using %_N% |
21 | 21 | ||
22 | :: Build | 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 | 24 | ||
25 | :: Test | 25 | :: Test |
26 | dotnet test ^ | 26 | dotnet test ^ |
@@ -28,7 +28,7 @@ dotnet test ^ | |||
28 | --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b | 28 | --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b |
29 | 29 | ||
30 | :: Pack | 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 | 32 | ||
33 | @goto :end | 33 | @goto :end |
34 | 34 | ||
diff --git a/src/ext/VisualStudio/vs.cmd b/src/ext/VisualStudio/vs.cmd index 3d5cf015..f0873f1d 100644 --- a/src/ext/VisualStudio/vs.cmd +++ b/src/ext/VisualStudio/vs.cmd | |||
@@ -9,13 +9,13 @@ | |||
9 | @echo VisualStudio.wixext build %_C% | 9 | @echo VisualStudio.wixext build %_C% |
10 | 10 | ||
11 | :: Build | 11 | :: Build |
12 | msbuild -Restore -p:Configuration=%_C% || exit /b | 12 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b |
13 | 13 | ||
14 | :: Test | 14 | :: Test |
15 | dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b | 15 | dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b |
16 | 16 | ||
17 | :: Pack | 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 | 19 | ||
20 | @popd | 20 | @popd |
21 | @endlocal | 21 | @endlocal |
diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd index 18b7b418..40413f55 100644 --- a/src/internal/internal.cmd +++ b/src/internal/internal.cmd | |||
@@ -25,7 +25,7 @@ nuget restore || exit /b | |||
25 | :: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || 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 | 26 | :: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b |
27 | 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 | 29 | ||
30 | @goto :end | 30 | @goto :end |
31 | 31 | ||
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd index 51331459..d8b81f54 100644 --- a/src/libs/libs.cmd +++ b/src/libs/libs.cmd | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | @echo Building libs %_C% | 20 | @echo Building libs %_C% |
21 | 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 | 23 | ||
24 | dotnet test ^ | 24 | dotnet test ^ |
25 | %_B%\net6.0\WixToolsetTest.Versioning.dll ^ | 25 | %_B%\net6.0\WixToolsetTest.Versioning.dll ^ |
diff --git a/src/setup/setup.cmd b/src/setup/setup.cmd index 28982ad2..2bd82ebd 100644 --- a/src/setup/setup.cmd +++ b/src/setup/setup.cmd | |||
@@ -18,9 +18,9 @@ | |||
18 | @echo Building setup %_C% | 18 | @echo Building setup %_C% |
19 | 19 | ||
20 | :: Build | 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 | 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 | 24 | ||
25 | :: Publish | 25 | :: Publish |
26 | 26 | ||
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index 4d005da2..7303f736 100644 --- a/src/test/burn/test_burn.cmd +++ b/src/test/burn/test_burn.cmd | |||
@@ -13,8 +13,8 @@ | |||
13 | 13 | ||
14 | @echo Burn integration tests %_C% | 14 | @echo Burn integration tests %_C% |
15 | 15 | ||
16 | msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_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% -m -bl:%_L%\test_burn_data_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 | 18 | ||
19 | "%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe" | 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" | 20 | mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe" |
diff --git a/src/test/msi/test_msi.cmd b/src/test/msi/test_msi.cmd index 2a6f5831..2c734bd6 100644 --- a/src/test/msi/test_msi.cmd +++ b/src/test/msi/test_msi.cmd | |||
@@ -11,8 +11,8 @@ | |||
11 | 11 | ||
12 | @echo Msi integration tests %_C% | 12 | @echo Msi integration tests %_C% |
13 | 13 | ||
14 | msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_msi_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% -m -bl:%_L%\test_msi_data_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 | 16 | ||
17 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit | 17 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit |
18 | 18 | ||
diff --git a/src/tools/tools.cmd b/src/tools/tools.cmd index 2ec67f46..fe90cf07 100644 --- a/src/tools/tools.cmd +++ b/src/tools/tools.cmd | |||
@@ -20,10 +20,10 @@ | |||
20 | @echo Building tools %_C% | 20 | @echo Building tools %_C% |
21 | 21 | ||
22 | :: Build | 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 | 24 | ||
25 | :: Publish | 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 | 27 | ||
28 | :: Test | 28 | :: Test |
29 | dotnet test ^ | 29 | dotnet test ^ |
@@ -32,7 +32,7 @@ dotnet test ^ | |||
32 | --nologo -l "trx;LogFileName=%_L%\TestResults\tools.trx" || exit /b | 32 | --nologo -l "trx;LogFileName=%_L%\TestResults\tools.trx" || exit /b |
33 | 33 | ||
34 | :: Pack | 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 | 36 | ||
37 | @goto :end | 37 | @goto :end |
38 | 38 | ||
diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd index 7982fbea..e49cfd53 100644 --- a/src/wix/wix.cmd +++ b/src/wix/wix.cmd | |||
@@ -20,17 +20,17 @@ | |||
20 | @echo Building wix %_C% | 20 | @echo Building wix %_C% |
21 | 21 | ||
22 | :: Restore | 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 | 24 | ||
25 | 25 | ||
26 | :: Build | 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 | 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 | 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 | 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 | 34 | ||
35 | :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test | 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 | 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 | 49 | ||
50 | 50 | ||
51 | :: Pack | 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 | 53 | ||
54 | @goto :end | 54 | @goto :end |
55 | 55 | ||