Skip to content

Commit 8e3d439

Browse files
committed
Support also preview releases
But for now - only as a fallback if no other VS install could be found.
1 parent ebf3928 commit 8e3d439

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

bin/phpsdk_setshell.bat

+9-5
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,15 @@ if 15 gtr %PHP_SDK_VC_NUM% (
8080
rem vc15 support only for now, could parse out and pass on later
8181
for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
8282
if not exist "!PHP_SDK_VC_DIR!" (
83-
for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
84-
if not exist "!PHP_SDK_VC_DIR!" (
85-
echo Could not determine '%PHP_SDK_VC%' directory
86-
goto out_error;
87-
)
83+
for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
84+
if not exist "!PHP_SDK_VC_DIR!" (
85+
rem check for a preview release
86+
for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
87+
if not exist "!PHP_SDK_VC_DIR!" (
88+
echo Could not determine '%PHP_SDK_VC%' directory
89+
goto out_error;
90+
)
91+
)
8892
)
8993
set VSCMD_ARG_no_logo=nologo
9094
)

0 commit comments

Comments
 (0)