@@ -4,17 +4,15 @@ setlocal enabledelayedexpansion
4
4
5
5
REM Use '$' as a variable name prefix to avoid MSBuild variable collisions with these variables
6
6
set $target = %1
7
- set $sdkVersion = %2
8
- set $runtimeVersion = %3
9
- set $queue = %4
10
- set $arch = %5
11
- set $quarantined = %6
12
- set $ef = %7
13
- set $aspnetruntime = %8
14
- set $aspnetref = %9
15
- REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more
16
- shift
7
+ set $runtimeVersion = %2
8
+ set $queue = %3
9
+ set $arch = %4
10
+ set $quarantined = %5
11
+ set $ef = %6
12
+ set $aspnetruntime = %7
13
+ set $aspnetref = %8
17
14
set $helixTimeout = %9
15
+ REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more
18
16
19
17
set DOTNET_ROOT = %HELIX_CORRELATION_PAYLOAD% \dotnet
20
18
set DOTNET_HOME = %DOTNET_ROOT%
@@ -24,7 +22,7 @@ set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home
24
22
25
23
set PATH = %DOTNET_ROOT% ;!PATH! ;%HELIX_CORRELATION_PAYLOAD% \node\bin
26
24
echo Set path to: %PATH%
27
- echo " Invoking InstallDotNet.ps1 %$arch% %$sdkVersion% %$ runtimeVersion% %DOTNET_ROOT% "
25
+ echo " Invoking InstallDotNet.ps1 %$arch% %$runtimeVersion% %DOTNET_ROOT% "
28
26
powershell.exe -NoProfile -ExecutionPolicy unrestricted -file InstallDotNet.ps1 %$arch% %$runtimeVersion% %DOTNET_ROOT%
29
27
30
28
dotnet --list-sdks
@@ -34,8 +32,8 @@ set exit_code=0
34
32
echo " Restore: dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --ignore-failed-sources..."
35
33
dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --ignore-failed-sources
36
34
37
- echo " Running tests: dotnet run --project RunTests\RunTests.csproj -- --target %$target% --sdk %$sdkVersion% -- runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout% ..."
38
- dotnet run --project RunTests\RunTests.csproj -- --target %$target% --sdk %$sdkVersion% -- runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%
35
+ echo " Running tests: dotnet run --project RunTests\RunTests.csproj -- --target %$target% --runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout% ..."
36
+ dotnet run --project RunTests\RunTests.csproj -- --target %$target% --runtime %$runtimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --ef %$ef% --aspnetruntime %$aspnetruntime% --aspnetref %$aspnetref% --helixTimeout %$helixTimeout%
39
37
if errorlevel neq 0 (
40
38
set exit_code = %errorlevel%
41
39
)
0 commit comments