Skip to content

Merge release -> master Release 1.2.1 #1776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 5, 2016
Merged

Merge release -> master Release 1.2.1 #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab21faf
Add back InstallExecuteSequence for custom actions - reinstate module…
markcowl Feb 4, 2016
079e789
Fixed OperationInsights help file
Feb 4, 2016
0f1bd8a
Update azurecmd.wxs
markcowl Feb 4, 2016
2674616
Merge pull request #1772 from hovsepm/release-1.2.1
markcowl Feb 4, 2016
0dc9981
Merge pull request #1771 from Azure/module-cleanup
markcowl Feb 4, 2016
868778e
Update azurecmd.wxs
markcowl Feb 5, 2016
74034ed
Update ChangeLog.md
markcowl Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 6 additions & 1 deletion setup/azurecmd.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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" />
Expand Down
7 changes: 0 additions & 7 deletions ...ts/Commands.OperationalInsights/Microsoft.Azure.Commands.OperationalInsights.dll-Help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down