summaryrefslogtreecommitdiff
path: root/tests/setup-runtime-dependencies.cmd
diff options
context:
space:
mode:
authorSejong Oh <sejooh@microsoft.com>2016-04-03 06:27:55 -0700
committerSejong Oh <sejooh@microsoft.com>2016-04-03 10:18:45 -0700
commitf408f842c44932dc5bf991d0d813d32678620b94 (patch)
tree9640ddddb64261625637c1540093c748b2edfdf1 /tests/setup-runtime-dependencies.cmd
parent6eed833dd35ce5340c48055bf1e036588b80b798 (diff)
downloadcoreclr-f408f842c44932dc5bf991d0d813d32678620b94.tar.gz
coreclr-f408f842c44932dc5bf991d0d813d32678620b94.tar.bz2
coreclr-f408f842c44932dc5bf991d0d813d32678620b94.zip
Update setup-runtime-dependencies.cmd to specify runtime explicitly
Diffstat (limited to 'tests/setup-runtime-dependencies.cmd')
-rwxr-xr-xtests/setup-runtime-dependencies.cmd15
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/setup-runtime-dependencies.cmd b/tests/setup-runtime-dependencies.cmd
index f982d939c6..e1ec0f1de4 100755
--- a/tests/setup-runtime-dependencies.cmd
+++ b/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