aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/test/sandbox/setup_sandbox.bat4
-rw-r--r--src/test/sandbox/startup.bat37
2 files changed, 22 insertions, 19 deletions
diff --git a/src/test/sandbox/setup_sandbox.bat b/src/test/sandbox/setup_sandbox.bat
index a3f0bbfe..c4378f52 100644
--- a/src/test/sandbox/setup_sandbox.bat
+++ b/src/test/sandbox/setup_sandbox.bat
@@ -7,9 +7,9 @@ if not exist ARM64 (mkdir ARM64)
7REM if not exist VSTest (mkdir VSTest) 7REM if not exist VSTest (mkdir VSTest)
8 8
9@echo on 9@echo on
10curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x64.zip --output ".\AMD64\dotnet-runtime.zip" 10REM curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x64.zip --output ".\AMD64\dotnet-runtime.zip"
11curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\AMD64\dotnet-sdk.zip" 11curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output ".\AMD64\dotnet-sdk.zip"
12curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-arm64.zip --output ".\ARM64\dotnet-runtime.zip" 12REM curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-arm64.zip --output ".\ARM64\dotnet-runtime.zip"
13curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\ARM64\dotnet-sdk.zip" 13curl -L0 https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output ".\ARM64\dotnet-sdk.zip"
14@echo off 14@echo off
15 15
diff --git a/src/test/sandbox/startup.bat b/src/test/sandbox/startup.bat
index f09feeba..ce0f2bbd 100644
--- a/src/test/sandbox/startup.bat
+++ b/src/test/sandbox/startup.bat
@@ -5,21 +5,21 @@ SET SANDBOX_FILES=C:\sandbox
5pushd "%TEMP%" 5pushd "%TEMP%"
6 6
7mkdir "%ProgramFiles%\dotnet" 7mkdir "%ProgramFiles%\dotnet"
8@if exist %SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-runtime.zip ( 8REM @if exist %SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-runtime.zip (
9 tar -oxzf "%SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-runtime.zip" -C "%ProgramFiles%\dotnet" 9REM tar -oxzf "%SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-runtime.zip" -C "%ProgramFiles%\dotnet"
10) else ( 10REM ) else (
11 if %PROCESSOR_ARCHITECTURE%=="ARM64" ( 11REM if %PROCESSOR_ARCHITECTURE%=="ARM64" (
12 curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-arm64.zip --output dotnet-runtime.zip 12REM curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-arm64.zip --output dotnet-runtime.zip
13 ) else ( 13REM ) else (
14 curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x64.zip --output dotnet-runtime.zip 14REM curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-runtime-win-x64.zip --output dotnet-runtime.zip
15 ) 15REM )
16 if %errorlevel$ NEQ 0 ( 16REM if %errorlevel% NEQ 0 (
17 echo No pre-provided dotnet runtime, and failed to download. Confirm networking is available. 17REM echo No pre-provided dotnet runtime, and failed to download. Confirm networking is available.
18 goto :ERROR 18REM goto :ERROR
19 ) 19REM )
20 tar -oxzf dotnet-runtime.zip -C "%ProgramFiles%\dotnet" 20REM tar -oxzf dotnet-runtime.zip -C "%ProgramFiles%\dotnet"
21 del dotnet-runtime.zip 21REM del dotnet-runtime.zip
22) 22REM )
23 23
24@if exist %SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-sdk.zip ( 24@if exist %SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-sdk.zip (
25 tar -oxzf "%SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-sdk.zip" -C "%ProgramFiles%\dotnet" 25 tar -oxzf "%SANDBOX_FILES%\%PROCESSOR_ARCHITECTURE%\dotnet-sdk.zip" -C "%ProgramFiles%\dotnet"
@@ -27,9 +27,12 @@ mkdir "%ProgramFiles%\dotnet"
27 if %PROCESSOR_ARCHITECTURE%=="ARM64" ( 27 if %PROCESSOR_ARCHITECTURE%=="ARM64" (
28 curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output dotnet-sdk.zip 28 curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-arm64.zip --output dotnet-sdk.zip
29 ) else ( 29 ) else (
30 curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output dotnet-runtime.zip 30 curl -L https://aka.ms/dotnet/%DOTNET_VERSION%/dotnet-sdk-win-x64.zip --output dotnet-sdk.zip
31 )
32 if %errorlevel% NEQ 0 (
33 echo "No pre-provided dotnet sdk, and failed to download. Confirm networking is available."
34 goto ERROR
31 ) 35 )
32 if %errorlevel$ NEQ 0 echo "No pre-provided dotnet sdk, and failed to download. Confirm networking is available." goto exit
33 tar -oxzf dotnet-sdk.zip -C "%ProgramFiles%\dotnet" 36 tar -oxzf dotnet-sdk.zip -C "%ProgramFiles%\dotnet"
34 del dotnet-sdk.zip 37 del dotnet-sdk.zip
35) 38)