From 6753cdb189b36c11413b3bf1cdc10b2457978302 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 30 Jun 2020 17:11:59 -0700
Subject: [PATCH 1/3] Fix Preview Path

---
 assets/Product.wxs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index 86e0851754a..e042bb28f41 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -7,6 +7,11 @@
   <?define ProductName = "$(env.ProductName)" ?>
   <?define ProductSimpleVersionWithNameAndOptionalArchitecture = "$(var.ProductName) $(env.SimpleProductVersion) ($(sys.BUILDARCH))"?>
   <!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. -->
+  <?if $(var.IsPreview)=True?>
+    <?define PwshPath = "[VersionFolder]preview"?>
+  <?else?>
+    <?define PwshPath = "[VersionFolder]"?>
+  <?endif?>
   <?if $(sys.BUILDARCH)=x64?>
     <?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(env.SimpleProductVersion)"?>
     <?define UpgradeCodePreview = "39243d76-adaf-42b1-94fb-16ecf83237c8"?>
@@ -191,7 +196,7 @@
             <!-- add ourselves to %PATH% so pwsh.exe can be started from Windows PowerShell or cmd.exe -->
             <Component Id="SetPath">
               <Condition>ADD_PATH=1</Condition>
-              <Environment Id="PATH" Action="set" Name="PATH" Part="last" Permanent="no" System="yes" Value="[VersionFolder]"/>
+              <Environment Id="PATH" Action="set" Name="PATH" Part="last" Permanent="no" System="yes" Value="$(var.PwshPath)"/>
               <!-- Can't use a shared component GUID here either since the path we add to PATH varies on the actual directory path. Use a key that represents this same path. -->
               <RegistryKey Root="HKLM" Key="Software\Microsoft\PowerShellCore\InstalledVersions\$(var.UpgradeCode)">
                 <RegistryValue Type="string" Name="InstallDir" Value="[VersionFolder]" KeyPath="yes"/>

From 377ddc69bfa31760a120271282df72493cd6e727 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 30 Jun 2020 17:16:35 -0700
Subject: [PATCH 2/3] Update Product.wxs

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

diff --git a/assets/Product.wxs b/assets/Product.wxs
index e042bb28f41..2354fa80186 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -6,12 +6,12 @@
   <?define InfoURL="https://github.com/PowerShell/PowerShell" ?>
   <?define ProductName = "$(env.ProductName)" ?>
   <?define ProductSimpleVersionWithNameAndOptionalArchitecture = "$(var.ProductName) $(env.SimpleProductVersion) ($(sys.BUILDARCH))"?>
-  <!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. -->
   <?if $(var.IsPreview)=True?>
     <?define PwshPath = "[VersionFolder]preview"?>
   <?else?>
     <?define PwshPath = "[VersionFolder]"?>
   <?endif?>
+  <!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. -->
   <?if $(sys.BUILDARCH)=x64?>
     <?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(env.SimpleProductVersion)"?>
     <?define UpgradeCodePreview = "39243d76-adaf-42b1-94fb-16ecf83237c8"?>

From 65025f699ac44f5d1cf4f657fbd533ce446ff261 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 30 Jun 2020 17:19:17 -0700
Subject: [PATCH 3/3] Update msi.tests.ps1

---
 test/packaging/windows/msi.tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1
index 3189f13079b..d9541b74f06 100644
--- a/test/packaging/windows/msi.tests.ps1
+++ b/test/packaging/windows/msi.tests.ps1
@@ -138,7 +138,7 @@ Describe -Name "Windows MSI" -Fixture {
 
         It "MSI should have updated path" -Skip:(!(Test-Elevated)) {
             $psPath = ([System.Environment]::GetEnvironmentVariable('PATH', 'MACHINE')) -split ';' |
-                Where-Object {$_ -like '*files\powershell*' -and $_ -notin $beforePath}
+                Where-Object {$_ -like '*files\powershell*\preview*' -and $_ -notin $beforePath}
 
             $psPath | Should -Not -BeNullOrEmpty
         }