Merge pull request Azure#1781 from Azure/master

Marge master -> dev for 1.2.1 release

Author: Hovsep

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.

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)"
@@ -102,6 +102,11 @@
     <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="RemoveGalleryModules" After="CreateShortcuts">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" />

src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml

@@ -1374,7 +1374,6 @@ PS C:\>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