Improve calling vswhere

Author: shivammathur

extension/BuildPhpExtension/private/Add-VS.ps1

@@ -33,7 +33,6 @@ function Add-Vs {
                     New-Item -Path $installerDir -ItemType Directory -Force | Out-Null
                 }
                 Get-File -Url $vsWhereUrl -OutFile $vswherePath
-                Add-Path $installerDir
             }
 
             $instances = & $vswherePath -products '*' -format json 2> $null | ConvertFrom-Json

extension/BuildPhpExtension/private/Get-VsVersionHelper.ps1

@@ -19,10 +19,12 @@ function Get-VsVersionHelper {
     begin {
     }
     process {
-        if($null -eq (Get-Command vswhere -ErrorAction SilentlyContinue)) {
+        $installerDir = Join-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio" 'Installer'
+        $vswherePath = Join-Path $installerDir 'vswhere.exe'
+        if (-not (Test-Path $vswherePath)) {
             throw "vswhere is not available"
         }
-        $MSVCDirectory = vswhere -latest -products * -find "VC\Tools\MSVC"
+        $MSVCDirectory = & $vswherePath -latest -products * -find "VC\Tools\MSVC"
         $selectedToolset = $null
         $minor = $null
         foreach ($toolset in (Get-ChildItem $MSVCDirectory)) {

php/BuildPhp/private/Add-VS.ps1

@@ -29,7 +29,6 @@ function Add-Vs {
                 New-Item -Path $installerDir -ItemType Directory -Force | Out-Null
             }
             Get-File -Url $vsWhereUrl -OutFile $vswherePath
-            Add-Path $installerDir
         }
 
         $instances = & $vswherePath -products '*' -format json 2> $null | ConvertFrom-Json

php/BuildPhp/private/Get-VsVersionHelper.ps1

@@ -19,10 +19,12 @@ function Get-VsVersionHelper {
     begin {
     }
     process {
-        if($null -eq (Get-Command vswhere -ErrorAction SilentlyContinue)) {
+        $installerDir = Join-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio" 'Installer'
+        $vswherePath = Join-Path $installerDir 'vswhere.exe'
+        if (-not (Test-Path $vswherePath)) {
             throw "vswhere is not available"
         }
-        $MSVCDirectory = vswhere -latest -products * -find "VC\Tools\MSVC"
+        $MSVCDirectory = & $vswherePath -latest -products * -find "VC\Tools\MSVC"
         $selectedToolset = $null
         $minor = $null
         foreach ($toolset in (Get-ChildItem $MSVCDirectory)) {