Update setup-runtime-dependencies.cmd to specify runtime explicitly

Commit migrated from https://github.com/dotnet/coreclr/commit/f408f842c44932dc5bf991d0d813d32678620b94

diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd
index 018c3e6..4f7e0c9 100644 (file)
--- a/src/coreclr/tests/runtest.cmd
+++ b/src/coreclr/tests/runtest.cmd
@@ -303,7 +303,7 @@ if defined __TestEnv call %__TestEnv%
 if defined COMPlus_GCStress set __Result=true
 endlocal & set __IsGCTest=%__Result%
 if "%__IsGCTest%"=="true" (
-    tests\setup-runtime-dependencies.cmd /arch %__BuildArch% /outputdir %CORE_ROOT%
+    call tests\setup-runtime-dependencies.cmd /arch %__BuildArch% /outputdir %CORE_ROOT%
     if errorlevel 1 (
         echo Failed to donwload runtime packages
         exit /b 1

diff --git a/src/coreclr/tests/setup-runtime-dependencies.cmd b/src/coreclr/tests/setup-runtime-dependencies.cmd
index f982d93..e1ec0f1 100755 (executable)
--- a/src/coreclr/tests/setup-runtime-dependencies.cmd
+++ b/src/coreclr/tests/setup-runtime-dependencies.cmd
@@ -78,26 +78,25 @@ REM ============================================================================
 REM Write dependency information to project.json
 echo { ^
     "dependencies": { ^
-    "Microsoft.NETCore.CoreDisTools": "1.0.0-prerelease-00001" ^
+    "runtime.win7-%__Arch%.Microsoft.NETCore.CoreDisTools": "1.0.0-prerelease-00001" ^
     }, ^
     "frameworks": { "dnxcore50": { } } ^
     } > "%__JasonFilePath%"
 
+echo Jason file: %__JasonFilePath%
+type "%__JasonFilePath%"
+
 REM Download the package
 echo Downloading CoreDisTools package
 set DOTNETCMD="%__DotNetCmd%" restore "%__JasonFilePath%" --source https://dotnet.myget.org/F/dotnet-core/ --packages "%__PackageDir%"
 echo %DOTNETCMD%
 call %DOTNETCMD%
 if errorlevel 1 goto Fail
-REM Get downloaded dll path
-FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s ^| findstr /R "runtime.win[0-9]*-%__Arch%"') DO set __LibPath=%%i
-if not exist "%__LibPath%" (
-    echo Failed to locate the downloaded library: %__LibPath%
-    goto Fail
-)
 
 REM Get downloaded dll path
-FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s') DO set __LibPath=%%i
+echo Locating coredistools.dll
+FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s ^| findstr /R "runtime.win[0-9]*-%__Arch%"') DO set __LibPath=%%i
+echo CoreDisTools library path: %__LibPath%
 if not exist "%__LibPath%" (
     echo Failed to locate the downloaded library: %__LibPath%
     goto Fail