Added host menu options for EXE / ZIP installation

Removed ARM64/AMD64 folders for dotnet, the Sandbox MUST match the host
here, so no point downloading the installer for the non-host platform.

Debugger could probably be reduced in the same manner, but have not in
this iteration.
Have also added a simple README, just to explain (very basic) operation.

Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>

1 files changed, 43 insertions, 24 deletions

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