merge head

Author: maddieclayton

.gitignore

@@ -14,6 +14,7 @@ msbuild.log
 # please do not commit any app.config files.
 app.config
 !src/ResourceManager/Profile/Commands.Profile.Test/App.config
+!src/Storage/Commands.Storage.Test/app.config
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

CONTRIBUTING.md

@@ -103,7 +103,7 @@ If you find yourself creating a pull request and are unable to see all the chang
 
 If splitting up the pull request is not an option, we recommend **creating individual commits for different parts of the pull request, which can be reviewed individually on GitHub**.
 
-For more information on cleaning up the commits in a pull request, such as how to rebase, squash, and cherry-pick, click [here](./documentation/cleaning-up-commits.md).
+For more information on cleaning up the commits in a pull request, such as how to rebase, squash, and cherry-pick, click [here](./documentation/development-docs/cleaning-up-commits.md).
 
 #### Updating the change log
 

ChangeLog.md

@@ -1,4 +1,57 @@
-## 5.3.0 - February 2018
+## 5.4.1 - February 2018
+#### AzureRM.Profile
+* Fix concurrent module import issue in PowerShell Workflow and Azure Automation
+
+## 5.4.0 - February 2018
+#### AzureRM.Automation
+* Added alias from New-AzureRmAutomationModule to Import-AzureRmAutomationModule
+
+#### AzureRM.Compute
+* Fix ErrorAction issue for some of Get cmdlets.
+
+#### AzureRM.ContainerInstance
+* Apply Azure Container Instance SDK 2018-02-01
+    - Support DNS name label
+
+#### AzureRM.DevTestLabs
+* Fixed all of the GET cmdlets which previously weren't working.
+
+#### AzureRM.EventHub
+* Fix bug in Get-AzureRmEventHubGeoDRConfiguration help
+
+#### AzureRM.Network
+* Added cmdlet to create a new connection monitor
+    - New-AzureRmNetworkWatcherConnectionMonitor
+* Added cmdlet to update a connection monitor
+    - Set-AzureRmNetworkWatcherConnectionMonitor
+* Added cmdlet to get connection monitor or connection monitor list
+    - Get-AzureRmNetworkWatcherConnectionMonitor
+* Added cmdlet to query connection monitor
+    - Get-AzureRmNetworkWatcherConnectionMonitorReport
+* Added cmdlet to start connection monitor
+    - Start-AzureRmNetworkWatcherConnectionMonitor
+* Added cmdlet to stop connection monitor
+    - Stop-AzureRmNetworkWatcherConnectionMonitor
+* Added cmdlet to remove connection monitor
+    - Remove-AzureRmNetworkWatcherConnectionMonitor
+* Updated Set-AzureRmApplicationGatewayBackendAddressPool documentation to remove deprecated example
+* Added EnableHttp2 flag to Application Gateway
+    - Updated New-AzureRmApplicationGateway: Added optional parameter -EnableHttp2
+* Add IpTags to PublicIpAddress
+    - Updated New-AzureRmPublicIpAddress: Added IpTags
+    - New-AzureRmPublicIpTag to add Iptag
+* Add DisableBgpRoutePropagation property in RouteTable and effectiveRoute.
+
+#### AzureRM.Resources
+* Register-AzureRmProviderFeature: Added missing example in the docs
+* Register-AzureRmResourceProvider: Added missing example in the docs
+
+#### AzureRM.Storage
+* Obsolete following parameters in new and set Storage Account cmdlets: EnableEncryptionService and DisableEncryptionService, since Encryption at Rest is enabled by default and can't be disabled.
+    - New-AzureRmStorageAccount
+    - Set-AzureRmStorageAccount
+
+## 5.3.0 - February 2018
 #### AzureRM.Profile
 * Added deprecation warning for PowerShell 3 and 4
 * 'Add-AzureRmAccount' has been renamed as 'Connect-AzureRmAccount'; an alias has been added for the old cmdlet name, and other aliases ('Login-AzAccount' and 'Login-AzureRmAccount') have been redirected to the new cmdlet name.

appveyor.yml

@@ -8,7 +8,7 @@ environment:
     secure: VMFbecLLHzDq/09YDPbcM0VDDSwwgY57vr5GXK6cZZ4Ti/Xs5RZoylzV8MMr1350
 
 before_build:
