4 files changed, 80 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 1c980eac..6f1866b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -409,3 +409,6 @@ src/test/burn/TestData/Manual/BundleB/PackagePayloads
 # Allow the projects that end in ".Cab"
 !src/dtf/test/WixToolset.Dtf.Compression.Cab
 !src/dtf/test/WixToolsetTests.Dtf.Compression.Cab
+
+#ignore the Sandbox
+src/test/sandbox/
diff --git a/src/test/sandbox/runtest_menu.bat b/src/test/sandbox/runtest_menu.bat
new file mode 100644
index 00000000..275199fe
--- /dev/null
+++ b/src/test/sandbox/runtest_menu.bat
@@ -0,0 +1,51 @@
+@setlocal EnableDelayedExpansion
+@echo off
+
+for /f "tokens=2 delims=[]" %%a in ('ping -n 1 -4 ""') do set IPAddr=%%a
+@if %PROCESSOR_ARCHITECTURE%=="ARM64" (
+        @if exist C:\sandbox\Debugger\ARM64\msvsmon.exe (
+                set MsVsMonPath=C:\sandbox\Debugger\ARM64\msvsmon.exe
+        )
+) else (
+        @if exist C:\sandbox\Debugger\x64\msvsmon.exe (
+                set MsVsMonPath=C:\sandbox\Debugger\x64\msvsmon.exe
+        )
+)
+
+:TestSelect
+cls
+REM Show the test select menu
+set index=0
+if not "%MsVsMonPath%"=="" (
+        echo [!index!] Run Remote Debugger SandboxIP=%IPAddr%
+        set "option[!index!]=%MsVsMonPath%"
+)
+
+for /f %%i in ('where /R c:\build runtests.cmd') do (
+  set /A "index+=1"
+  echo [!index!] %%i
+  set "option[!index!]=%%i!"
+)
+echo [q] Quit
+
+set /P "SelectTest=Please Choose The Test You Want To Execute: "
+if "%SelectTest%"=="q" Goto End
+if defined option[%SelectTest%] Goto TestSet
+
+:TestError
+cls
+Echo ERROR: Invalid Test Selected!!
+pause
+goto TestSelect
+
+:TestSet
+set "TestIs=!option[%SelectTest%]!"
+for %%a in (%TestIs%) do set FileDir=%%~dpa
+for %%a in (%TestIs%) do set FileName=%%~nxa
+start /D %FileDir% %FileName%
+if %SelectTest%==0 (
+goto TestSelect
+)
+
+:End
+@endlocal
\ No newline at end of file
diff --git a/src/test/sandbox/setup_sandbox.bat b/src/test/sandbox/setup_sandbox.bat
index f74e7535..235f6724 100644
--- a/src/test/sandbox/setup_sandbox.bat
+++ b/src/test/sandbox/setup_sandbox.bat
@@ -1,16 +1,36 @@
 @setlocal
-@SET DOTNET_VERSION=8.0
+@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)
+if not exist AMD64 (mkdir AMD64)
+if not exist ARM64 (mkdir ARM64)
+REM if not exist VSTest (mkdir VSTest)
 
+@echo on
 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"
 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
 
-REM "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -prerelease
+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"
 
+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
+)
+if "!VsInstallDir!"=="" (
+        for /f "usebackq tokens=*" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -prerelease -latest -requires Microsoft.VisualStudio.Debugger.Remote -property installationPath`) do (
+          set VsInstallDir=%%i
+        )
+)
+if "!VsInstallDir!"=="" (
+        set /P "Confirm=Have found VisualStudio Debugger at '%VsInstallDir%', Do you wish to copy it for use by the Sandbox? (Y / N):"
+        if "%Confirm%"=="Y" (
+                XCOPY "%VsInstallDir%\Common7\IDE\Remote Debugger\*" ".\Debugger\" /E
+        )
+)
 
+
+pause
 @endlocal
diff --git a/src/test/sandbox/startup.bat b/src/test/sandbox/startup.bat
index 0f1b33d8..f09feeba 100644
--- a/src/test/sandbox/startup.bat
+++ b/src/test/sandbox/startup.bat
@@ -45,4 +45,4 @@ dotnet help
 
 @popd
 cd c:\build
-start cmd
+start cmd /c C:\sandbox\runtest_menu.bat