From 669ffbe9f754fb87f7c857fff6d7e7753fa632eb Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 5 Feb 2026 16:07:03 -0800 Subject: Remove setlocal/endlocal that are messing up signing env vars --- src/api/api.cmd | 4 ++-- src/build_all.cmd | 4 ++-- src/build_init.cmd | 4 ++-- src/build_official.cmd | 4 ++-- src/burn/burn.cmd | 4 ++-- src/dtf/dtf.cmd | 4 ++-- src/ext/ext.cmd | 4 ++-- src/internal/finalize.cmd | 4 ++-- src/internal/internal.cmd | 4 ++-- src/libs/libs.cmd | 4 ++-- src/setup/setup.cmd | 4 ++-- src/test/burn/test_burn.cmd | 4 ++-- src/test/msi/test_msi.cmd | 4 ++-- src/test/test.cmd | 4 ++-- src/tools/tools.cmd | 4 ++-- src/wix/wix.cmd | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/api/api.cmd b/src/api/api.cmd index 42ca8567..1fc2a4eb 100644 --- a/src/api/api.cmd +++ b/src/api/api.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -52,4 +52,4 @@ dotnet test ^ :end @popd -@endlocal + diff --git a/src/build_all.cmd b/src/build_all.cmd index 7e9e7790..5d72a919 100644 --- a/src/build_all.cmd +++ b/src/build_all.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -97,4 +97,4 @@ exit /b 2 :LExit @popd -@endlocal + diff --git a/src/build_init.cmd b/src/build_init.cmd index 726d7b1c..9f36e5d0 100644 --- a/src/build_init.cmd +++ b/src/build_init.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 md ..\build\artifacts @@ -8,4 +8,4 @@ md ..\build\logs\TestResults msbuild -Restore internal\SetBuildNumber\SomeVerInit.verproj -nologo @popd -@endlocal + diff --git a/src/build_official.cmd b/src/build_official.cmd index 56c2a708..bc6a516c 100644 --- a/src/build_official.cmd +++ b/src/build_official.cmd @@ -1,7 +1,7 @@ -@setlocal + @pushd %~dp0 build_all.cmd Release Official @popd -@endlocal + diff --git a/src/burn/burn.cmd b/src/burn/burn.cmd index 059c948c..d9d78803 100644 --- a/src/burn/burn.cmd +++ b/src/burn/burn.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -41,4 +41,4 @@ dotnet test ^ :end @popd -@endlocal + diff --git a/src/dtf/dtf.cmd b/src/dtf/dtf.cmd index 1bdce2ef..9081bbff 100644 --- a/src/dtf/dtf.cmd +++ b/src/dtf/dtf.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -36,4 +36,4 @@ msbuild -Restore -t:Pack dtf.slnx -p:Configuration=%_C% -tl -nologo -m -warnaser :end @popd -@endlocal + diff --git a/src/ext/ext.cmd b/src/ext/ext.cmd index 86aac47b..9f813fbb 100644 --- a/src/ext/ext.cmd +++ b/src/ext/ext.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -13,4 +13,4 @@ msbuild ext_t.proj -p:Configuration=%_C% -p:SuppressWixClean=%_SuppressWixClean% -m -tl -nologo -warnaserror -bl:%_L%\ext_build.binlog || exit /b @popd -@endlocal + diff --git a/src/internal/finalize.cmd b/src/internal/finalize.cmd index bbd6f01a..1181aa78 100644 --- a/src/internal/finalize.cmd +++ b/src/internal/finalize.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -11,4 +11,4 @@ msbuild -Restore WixBuildFinalize\WixBuildFinalize.proj -p:Configuration=%_C% -nologo || exit /b @popd -@endlocal + diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd index 40413f55..8e8e2cb5 100644 --- a/src/internal/internal.cmd +++ b/src/internal/internal.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -41,4 +41,4 @@ msbuild internal_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ :end @popd -@endlocal + diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd index 97d2490b..4dd50eeb 100644 --- a/src/libs/libs.cmd +++ b/src/libs/libs.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -44,4 +44,4 @@ dotnet test ^ :end @popd -@endlocal + diff --git a/src/setup/setup.cmd b/src/setup/setup.cmd index 3c05d41a..0d8be1f5 100644 --- a/src/setup/setup.cmd +++ b/src/setup/setup.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -43,4 +43,4 @@ msbuild -Restore setup.slnx -p:Configuration=%_C% -tl -nologo -m -warnaserror -b :end @popd -@endlocal + diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index a956c838..ef1d93af 100644 --- a/src/test/burn/test_burn.cmd +++ b/src/test/burn/test_burn.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _RESULT=0 @@ -25,4 +25,4 @@ dotnet test -c %_C% WixToolsetTest.BurnE2E --nologo --no-build -l "trx;LogFileNa :LExit @popd -@endlocal + diff --git a/src/test/msi/test_msi.cmd b/src/test/msi/test_msi.cmd index 2c734bd6..f61da7dd 100644 --- a/src/test/msi/test_msi.cmd +++ b/src/test/msi/test_msi.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _RESULT=0 @@ -20,4 +20,4 @@ dotnet test -c %_C% WixToolsetTest.MsiE2E --nologo --no-build -l "trx;LogFileNam :LExit @popd -@endlocal + diff --git a/src/test/test.cmd b/src/test/test.cmd index 75ced392..d4d0a3cc 100644 --- a/src/test/test.cmd +++ b/src/test/test.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -17,4 +17,4 @@ dotnet test wix -c %_C% --nologo -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.WixE2ETests.trx" || exit /b @popd -@endlocal + diff --git a/src/tools/tools.cmd b/src/tools/tools.cmd index 1f2d1b9d..50548247 100644 --- a/src/tools/tools.cmd +++ b/src/tools/tools.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -30,4 +30,4 @@ msbuild -Restore tools_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror :end @popd -@endlocal + diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd index 7977c129..90c7e3b8 100644 --- a/src/wix/wix.cmd +++ b/src/wix/wix.cmd @@ -1,4 +1,4 @@ -@setlocal + @pushd %~dp0 @set _C=Debug @@ -75,4 +75,4 @@ msbuild pack_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\w :end @popd -@endlocal + -- cgit v1.2.3-55-g6feb