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/5] 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 079e789571996d0071c4281dd753c37836aa1723 Mon Sep 17 00:00:00 2001
From: Hovsep Mkrtchyan <hovsepm@microsoft.com>
Date: Thu, 4 Feb 2016 11:50:31 -0800
Subject: [PATCH 2/5] Fixed OperationInsights help file

---
 ...crosoft.Azure.Commands.OperationalInsights.dll-Help.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml
index 2f0f8da77c8c..9cf385d972c9 100644
--- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml
+++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml
@@ -1374,7 +1374,6 @@ PS C:\&gt;New-AzureRmOperationalInsightsStorageInsight –Workspace $Workspace 
         <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true(ByPropertyName)" position="4" aliases="none">
           <maml:name>Sku</maml:name>
           <maml:description>
-            <maml:para>Specifies the service tier of the workspace. Valid values are: 
             <maml:para>Specifies the service tier of the workspace. Valid values are:
 -- free
 -- standard
@@ -1472,7 +1471,6 @@ PS C:\&gt;New-AzureRmOperationalInsightsStorageInsight –Workspace $Workspace 
       <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true(ByPropertyName)" position="4" aliases="none">
         <maml:name>Sku</maml:name>
         <maml:description>
-          <maml:para>Specifies the service tier of the workspace. Valid values are: 
           <maml:para>Specifies the service tier of the workspace. Valid values are:
 -- free
 -- standard
@@ -1977,8 +1975,6 @@ PS C:\&gt;Remove-AzureRmOperationalInsightsStorageInsight –Workspace $Workspac
     </maml:relatedLinks>
   </command:command>
   <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
-<<<<<<< HEAD
-<!--Generated by PS Cmdlet Help Editor-->
 	<command:details>
 		<command:name>Set-AzureRmOperationalInsightsIntelligencePack</command:name>
 		<maml:description>
@@ -2153,8 +2149,6 @@ PS C:\&gt;Remove-AzureRmOperationalInsightsStorageInsight –Workspace $Workspac
 	</maml:relatedLinks>
   </command:command>
   <command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
-=======
->>>>>>> update the help.xml via content development
     <command:details>
       <command:name>Set-AzureRmOperationalInsightsStorageInsight</command:name>
       <maml:description>
@@ -2546,7 +2540,6 @@ PS C:\&gt;Set-AzureRmOperationalInsightsStorageInsight –Workspace $Workspace 
       <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="4" aliases="none">
         <maml:name>Sku</maml:name>
         <maml:description>
-          <maml:para>Specifies the service tier of the workspace. Valid values are: 
           <maml:para>Specifies the service tier of the workspace. Valid values are:
 -- free
 -- standard

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 3/5] 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>
 

From 868778e92063e396053659b6894bcdcd187bc710 Mon Sep 17 00:00:00 2001
From: Mark Cowlishaw <markcowl@microsoft.com>
Date: Thu, 4 Feb 2016 16:31:41 -0800
Subject: [PATCH 4/5] Update azurecmd.wxs

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

diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs
index cafe6dc099c4..199684b9e8ce 100644
--- a/setup/azurecmd.wxs
+++ b/setup/azurecmd.wxs
@@ -5,7 +5,7 @@
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="1.2.0" ?>
+  <?define version="1.2.1" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

From 74034ed985e6efe68b2cfc0158aee1c229c13cf3 Mon Sep 17 00:00:00 2001
From: Mark Cowlishaw <markcowl@microsoft.com>
Date: Thu, 4 Feb 2016 19:44:09 -0800
Subject: [PATCH 5/5] Update ChangeLog.md

---
 ChangeLog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 210d9da70c5f..5a5f0f612015 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,6 @@
+## 2016.02.04 version 1.2.1
+* Fix installer issue - remove PSGallery modules on install
+
 ## 2016.02.03 version 1.2.0
 * Azure RemoteApp: 
   * Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.