3 files changed, 88 insertions, 40 deletions

diff --git a/src/test/sandbox/README b/src/test/sandbox/README
new file mode 100644
index 00000000..dd5a1e04
--- /dev/null
+++ b/src/test/sandbox/README
@@ -0,0 +1,2 @@
+1. Run setup_sandbox.bat from the Host, pick whether you want to use the EXE or the ZIP to install Dotnet.  The chosen option will be automatically downloaded.
+2. Once you have built Wix Toolset and wish to perform integration testing, you can just launch the Sandbox by double-clicking (or executing) TestSandbox.wsb
\ No newline at end of file
diff --git a/src/test/sandbox/setup_sandbox.bat b/src/test/sandbox/setup_sandbox.bat
index c4378f52..dc462324 100644
--- a/src/test/sandbox/setup_sandbox.bat
+++ b/src/test/sandbox/setup_sandbox.bat
@@ -2,20 +2,41 @@
 @echo off
 SET DOTNET_VERSION=8.0
 
-if not exist AMD64 (mkdir AMD64)
-if not exist ARM64 (mkdir ARM64)
-REM if not exist VSTest (mkdir VSTest)
-
-@echo on
-REM curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x64.zip --output ".\AMD64\dotnet-runtime.zip"
-curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\AMD64\dotnet-sdk.zip"
-REM curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-arm64.zip --output ".\ARM64\dotnet-runtime.zip"
-curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\ARM64\dotnet-sdk.zip"
-@echo off
+:MENU
+cls
+echo [0] Setup EXE install of DotNet for Sandbox
+echo [1] Setup ZIP install of DotNet for Sandbox
+echo [q] Quit
+set /P "Option=Please select install option: "
+if "%Option%"=="q" goto END
+if "%Option%"=="0" goto EXE
+if "%Option%"=="1" goto ZIP
+
+:MENUERROR
+cls
+echo ERROR: Invalid Option Selected!!
+pause
+goto MENU
+
+:EXE
+echo EXE> dotnet.cfg
+if %PROCESSOR_ARCHITECTURE%=="ARM64" (
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.exe --output ".\dotnet-sdk.exe"
+) else (
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.exe --output ".\dotnet-sdk.exe"
+)
+goto VSDEBUG
 
-REM curl -L0 https://aka.ms/vs/17/release/RemoteTools.amd64ret.enu.exe --output ".\AMD64\RemoteTools.exe"
-REM curl -L0 https://aka.ms/vs/17/release/RemoteTools.arm64ret.enu.exe --output ".\ARM64\RemoteTools.exe"
+:ZIP
+echo ZIP> dotnet.cfg
+if %PROCESSOR_ARCHITECTURE%=="ARM64" (
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\dotnet-sdk.zip"
+) else (
+        curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\dotnet-sdk.zip"
+)
+goto VSDEBUG
 
+:VSDEBUG
 for /f "usebackq tokens=*" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.VisualStudio.Debugger.Remote -property installationPath`) do (
   set VsInstallDir=%%i
 )
@@ -28,12 +49,18 @@ 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):"
-        echo Confirm = %Confirm%
-        @if "%Confirm%"=="Y" or "%Confirm%"="y" (
-                XCOPY "%VsInstallDir%\Common7\IDE\Remote Debugger\*" ".\Debugger\" /E /Y
-        )
+        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
+echo Debugger files copied
 
 
+:END
 pause
 @endlocal
diff --git a/src/test/sandbox/startup.bat b/src/test/sandbox/startup.bat
index ce0f2bbd..7b9b603f 100644
--- a/src/test/sandbox/startup.bat
+++ b/src/test/sandbox/startup.bat
@@ -1,28 +1,19 @@
 @setlocal
+@echo off
 SET DOTNET_VERSION=8.0
 SET SANDBOX_FILES=C:\sandbox
 
+set /p InstallMethod=<%SANDBOX_FILES%\dotnet.cfg
+
 pushd "%TEMP%"
+if "%InstallMethod%"=="EXE" goto EXE
+if "%InstallMethod%"=="ZIP" goto ZIP
+goto ERROR_NO_CONFIG
 
+:ZIP
 mkdir "%ProgramFiles%\dotnet"
-REM @if exist %SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-runtime.zip (
-REM     tar -oxzf "%SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-runtime.zip" -C "%ProgramFiles%\dotnet"
-REM ) else (
-REM     if %PROCESSOR_ARCHITECTURE%=="ARM64" (
-REM             curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-arm64.zip --output dotnet-runtime.zip
-REM     ) else (
-REM             curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x64.zip --output dotnet-runtime.zip
-REM     )
-REM     if %errorlevel% NEQ 0 (
-REM     echo No pre-provided dotnet runtime, and failed to download.  Confirm networking is available.
-REM     goto :ERROR
-REM     )
-REM     tar -oxzf dotnet-runtime.zip -C "%ProgramFiles%\dotnet"
-REM     del dotnet-runtime.zip
-REM )
-
-@if exist %SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-sdk.zip (
-        tar -oxzf "%SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-sdk.zip" -C "%ProgramFiles%\dotnet"
+if exist %SANDBOX_FILES%\dotnet-sdk.zip (
+        tar -oxzf "%SANDBOX_FILES%\dotnet-sdk.zip" -C "%ProgramFiles%\dotnet"
 ) else (
         if %PROCESSOR_ARCHITECTURE%=="ARM64" (
                 curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output dotnet-sdk.zip
@@ -31,21 +22,49 @@ REM )
         )
         if %errorlevel% NEQ 0 (
                 echo "No pre-provided dotnet sdk, and failed to download.  Confirm networking is available."
-                goto ERROR
+                goto ERROR_NO_DOTNET
         )
         tar -oxzf dotnet-sdk.zip -C "%ProgramFiles%\dotnet"
         del dotnet-sdk.zip
 )
+goto PROCEED
 
-@endlocal
+:EXE
+if exist %SANDBOX_FILES%\dotnet-sdk.exe (
+        "%SANDBOX_FILES%\dotnet-sdk.exe" /install /quiet /norestart
+) else (
+        if %PROCESSOR_ARCHITECTURE%=="ARM64" (
+                curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.exe --output dotnet-sdk.exe
+        ) else (
+                curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.exe --output dotnet-sdk.exe
+        )
+        if %errorlevel% NEQ 0 (
+                echo "No pre-provided dotnet sdk, and failed to download.  Confirm networking is available."
+                goto ERROR_NO_DOTNET
+        )
+        dotnet-sdk.exe /install /quiet /norestart
+)
+goto PROCEED
+
+:PROCEED
+endlocal
 SETX PATH "%PATH%;%ProgramFiles%\dotnet" /M
 SET PATH=%PATH%;%ProgramFiles%\dotnet
+
 dotnet nuget locals all --clear
 dotnet help
 
+popd
+cd c:\build
+start "Menu" cmd /c C:\sandbox\runtest_menu.bat
+goto END
 
-:ERROR
+:ERROR_NO_CONFIG
+start "ERROR" CMD /c echo ERROR: Host configuration has not been run, run setup_sandbox.bat first ^& pause
+goto END
 
-@popd
-cd c:\build
-start cmd /c C:\sandbox\runtest_menu.bat
+
+:ERROR_NO_DOTNET
+start "ERROR" CMD /c echo ERROR: Failed to find dotnet install, and download failed. Run setup_sandbox.bat again ^& pause
+
+:END