From d2e2299a9ea141eaffc0f2c1bee0479e052dd7c7 Mon Sep 17 00:00:00 2001 From: Russ Keldorph Date: Fri, 8 Jun 2018 10:58:18 -0700 Subject: [PATCH] Fix coredistools download script now that Packages layout has changed Fixes #18321 --- tests/setup-stress-dependencies.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/setup-stress-dependencies.cmd b/tests/setup-stress-dependencies.cmd index 0770e85..862fc65 100644 --- a/tests/setup-stress-dependencies.cmd +++ b/tests/setup-stress-dependencies.cmd @@ -81,7 +81,7 @@ if errorlevel 1 goto Fail REM Get downloaded dll path 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 +FOR /F "delims=" %%i IN ('dir %__PackageDir%\coredistools.dll /b/s ^| findstr /R "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% @@ -114,4 +114,4 @@ echo. echo Usage: echo %__ThisScriptShort% /arch ^ /outputdir ^ echo. -exit /b 1 \ No newline at end of file +exit /b 1 -- 2.7.4