From ab21fafd226272772a562f538c94c5eadf10d176 Mon Sep 17 00:00:00 2001
From: Mark Cowlishaw <markcowl@microsoft.com>
Date: Thu, 4 Feb 2016 11:49:49 -0800
Subject: [PATCH 1/2] Add back InstallExecuteSequence for custom actions -
 reinstate module cleanup and execution policy update

---
 setup/azurecmd.wxs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs
index e25ce2bdf2f6..0ed54af05057 100644
--- a/setup/azurecmd.wxs
+++ b/setup/azurecmd.wxs
@@ -102,6 +102,12 @@
     <CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -WindowStyle Hidden -NonInteractive -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]SetExecutionPolicy.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
     <CustomAction Id="RemoveGalleryModules" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -WindowStyle Hidden -NonInteractive -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]RemoveGalleryModules.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
 
+    <InstallExecuteSequence>
+      <Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
+      <Custom Action="RemoveGalleryModules" After="SetCustomActionDataValue">NOT Installed</Custom>
+      <Custom Action="SetExecutionPolicy" After="RemoveGalleryModules">NOT Installed</Custom>
+    </InstallExecuteSequence>
+
     <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\media\License.rtf" />
     <UIRef Id="WixUI_Minimal" />
     <WixVariable Id="WixUIBannerBmp" Value="media\bannrbmp.bmp" />

From 0f1bd8aa6ff6804a15a5614b7f4f0697431b97aa Mon Sep 17 00:00:00 2001
From: Mark Cowlishaw <markcowl@microsoft.com>
Date: Thu, 4 Feb 2016 12:08:51 -0800
Subject: [PATCH 2/2] Update azurecmd.wxs

---
 setup/azurecmd.wxs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs
index 0ed54af05057..cafe6dc099c4 100644
--- a/setup/azurecmd.wxs
+++ b/setup/azurecmd.wxs
@@ -103,8 +103,7 @@
     <CustomAction Id="RemoveGalleryModules" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -WindowStyle Hidden -NonInteractive -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]RemoveGalleryModules.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
 
     <InstallExecuteSequence>
-      <Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
-      <Custom Action="RemoveGalleryModules" After="SetCustomActionDataValue">NOT Installed</Custom>
+      <Custom Action="RemoveGalleryModules" After="CreateShortcuts">NOT Installed</Custom>
       <Custom Action="SetExecutionPolicy" After="RemoveGalleryModules">NOT Installed</Custom>
     </InstallExecuteSequence>