From d27be7b59615c1641fe7b61d16e6d3b4e2469702 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 20 Mar 2018 14:51:04 -0700
Subject: [PATCH 1/3] fix path value to current path variable fixes #6440

---
 assets/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index 873dd11dabd..0054862dcd5 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -165,7 +165,7 @@
             </Component>
             <!-- add ourselves to %PATH% so pwsh.exe can be started from Windows PowerShell or cmd.exe -->
             <Component Id="SetPath" Guid="{9dbb7763-7baf-48e7-b025-3bdedcb0632f}" KeyPath="yes">
-              <Environment Id="PATH" Action="set" Name="PATH" Part="last" Permanent="no" System="yes" Value="[$(var.ProductVersionWithName)]"/>
+              <Environment Id="PATH" Action="set" Name="PATH" Part="last" Permanent="no" System="yes" Value="[$(var.ProductDirectoryName)]"/>
             </Component>
             <!-- Explorer context menu with 2 submenus to open PowerShell normally or as an Administator.
                  See https://blogs.msdn.microsoft.com/andrew_richards/2017/03/01/enhancing-the-open-command-prompt-here-shift-right-click-context-menu-experience/ for details -->

From a313ac000ad54443bfb149437f31734b01ef543a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 20 Mar 2018 15:00:40 -0700
Subject: [PATCH 2/3] Add verification that path was updated

---
 tools/appveyor.psm1 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
index a0d0c144277..f7ca150458b 100644
--- a/tools/appveyor.psm1
+++ b/tools/appveyor.psm1
@@ -486,6 +486,16 @@ function Invoke-AppveyorFinish
             $preReleaseVersion = "$previewPrefix-$previewLabel.$env:APPVEYOR_BUILD_NUMBER"
         }
 
+        # Save any powerShell paths, so we can exclude them
+        # When we verify we updated the path
+        $beforePath = @(([System.Environment]::GetEnvironmentVariable('PATH','MACHINE')) -split ';' |
+            Where-Object {$_ -like '*files\powershell*'})
+
+        foreach($pathPart in $beforePath)
+        {
+            Write-Log "Found existing PowerShell path: $pathPart"
+        }
+
         # Smoke Test MSI installer
         Write-Log "Smoke-Testing MSI installer"
         $msi = $artifacts | Where-Object { $_.EndsWith(".msi")}
@@ -499,6 +509,15 @@ function Invoke-AppveyorFinish
         }
         Write-Log "MSI smoke test was successful"
 
+        # Verify path was updated by MSI
+        $psPath = ([System.Environment]::GetEnvironmentVariable('PATH','MACHINE')) -split ';' |
+            Where-Object {$_ -like '*files\powershell*' -and $_ -notin $beforePath}
+
+        if(!$psPath)
+        {
+            throw "MSI did not add powershell to path"
+        }
+
         # only publish assembly nuget packages if it is a daily build and tests passed
         if((Test-DailyBuild) -and $env:TestPassed -eq 'True')
         {

From d83233f7a40caf6d6d65583d1df2e2cc71510f84 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 20 Mar 2018 18:30:23 -0700
Subject: [PATCH 3/3] [package] address PR feedback

---
 tools/appveyor.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
index f7ca150458b..54b1c5fc569 100644
--- a/tools/appveyor.psm1
+++ b/tools/appveyor.psm1
@@ -486,7 +486,7 @@ function Invoke-AppveyorFinish
             $preReleaseVersion = "$previewPrefix-$previewLabel.$env:APPVEYOR_BUILD_NUMBER"
         }
 
-        # Save any powerShell paths, so we can exclude them
+        # Save any PowerShell paths, so we can exclude them
         # When we verify we updated the path
         $beforePath = @(([System.Environment]::GetEnvironmentVariable('PATH','MACHINE')) -split ';' |
             Where-Object {$_ -like '*files\powershell*'})