diff options
author | Bevan Weiss <bevan.weiss@gmail.com> | 2024-06-27 18:34:50 +1000 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2024-07-04 19:25:49 -0400 |
commit | 596b4c4ae90b757b069a97ef40de67a7d1f9ab73 (patch) | |
tree | 18edf9a51f46ac0724180f1db5d3b0d368f4050c /src/test/sandbox/setup_sandbox.bat | |
parent | 83d92ef88270a740bc96609f8d967986e4f91e99 (diff) | |
download | wix-596b4c4ae90b757b069a97ef40de67a7d1f9ab73.tar.gz wix-596b4c4ae90b757b069a97ef40de67a7d1f9ab73.tar.bz2 wix-596b4c4ae90b757b069a97ef40de67a7d1f9ab73.zip |
No longer support downloading within the Sandbox. Just error instead.
Install both the x64 AND the x86 versions of Windows Desktop Runtime.
Needed for the Burn Integration tests.
And having dotnet files in the sandbox directory was annoying, so put
them all into an assets directory
Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
Diffstat (limited to 'src/test/sandbox/setup_sandbox.bat')
-rw-r--r-- | src/test/sandbox/setup_sandbox.bat | 27 |
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 @@ | |||
1 | @setlocal | 1 | @setlocal enabledelayedexpansion |
2 | @echo off | 2 | @echo off |
3 | SET DOTNET_VERSION=8.0 | 3 | SET DOTNET_VERSION=8.0 |
4 | 4 | ||
@@ -20,19 +20,28 @@ goto MENU | |||
20 | 20 | ||
21 | :EXE | 21 | :EXE |
22 | echo EXE> dotnet.cfg | 22 | echo EXE> dotnet.cfg |
23 | if not exist .\assets mkdir .\assets | ||
23 | if %PROCESSOR_ARCHITECTURE%=="ARM64" ( | 24 | if %PROCESSOR_ARCHITECTURE%=="ARM64" ( |
24 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.exe --output ".\dotnet-sdk.exe" | 25 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.exe --output ".\assets\dotnet-sdk-64.exe" |
26 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-arm64.exe --output ".\assets\windowsdesktop-runtime-64.exe" | ||
25 | ) else ( | 27 | ) else ( |
26 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.exe --output ".\dotnet-sdk.exe" | 28 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.exe --output ".\assets\dotnet-sdk-64.exe" |
29 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x86.exe --output ".\assets\windowsdesktop-runtime-x86.exe" | ||
30 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x64.exe --output ".\assets\windowsdesktop-runtime-64.exe" | ||
27 | ) | 31 | ) |
28 | goto VSDEBUG | 32 | goto VSDEBUG |
29 | 33 | ||
30 | :ZIP | 34 | :ZIP |
31 | echo ZIP> dotnet.cfg | 35 | echo ZIP> dotnet.cfg |
36 | if not exist .\assets mkdir .\assets | ||
32 | if %PROCESSOR_ARCHITECTURE%=="ARM64" ( | 37 | if %PROCESSOR_ARCHITECTURE%=="ARM64" ( |
33 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\dotnet-sdk.zip" | 38 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\assets\dotnet-sdk-64.zip" |
39 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-arm64.zip --output ".\assets\windowsdesktop-runtime-64.zip" | ||
34 | ) else ( | 40 | ) else ( |
35 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\dotnet-sdk.zip" | 41 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\assets\dotnet-sdk-64.zip" |
42 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x64.zip --output ".\assets\windowsdesktop-runtime-64.zip" | ||
43 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x86.zip --output ".\assets\dotnet-runtime-x86.zip" | ||
44 | curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/windowsdesktop-runtime-win-x86.zip --output ".\assets\windowsdesktop-runtime-x86.zip" | ||
36 | ) | 45 | ) |
37 | goto VSDEBUG | 46 | goto VSDEBUG |
38 | 47 | ||
@@ -49,15 +58,15 @@ if not "!VsInstallDir!"=="" ( | |||
49 | echo. | 58 | echo. |
50 | echo Have found VisualStudio Debugger at '%VsInstallDir%' | 59 | echo Have found VisualStudio Debugger at '%VsInstallDir%' |
51 | set /P "Confirm=Do you wish to copy it for use by the Sandbox? (Y / N):" | 60 | set /P "Confirm=Do you wish to copy it for use by the Sandbox? (Y / N):" |
52 | if "%Confirm%"=="Y" goto VSDEBUG_COPY | 61 | if "!Confirm!"=="Y" goto VSDEBUG_COPY |
53 | if "%Confirm%"=="y" goto VSDEBUG_COPY | 62 | if "!Confirm!"=="y" goto VSDEBUG_COPY |
54 | goto END | 63 | goto END |
55 | ) | 64 | ) |
56 | goto END | 65 | goto END |
57 | 66 | ||
58 | :VSDEBUG_COPY | 67 | :VSDEBUG_COPY |
59 | if not exist Debugger (mkdir Debugger) | 68 | if not exist ".\assets\Debugger" (mkdir ".\assets\Debugger") |
60 | XCOPY "%VsInstallDir%\Common7\IDE\Remote Debugger\*" ".\Debugger\" /E /Y > nul | 69 | XCOPY "%VsInstallDir%\Common7\IDE\Remote Debugger\*" ".\assets\Debugger\" /E /Y > nul |
61 | echo Debugger files copied | 70 | echo Debugger files copied |
62 | 71 | ||
63 | 72 | ||