Cherry-picking some changes from stabilization into development (#5810)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

scripts/build/Platform/Windows/env_windows.cmd

@@ -7,6 +7,10 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
 REM
 
+REM To get recursive folder creation
+SETLOCAL EnableExtensions
+SETLOCAL EnableDelayedExpansion
+
 where /Q cmake
 IF NOT %ERRORLEVEL%==0 (
     ECHO [ci_build] CMake not found
@@ -28,6 +32,9 @@ IF NOT "%TMP%"=="" (
         SET TEMP=%cd%/temp
     )
 )
+IF NOT EXIST "!TMP!" (
+    MKDIR "!TMP!"
+)
 
 EXIT /b 0
 

scripts/build/Platform/Windows/installer_windows.cmd

@@ -20,8 +20,8 @@ PUSHD %OUTPUT_DIRECTORY%
 REM Override the temporary directory used by wix to the workspace (if we have a WORKSPACE_TMP)
 IF NOT "%WORKSPACE_TMP%"=="" (
     SET "WIX_TEMP=!WORKSPACE_TMP!/wix"
-    IF NOT EXIST "%WIX_TEMP%" (
-        MKDIR "%WIX_TEMP%"
+    IF NOT EXIST "!WIX_TEMP!" (
+        MKDIR "!WIX_TEMP!"
     )
 )