Add support to use toolset in php-sdk-binary-tools

Author: shivammathur

extension-matrix/config/vs.json

@@ -10,19 +10,19 @@
     "type": "self-hosted"
   },
   "7.2": {
-    "vs": "2017",
-    "os": "windows-2016",
-    "type": "self-hosted"
+    "vs": "2019",
+    "os": "windows-2019",
+    "type": "github-hosted"
   },
   "7.3": {
-    "vs": "2017",
-    "os": "windows-2016",
-    "type": "self-hosted"
+    "vs": "2019",
+    "os": "windows-2019",
+    "type": "github-hosted"
   },
   "7.4": {
-    "vs": "2017",
-    "os": "windows-2016",
-    "type": "self-hosted"
+    "vs": "2019",
+    "os": "windows-2019",
+    "type": "github-hosted"
   },
   "8.0": {
     "vs": "2019",

extension/BuildPhpExtension/private/Add-BuildRequirements.ps1

@@ -14,6 +14,8 @@ function Add-BuildRequirements {
         Extension Thread Safety
     .PARAMETER VsVersion
         Visual Studio version
+    .PARAMETER VsToolset
+        Visual Studio toolset
     #>
     [OutputType()]
     param (
@@ -40,7 +42,11 @@ function Add-BuildRequirements {
         [Parameter(Mandatory = $true, Position=5, HelpMessage='Visual Studio version')]
         [ValidateNotNull()]
         [ValidateLength(1, [int]::MaxValue)]
-        [string] $VsVersion
+        [string] $VsVersion,
+        [Parameter(Mandatory = $true, Position=6, HelpMessage='Visual Studio toolset')]
+        [ValidateNotNull()]
+        [ValidateLength(1, [int]::MaxValue)]
+        [string] $VsToolset
     )
     begin {
     }
@@ -51,7 +57,8 @@ function Add-BuildRequirements {
                                       -PhpVersion $PhpVersion `
                                       -Arch $Arch `
                                       -Ts $Ts `
-                                      -VsVersion $VsVersion
+                                      -VsVersion $VsVersion `
+                                      -VsToolset $VsToolset
         $prefix = Get-PhpBuild -Config $config
         Get-PhpDevelBuild -Config $config
         Add-Dependencies -Config $config -Prefix $prefix

extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1

@@ -14,6 +14,8 @@ Function Get-ExtensionConfig {
         Extension Thread Safety
     .PARAMETER VsVersion
         Visual Studio version
+    .PARAMETER VsToolset
+        Visual Studio toolset
     #>
     [OutputType()]
     param(
@@ -40,7 +42,11 @@ Function Get-ExtensionConfig {
         [Parameter(Mandatory = $true, Position=5, HelpMessage='Visual Studio version')]
         [ValidateNotNull()]
         [ValidateLength(1, [int]::MaxValue)]
-        [string] $VsVersion
+        [string] $VsVersion,
+        [Parameter(Mandatory = $true, Position=6, HelpMessage='Visual Studio toolset')]
+        [ValidateNotNull()]
+        [ValidateLength(1, [int]::MaxValue)]
+        [string] $VsToolset
     )
     begin {
     }
@@ -62,6 +68,7 @@ Function Get-ExtensionConfig {
             arch = $Arch
             ts = $Ts
             vs_version = $VsVersion
+            vs_toolset = $VsToolset
             options = @()
             php_libraries = @()
             extension_libraries = @()

extension/BuildPhpExtension/private/Get-VsVersion.ps1

@@ -25,21 +25,25 @@ function Get-VsVersion {
             throw "vswhere is not available"
         }
         $MSVCDirectory = vswhere -latest -find "VC\Tools\MSVC"
-        $toolset = $null
+        $selectedToolset = $null
+        $minor = $null
         foreach ($toolset in (Get-ChildItem $MSVCDirectory)) {
             $toolsetMajorVersion, $toolsetMinorVersion = $toolset.Name.split(".")[0,1]
             $requiredVs = $VsConfig.vs.$VsVersion
             if ($requiredVs.major -eq $toolsetMajorVersion -and ($null -eq $requiredVs.minor -or $toolsetMinorVersion -le $requiredVs.minor)) {
-                $toolset = $toolset.Name
-                break
+                if($null -eq $minor -or $toolsetMinorVersion -gt $minor)
+                {
+                    $selectedToolset = $toolset.Name.Trim()
+                    $minor = $toolsetMinorVersion
+                }
             }
         }
-        if (-not $toolset) {
+        if (-not $selectedToolset) {
             throw "toolset not available"
         }
         return [PSCustomObject]@{
             vs = $VsVersion
-            toolset = $toolset
+            toolset = $selectedToolset
         }
     }
     end {

extension/BuildPhpExtension/private/Invoke-Build.ps1

@@ -31,7 +31,7 @@ Function Invoke-Build {
             $Config.vs_version,
             $Config.arch
         ) -join "-")
-        & $builder -t $task | Tee-Object -FilePath "build-$suffix.txt"
+        & $builder -s $Config.vs_toolset -t $task | Tee-Object -FilePath "build-$suffix.txt"
     }
     end {
     }

extension/BuildPhpExtension/public/Invoke-PhpBuildExtension.ps1

@@ -58,7 +58,8 @@ function Invoke-PhpBuildExtension {
                                         -PhpVersion $PhpVersion `
                                         -Arch $Arch `
                                         -Ts $Ts `
-                                        -VsVersion $VsData.vs
+                                        -VsVersion $VsData.vs `
+                                        -VsToolset $VsData.toolset
 
         Invoke-Build -Config $config