Skip to content

Commit 1fda60d

Browse files
authored
Remove sdkVersion
1 parent a7bf17c commit 1fda60d

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

eng/helix/content/runtests.cmd

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ setlocal enabledelayedexpansion
44

55
REM Use '$' as a variable name prefix to avoid MSBuild variable collisions with these variables
66
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
1714
set $helixTimeout=%9
15+
REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more
1816

1917
set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\dotnet
2018
set DOTNET_HOME=%DOTNET_ROOT%
@@ -24,7 +22,7 @@ set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home
2422

2523
set PATH=%DOTNET_ROOT%;!PATH!;%HELIX_CORRELATION_PAYLOAD%\node\bin
2624
echo Set path to: %PATH%
27-
echo "Invoking InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET_ROOT%"
25+
echo "Invoking InstallDotNet.ps1 %$arch% %$runtimeVersion% %DOTNET_ROOT%"
2826
powershell.exe -NoProfile -ExecutionPolicy unrestricted -file InstallDotNet.ps1 %$arch% %$runtimeVersion% %DOTNET_ROOT%
2927

3028
dotnet --list-sdks
@@ -34,8 +32,8 @@ set exit_code=0
3432
echo "Restore: dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --ignore-failed-sources..."
3533
dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --ignore-failed-sources
3634

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%
3937
if errorlevel neq 0 (
4038
set exit_code=%errorlevel%
4139
)

0 commit comments

Comments
 (0)