Issue #28573: Fixes issue with nested if blocks

diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat
index 189bef22f2a49f1b0a988c253685d67917a911eb..47e4715c278cc4828ae770a2b0bcec0dc3a4c0f4 100644 (file)
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@ -139,13 +139,13 @@ if not "%CERTNAME%" EQU "" (
 ) else (\r
     set CERTOPTS=\r
 )\r
-\r
+if not "%PGO%" EQU "" (\r
+    set PGOOPTS=--pgo-job "%PGO%"\r
+) else (\r
+    set PGOOPTS=\r
+)\r
 if not "%SKIPBUILD%" EQU "1" (\r
-    if "%PGO%" EQU "" (\r
-        set PGOOPTS=\r
-    ) else (\r
-        set PGOOPTS=--pgo --pgojob "%PGO%"\r
-    )\r
+    @echo call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -t %TARGET% %CERTOPTS% %PGOOPTS%\r
     @call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -t %TARGET% %CERTOPTS% %PGOOPTS%\r
     @if errorlevel 1 exit /B\r
     @rem build.bat turns echo back on, so we disable it again\r