Merge branch 'preview' of https://github.com/Azure/azure-powershell into remove-xml-help

# Conflicts:
#	src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
#	src/ResourceManager/Network/Commands.Network/Microsoft.Azure.Commands.Network.dll-Help.xml
#	src/ResourceManager/Sql/Commands.Sql/help/New-AzureRmSqlElasticPool.md

Author: cormacpayne

CONTRIBUTING.md

@@ -117,7 +117,7 @@ For Storage, this change log is located at `src\Storage\ChangeLog.md`.
 
 #### Breaking Changes
 
-Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell, see [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes.md).
+Breaking changes should **not** be introduced into the repository without giving customers at least six months notice. For a description of breaking changes in Azure PowerShell, see [here](https://github.com/Azure/azure-powershell/blob/dev/documentation/breaking-changes/breaking-changes-definition.md).
 
 Whenever a service team announces a breaking change, they must add it to the `upcoming-breaking-changes.md` file in their respective service folder. When the service team is ready to release the module with the breaking change, they must move the corresponding information from `upcoming-breaking-changes.md` into the `current-breaking-changes.md` file located in their service folder.
 
@@ -179,4 +179,4 @@ The following guidelines must be followed in pull requests that make changes to
 - Only one parameter should use `ValueFromPipeline` per parameter set; parameters from different parameter sets may have this attribute, but should not be convertible
 - No parameter is of type `object`
 - Each management cmdlet should have a parameter set that takes `ResourceGroupName` and `Name` from the pipeline by property value
-- For a given resource type, it should be possible to pipe the output of `Get` and `New` cmdlets to the input of `Set`, `Update`, `Remove` and other action cmdlets for that resource
+- For a given resource type, it should be possible to pipe the output of `Get` and `New` cmdlets to the input of `Set`, `Update`, `Remove` and other action cmdlets for that resource

README.md

@@ -7,6 +7,7 @@ This repository contains a set of PowerShell cmdlets for developers and administ
 * For documentation on how to build and deploy applications to Microsoft Azure please see the [Microsoft Azure Documentation Center](https://azure.microsoft.com/en-us/documentation/).
 * For comprehensive documentation on the developer cmdlets see [How to install and configure Azure PowerShell](https://azure.microsoft.com/en-us/documentation/articles/install-configure-powershell/).
 * For comprehensive documentation on the full set of Microsoft Azure cmdlets see [Microsoft Azure Management Center](http://go.microsoft.com/fwlink/?linkID=254459&clcid=0x409).
+* For suggesting improvements, join our improvement discussion ([#3692](https://github.com/Azure/azure-powershell/issues/3692)).
 
 ## Features
 

documentation/Using-Azure-TestFramework.md

@@ -17,10 +17,10 @@
 	1. This starts VS Dev command prompt in PowerShell
 2. Import module that helps in performing basic repository tasks
 	1. Import-Module Repo-Tasks.psd1
-	2. Type Get-Commands -Module Repo-Tasks to see list of cmdlets
+	2. Type Get-Command -Module Repo-Tasks to see list of cmdlets
 	3. Get-Help <CommandName> to get help on individual commands.
 
-## 2. Accquring TestFramework
+## 2. Acquiring TestFramework
 
 TestFramework is available on NuGet at https://www.nuget.org/packages/Microsoft.Rest.ClientRuntime.Azure.TestFramework/ .
 

src/Common/Commands.Common/Properties/Resources.resx

@@ -1472,11 +1472,11 @@ The file needs to be a PowerShell script (.ps1 or .psm1).</value>
     <value>Microsoft Azure PowerShell collects data about how users use PowerShell cmdlets and some problems they encounter.  Microsoft uses this information to improve our PowerShell cmdlets.  Participation is voluntary and when you choose to participate your device automatically sends information to Microsoft about how you use Azure PowerShell. 
 
 If you choose to participate, you can stop at any time by using Azure PowerShell as follows:
-1.	Use the Disable-AzureDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureResourceManager module
+1.	Use the Disable-AzureDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureRM.Profile module
 To disable data collection: PS &gt; Disable-AzureDataCollection
 
 If you choose to not participate, you can enable at any time by using Azure PowerShell as follows:
-1.	Use the Enable-AzureDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureResourceManager module
+1.	Use the Enable-AzureDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureRM.Profile module
 To enable data collection: PS &gt; Enable-AzureDataCollection
 
 Select Y to enable data collection [Y/N]:</value>

src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/Resources.resx

@@ -136,11 +136,11 @@
     <value>Microsoft Azure PowerShell collects data about how users use PowerShell cmdlets and some problems they encounter.  Microsoft uses this information to improve our PowerShell cmdlets.  Participation is voluntary and when you choose to participate your device automatically sends information to Microsoft about how you use Azure PowerShell. 
 
 If you choose to participate, you can stop at any time by using Azure PowerShell as follows:
-1.	Use the Disable-AzureDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureResourceManager module
+1.	Use the Disable-AzureDataCollection cmdlet to turn the feature Off. The cmdlet can be found in the AzureRM.Profile module
 To disable data collection: PS &gt; Disable-AzureDataCollection
 
 If you choose to not participate, you can enable at any time by using Azure PowerShell as follows:
-1.	Use the Enable-AzureDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureResourceManager module
+1.	Use the Enable-AzureDataCollection cmdlet to turn the feature On. The cmdlet can be found in the AzureRM.Profile module
 To enable data collection: PS &gt; Enable-AzureDataCollection
 
 Select Y to enable data collection [Y/N]:</value>

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindowsMD.json

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -52,6 +52,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.dll</HintPath>
     </Reference>
+    <Reference Include="AutoMapper.Net4, Version=3.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+    </Reference>
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
     </Reference>

src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* For `Import-AzureRMDataLakeStoreItem` and `Export-AzureRMDataLakeStoreItem` trace logging has been disabled by default to improve performance. If trace logging is desired please use the `-DiagnosticLogLevel` and `-DiagnosticLogPath` parameters
 
 ## Version 3.6.0
 * Add support for head and tail to the `Get-AzureRMDataLakeStoreItemContent` cmdlet. This enables returning the top N or last N new line delimited rows to be displayed.

src/ResourceManager/DataLakeStore/ChangeLog.md

@@ -18,6 +18,7 @@
 using Microsoft.Rest.Azure;
 using System.Management.Automation;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using Microsoft.Rest;
 
 namespace Microsoft.Azure.Commands.DataLakeStore
 {
@@ -148,6 +149,7 @@ public override void ExecuteCmdlet()
                     DataLakeStoreTraceLogger logger = null;
                     var originalLevel = AdalTrace.TraceSource.Switch.Level;
                     var originalLegacyLevel = AdalTrace.LegacyTraceSwitch.Level;
+                    var previousTracing = ServiceClientTracing.IsEnabled;
                     try
                     {
                         if (ParameterSetName.Equals(DiagnosticParameterSetName) && DiagnosticLogLevel != LogLevel.None)
@@ -156,6 +158,13 @@ public override void ExecuteCmdlet()
                             logger = new DataLakeStoreTraceLogger(this, diagnosticPath, DiagnosticLogLevel);
                         }
 
+                        if (logger == null)
+                        {
+                            // if the caller does not explicitly want logging, we will explicitly turn it off
+                            // for performance reasons
+                            ServiceClientTracing.IsEnabled = false;
+                        }
+
                         if (type == FileType.FILE)
                         {
                             DataLakeStoreFileSystemClient.CopyFile(powerShellReadyPath, Account, Path.TransformedPath, CmdletCancellationToken,
@@ -173,6 +182,8 @@ public override void ExecuteCmdlet()
                     }
                     finally
                     {
+                        // set service client tracing back always
+                        ServiceClientTracing.IsEnabled = previousTracing;
                         if (logger != null)
                         {
                             // dispose and free the logger.

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ExportAzureRmDataLakeStoreItem.cs

@@ -15,6 +15,7 @@
 using Microsoft.Azure.Commands.DataLakeStore.Models;
 using Microsoft.Azure.Commands.DataLakeStore.Properties;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using Microsoft.Rest;
 using System.IO;
 using System.Management.Automation;
 
@@ -153,6 +154,7 @@ public override void ExecuteCmdlet()
                     DataLakeStoreTraceLogger logger = null;
                     var originalLevel = AdalTrace.TraceSource.Switch.Level;
                     var originalLegacyLevel = AdalTrace.LegacyTraceSwitch.Level;
+                    var previousTracing = ServiceClientTracing.IsEnabled;
                     try
                     {
                         if (ParameterSetName.Equals(DiagnosticParameterSetName) && DiagnosticLogLevel != LogLevel.None)
@@ -161,6 +163,13 @@ public override void ExecuteCmdlet()
                             logger = new DataLakeStoreTraceLogger(this, diagnosticPath, DiagnosticLogLevel);                            
                         }
 
+                        if (logger == null)
+                        {
+                            // if the caller does not explicitly want logging, we will explicitly turn it off
+                            // for performance reasons
+                            ServiceClientTracing.IsEnabled = false;
+                        }
+
                         if (Directory.Exists(powerShellSourcePath))
                         {
                             DataLakeStoreFileSystemClient.CopyDirectory(
@@ -200,6 +209,8 @@ public override void ExecuteCmdlet()
                     }
                     finally
                     {
+                        // set service client tracing back always
+                        ServiceClientTracing.IsEnabled = previousTracing;
                         if (logger != null)
                         {
                             // dispose and free the logger.

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/ImportAzureRmDataLakeStoreItem.cs

@@ -26,7 +26,7 @@ public static class IotHubUtils
     {
         const string TotalDeviceCountMetricName = "TotalDeviceCount";
         const string UnlimitedString = "Unlimited";
-        const string IotHubConnectionStringTemplate = "HostName={0};ShareAccessKeyName={1};SharedAccessKey={2}";
+        const string IotHubConnectionStringTemplate = "HostName={0};SharedAccessKeyName={1};SharedAccessKey={2}";
 
         public static T2 ConvertObject<T1, T2>(T1 iotHubObject)
         {

src/ResourceManager/IotHub/Commands.IotHub/Common/IotHubUtils.cs

@@ -362,6 +362,15 @@ function Test_NewCertificatePolicy
     Assert-NotNull $policy
     $policy = New-AzureKeyVaultCertificatePolicy -SubjectName "CN=testCertificate" -Ekus "1.0","2.0" -SecretContentType application/x-pem-file -ReuseKeyOnRenewal -Disabled -RenewAtNumberOfDaysBeforeExpiry 10 -ValidityInMonths 10 -IssuerName Self -EmailAtNumberOfDaysBeforeExpiry 15
     Assert-NotNull $policy
+
+    $customEkus = @("1.0", "2.0")
+    $customKeyUsage = @("DecipherOnly", "KeyCertSign")
+    $policy = New-AzureKeyVaultCertificatePolicy -SubjectName "CN=testCertificate" -Ekus $customEkus -SecretContentType application/x-pem-file -ReuseKeyOnRenewal -Disabled -RenewAtNumberOfDaysBeforeExpiry 10 -ValidityInMonths 10 -IssuerName Self -KeyUsage $customKeyUsage
+    Assert-NotNull $policy
+    Assert-NotNull $policy.KeyUsage
+    Assert-True { Equal-OperationList $policy.KeyUsage $customKeyUsage }
+    Assert-NotNull $policy.Ekus
+    Assert-True { Equal-OperationList $policy.Ekus $customEkus }
 }
 
 <#

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/VaultCertificateTests.ps1

@@ -169,6 +169,7 @@ protected override void ProcessRecord()
                 var policy = new KeyVaultCertificatePolicy
                 {
                     DnsNames = DnsNames,
+                    KeyUsage = KeyUsage,
                     Ekus = Ekus,
                     Enabled = !Disabled.IsPresent,
                     IssuerName = IssuerName,

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/NewAzureKeyVaultCertificatePolicy.cs

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:

src/ResourceManager/Network/ChangeLog.md

@@ -182,6 +182,9 @@
     <None Include="Resources\NewAuthorizationRule.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Resources\NewNotificationHubNoTags.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\NHServiceTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.csproj

@@ -0,0 +1,4 @@
+{
+  "Name": "TestNh",
+  "Location": "South Central US"
+}

src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Resources/NewNotificationHubNoTags.json

@@ -481,6 +481,12 @@ function Test-CRUDNotificationHub
     Assert-AreEqual  $createdNotificationHub.WnsCredential.SecretKey $pnsCredentials.WnsCredential.SecretKey
     Assert-AreEqual  $createdNotificationHub.WnsCredential.WindowsLiveEndpoint $pnsCredentials.WnsCredential.WindowsLiveEndpoint
 
+	#Test NotificationHub creation with tags as null
+	$result = New-AzureRmNotificationHub -ResourceGroup $resourceGroupName -Namespace $namespaceName -InputFile .\Resources\NewNotificationHubNoTags.json
+	$createdNotificationHub = Get-AzureRmNotificationHub -ResourceGroup $resourceGroupName -Namespace $namespaceName -NotificationHub $notificationHubName
+    Assert-True {$createdNotificationHub.Count -eq 1}
+
+
     Write-Debug " Delete the NotificationHub"
     $delete1 = Remove-AzureRmNotificationHub -ResourceGroup $resourceGroupName -Namespace $namespaceName -NotificationHub $notificationHubName -Force
     $delete2 = Remove-AzureRmNotificationHub -ResourceGroup $resourceGroupName -Namespace $namespaceName -NotificationHub $notificationHubName2 -Force