Fix coredistools download script now that Packages layout has changed
authorRuss Keldorph <Russ.Keldorph@microsoft.com>
Fri, 8 Jun 2018 17:58:18 +0000 (10:58 -0700)
committerRuss Keldorph <russ.keldorph@microsoft.com>
Fri, 8 Jun 2018 22:27:19 +0000 (15:27 -0700)
Fixes #18321

tests/setup-stress-dependencies.cmd

index 0770e85..862fc65 100644 (file)
@@ -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 ^<TargetArch^> /outputdir ^<coredistools_lib_install_path^>
 echo.
-exit /b 1
\ No newline at end of file
+exit /b 1