1 files changed, 18 insertions, 9 deletions

diff --git a/src/test/sandbox/setup_sandbox.bat b/src/test/sandbox/setup_sandbox.bat
index dc462324..fac7ec4c 100644
--- a/src/test/sandbox/setup_sandbox.bat
+++ b/src/test/sandbox/setup_sandbox.bat
@@ -1,4 +1,4 @@
-@setlocal
+@setlocal enabledelayedexpansion
 @echo off
 SET DOTNET_VERSION=8.0
 
@@ -20,19 +20,28 @@ goto MENU
 
 :EXE
 echo EXE> dotnet.cfg
+if not exist .\assets mkdir .\assets
 if %PROCESSOR_ARCHITECTURE%=="ARM64" (
-        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.exe --output ".\dotnet-sdk.exe"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.exe --output ".\assets\dotnet-sdk-64.exe"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-arm64.exe --output ".\assets\windowsdesktop-runtime-64.exe"
 ) else (
-        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.exe --output ".\dotnet-sdk.exe"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.exe --output ".\assets\dotnet-sdk-64.exe"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x86.exe --output ".\assets\windowsdesktop-runtime-x86.exe"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x64.exe --output ".\assets\windowsdesktop-runtime-64.exe"
 )
 goto VSDEBUG
 
 :ZIP
 echo ZIP> dotnet.cfg
+if not exist .\assets mkdir .\assets
 if %PROCESSOR_ARCHITECTURE%=="ARM64" (
-        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\dotnet-sdk.zip"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\assets\dotnet-sdk-64.zip"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-arm64.zip --output ".\assets\windowsdesktop-runtime-64.zip"
 ) else (
-        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\dotnet-sdk.zip"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\assets\dotnet-sdk-64.zip"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x64.zip --output ".\assets\windowsdesktop-runtime-64.zip"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x86.zip --output ".\assets\dotnet-runtime-x86.zip"
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x86.zip --output ".\assets\windowsdesktop-runtime-x86.zip"
 )
 goto VSDEBUG
 
@@ -49,15 +58,15 @@ if not "!VsInstallDir!"=="" (
         echo.
         echo Have found VisualStudio Debugger at '%VsInstallDir%'
         set /P "Confirm=Do you wish to copy it for use by the Sandbox? (Y / N):"
-        if "%Confirm%"=="Y" goto VSDEBUG_COPY
-        if "%Confirm%"=="y" goto VSDEBUG_COPY
+        if "!Confirm!"=="Y" goto VSDEBUG_COPY
+        if "!Confirm!"=="y" goto VSDEBUG_COPY
         goto END
 )
 goto END
 
 :VSDEBUG_COPY
-if not exist Debugger (mkdir Debugger)
-XCOPY "%VsInstallDir%\Common7\IDE\Remote Debugger\*" ".\Debugger\" /E /Y > nul
+if not exist ".\assets\Debugger" (mkdir ".\assets\Debugger")
+XCOPY "%VsInstallDir%\Common7\IDE\Remote Debugger\*" ".\assets\Debugger\" /E /Y > nul
 echo Debugger files copied