-  - ps: Get-Module -ListAvailable | where-Object {$_.Name -like “Azure*”} | Uninstall-Module -Verbose
+  - ps: Get-ChildItem -Path ("$env:programfiles" + "\WindowsPowerShell\Modules") | Where-Object { $_.FullName -match 'azure' } | foreach { Remove-Item $_.FullName -Recurse -Force }
   - ps: Install-Module -Name PowerShellGet -Force
   - ps: Install-Module -Name SplitPipeline -Force
   - ps: Install-Module -Name platyPS -Force

documentation/development-docs/azure-powershell-developer-guide.md

@@ -103,7 +103,7 @@ Another way to build the project is by using the `Repo-Tasks` module found in th
 1. In the `tools` folder of the repository, double-click `PS-VSPrompt.lnk`
     - This opens up a terminal that acts as PowerShell and VS Developer Command Prompt
 2. Run `Import-Module .\Repo-Tasks.psd1`
-    - This imports a [module containing cmdlets and functions that help with miscellaneous environment tasks](https://github.com/Azure/azure-powershell/blob/preview/documentation/Repo-Tasks-Module.md)
+    - This imports a [module containing cmdlets and functions that help with miscellaneous environment tasks](../testing-docs/repo-tasks-module.md)
 3. Run the `Start-Build` cmdlet to do a full build of the project
     - This builds each of the individual projects in the repository
 
@@ -252,7 +252,7 @@ All cmdlets that are created must have accompanying help that is displayed when
 
 Each cmdlet has a markdown file that contains the help content that is displayed in PowerShell; these markdown files are created (and maintained) using the platyPS module.
 
-For complete documentation, see [`help-generation.md`](https://github.com/Azure/azure-powershell/blob/preview/documentation/help-generation.md) in the `documentation` folder.
+For complete documentation, see [`help-generation.md`](./help-generation.md) in the `documentation` folder.
 
 ## Updating the Installer
 
@@ -280,7 +280,7 @@ _Note_: As mentioned in the prerequisites section, set the PowerShell [execution
 
 ## Using Azure TestFramework
 
-Please see our guide on [Using Azure TestFramework](https://github.com/Azure/azure-powershell/blob/preview/documentation/Using-Azure-TestFramework.md) for information on how to setup the appropriate connection string and record tests using the `Microsoft.Rest.ClientRuntime.Azure.TestFramework` package. 
+Please see our guide on [Using Azure TestFramework](../testing-docs/using-azure-test-framework.md) for information on how to setup the appropriate connection string and record tests using the `Microsoft.Rest.ClientRuntime.Azure.TestFramework` package. 
 
 ## Scenario Tests
 
@@ -291,7 +291,7 @@ Please see our guide on [Using Azure TestFramework](https://github.com/Azure/azu
     - If you are setting up a new project, set the post build event to the following:
         - `xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E`
     - Add a reference to any project that is to be tested
-- Create a ps1 file in the same folder that contains the actual tests ([see sample](https://github.com/Azure/azure-powershell/tree/preview/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests))
+- Create a ps1 file in the same folder that contains the actual tests ([see sample](../../src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests))
     - Use `Assert-AreEqual x y` to verify that values are the same
     - Use `Assert-AreNotEqual x y` to verify that values are not the same
     - Use `Assert-Throws scriptblock message` to verify an exception is being thrown
@@ -374,7 +374,7 @@ Create these environment variables for the AD scenario tests:
 
 ### Recording/Running Tests 
 
-- Set up environment variables using New-TestCredential as described [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/Using-Azure-TestFramework.md)
+- Set up environment variables using New-TestCredential as described [here](../testing-docs/using-azure-test-framework.md#new-testcredential)
 - [Run the test](#running-tests) and make sure you got a generated JSON file that matches the test name in the bin folder under the `SessionRecords` folder
 - Copy this `SessionRecords` folder and place it inside the test project
     - Inside Visual Studio, add all of the generated JSON files, making sure to change the "Copy to Output Directory" property for each one to "Copy if newer"
@@ -450,4 +450,4 @@ using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 [Parameter(Mandatory = false, HelpMessage = "The tiers of the plan")]
 [PSArgumentCompleter("Basic", "Premium", "Elite")]
 public string Tier { get; set; }
-```
+```

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="5.3.0" ?>
+  <?define version="5.4.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"