Skip to content

Commit a29a422

Browse files
committed
Improve vs runtime check
1 parent 96b20d8 commit a29a422

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

extension/BuildPhpExtension/config/vs.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,23 @@
1313
"vs" : {
1414
"vc14": {
1515
"major": 14,
16-
"minor": 9
16+
"minorMin": 0,
17+
"minorMax": 9
1718
},
1819
"vc15": {
1920
"major": 14,
20-
"minor": 19
21+
"minorMin": 10,
22+
"minorMax": 19
2123
},
2224
"vs16": {
2325
"major": 14,
24-
"minor": 29
26+
"minorMin": 20,
27+
"minorMax": 29
2528
},
2629
"vs17": {
2730
"major": 14,
28-
"minor": 42
31+
"minorMin": 30,
32+
"minorMax": null
2933
}
3034
}
3135
}

extension/BuildPhpExtension/private/Get-VsVersion.ps1

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ function Get-VsVersion {
3030
foreach ($toolset in (Get-ChildItem $MSVCDirectory)) {
3131
$toolsetMajorVersion, $toolsetMinorVersion = $toolset.Name.split(".")[0,1]
3232
$requiredVs = $VsConfig.vs.$VsVersion
33-
if ($requiredVs.major -eq $toolsetMajorVersion -and ($null -eq $requiredVs.minor -or $toolsetMinorVersion -le $requiredVs.minor)) {
34-
if($null -eq $minor -or $toolsetMinorVersion -gt $minor)
35-
{
33+
if ($requiredVs.major -eq $toolsetMajorVersion -and ($toolsetMinorVersion -ge $requiredVs.minorMin -and ($null -eq $requiredVs.minorMax -or $toolsetMinorVersion -le $requiredVs.minorMax))) {
34+
if($null -eq $minor -or $toolsetMinorVersion -gt $minor) {
3635
$selectedToolset = $toolset.Name.Trim()
3736
$minor = $toolsetMinorVersion
3837
}

0 commit comments

Comments
 (0)