Fix adding vswhere

Author: shivammathur

extension/BuildPhpExtension/private/Add-VS.ps1

@@ -33,6 +33,7 @@ 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/BuildPhp.psd1

@@ -64,6 +64,7 @@
         # Private functions
         'Add-BuildRequirements',
         'Add-TestRequirements',
+        'Add-Path',
         'Add-Vs',
         'Get-File',
         'Get-OciSdk',

php/BuildPhp/private/Add-Path.ps1

@@ -0,0 +1,30 @@
+Function Add-Path {
+    <#
+    .SYNOPSIS
+        Add a directory to PATH environment variable.
+    .PARAMETER PathItem
+        The directory to add to PATH.
+    #>
+    [OutputType()]
+    param(
+        [Parameter(Mandatory = $true, Position=0, HelpMessage='Path to Add')]
+        [ValidateNotNull()]
+        [ValidateLength(1, [int]::MaxValue)]
+        [string] $PathItem
+    )
+    begin {
+    }
+    process {
+        $currentUserPath = [System.Environment]::GetEnvironmentVariable("PATH", [System.EnvironmentVariableTarget]::User)
+        $machinePath = [System.Environment]::GetEnvironmentVariable("PATH", [System.EnvironmentVariableTarget]::Machine)
+        $currentPath = $currentUserPath + ";" + $machinePath
+        if (-not($currentPath.Split(';').Contains(($PathItem + ";")))) {
+            $newUserPath = $PathItem + ";" + $currentUserPath
+            [System.Environment]::SetEnvironmentVariable("PATH", $newUserPath, [System.EnvironmentVariableTarget]::User)
+            $machinePath = [System.Environment]::GetEnvironmentVariable("PATH", [System.EnvironmentVariableTarget]::Machine)
+            $env:PATH = $newUserPath + ";" + $machinePath
+        }
+    }
+    end {
+    }
+}

php/BuildPhp/private/Add-VS.ps1

@@ -29,6 +29,7 @@ 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