fix merge conflicts

Author: blueww

.azure-pipelines/daily-build.yml

@@ -0,0 +1,28 @@
+# Please don't use ADO UI defined scheduled triggers because it takes precedence over YAML scheduled triggers.
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/scheduled-triggers
+schedules:
+- cron: "0 0 * * *"
+  displayName: Daily Midnight Build
+  branches:
+    include:
+    - master
+
+pr: none
+
+pool:
+  vmImage: 'windows-2019'
+
+steps:
+- task: DotNetCoreCLI@2
+  displayName: Build for Version Bump
+  inputs:
+    command: 'custom'
+    custom: 'msbuild'
+    arguments: 'build.proj'
+
+- task: ComponentGovernanceComponentDetection@0
+  displayName: Component Detection
+  inputs:
+    scanType: 'Register'
+    verbosity: 'Normal'
+    alertWarningLevel: 'High'

.azure-pipelines/powershell-core.yml

@@ -63,7 +63,7 @@ jobs:
   displayName: Test
   dependsOn: Build
   condition: succeeded()
-  timeoutInMinutes: 120
+  timeoutInMinutes: 180
   strategy:
     matrix:
       windows:

.azure-pipelines/util/publish-artifacts-steps.yml

@@ -7,4 +7,4 @@ steps:
   inputs:
     artifactName: ${{ parameters.artifactName }}
     targetPath: artifacts
-  condition: succeededOrFailed()
+  condition: always()

.azure-pipelines/util/test-steps.yml

@@ -9,6 +9,18 @@ steps:
   parameters:
     osName: ${{ parameters.osName }}
 
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk'
+  inputs:
+    packageType: sdk
+    version: 2.1.x
+
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk'
+  inputs:
+    packageType: sdk
+    version: 3.1.x
+
 - task: DotNetCoreCLI@2
   displayName: Test
   inputs:

ChangeLog.md

@@ -1,3 +1,75 @@
+## 4.5.0 - August 2020
+#### Az.Accounts
+* Updated 'Connect-AzAccount' to accept parameter 'MaxContextPopulation' [#9865]
+* Updated SubscriptionClient version to 2019-06-01 and display tenant domains [#9838]
+* Supported home tenant and managedBy tenant information of subscription
+* Corrected module name, version info in telemetry data
+* Adjusted SqlDatabaseDnsSuffix and ServiceManagementUrl if environment metadata endpoint returns incompatible value
+
+#### Az.Aks
+* Removed 'ClientIdAndSecret' to 'ServicePrincipalIdAndSecret' and set 'ClientIdAndSecret' as an alias [#12381].
+* Removed 'Get-AzAks'/'New-AzAks'/'Remove-AzAks'/'Set-AzAks' to 'Get-AzAksCluster'/'New-AzAksCluster'/'Remove-AzAksCluster'/'Set-AzAksCluster' and set the original ones as alias [#12373].
+
+#### Az.ApiManagement
+* Added new 'Add-AzApiManagementApiToGateway' cmdlet.
+* Added new 'Get-AzApiManagementGateway' cmdlet.
+* Added new 'Get-AzApiManagementGatewayHostnameConfiguration' cmdlet.
+* Added new 'Get-AzApiManagementGatewayKey' cmdlet.
+* Added new 'New-AzApiManagementGateway' cmdlet.
+* Added new 'New-AzApiManagementGatewayHostnameConfiguration' cmdlet.
+* Added new 'New-AzApiManagementResourceLocationObject' cmdlet.
+* Added new 'Remove-AzApiManagementApiFromGateway' cmdlet.
+* Added new 'Remove-AzApiManagementGateway' cmdlet.
+* Added new 'Remove-AzApiManagementGatewayHostnameConfiguration' cmdlet.
+* Added new 'Update-AzApiManagementGateway' cmdlet.
+* Added new optional [-GatewayId] parameter to the 'Get-AzApiManagementApi' cmdlet.
+
+#### Az.CognitiveServices
+* Used 'Deny' specifically as NetworkRules default action.
+
+#### Az.FrontDoor
+* Fixed an issue where an exception is being thrown when Enum.Parse tries to coerce a null value to an Enabled or Disabled enum values [#12344]
+
+#### Az.HDInsight
+* Supported creating cluster with encryption in transit feature.
+    - Add new parameter 'EncryptionInTransit' to the cmdlet 'New-AzHDInsightCluster'
+	- Add new parameter 'EncryptionInTransit' to the cmdlet 'New-AzHDInsightClusterConfig'
+* Supported creating cluster with private link feature:
+    - Add new parameter 'PublicNetworkAccessType' and 'OutboundPublicNetworkAccessType' to the cmdlet 'New-AzHDInsightCluster'
+    - Add new parameter 'PublicNetworkAccessType' and 'OutboundPublicNetworkAccessType' to the cmdlet 'New-AzHDInsightClusterConfig'
+* Returned virtual network information when calling 'New-AzHDInsightCluster' or 'Get-AzHDInsightCluster'
+
+#### Az.Network
+* Added support for AddressPrefixType parameter to 'Remove-AzExpressRouteCircuitConnectionConfig'
+* Added non-breaking changes: PeerAddressType functionality for Private Peering in 'Remove-AzExpressRouteCircutPeeringConfig'.
+* Code changed to ignore case for AddressPrefixType and PeerAddressType parameter.
+* Modified the warning message for 'New-AzLoadBalancerFrontendIpConfig', 'New-AzPublicIpAddress' and 'New-AzPublicIpPrefix'.
+
+#### Az.OperationalInsights
+* Added '-ForceDelete' option for 'Remove-AzOperationalInsightsworkspace'
+* Added new cmdlet 'Get-AzOperationalInsightsDeletedWorkspace'
+* Added new cmdlet 'Restore-AzOperationalInsightsWorkspace'
+
+#### Az.RecoveryServices
+* Improved the Azure Backup container/item discovery experience.
+
+#### Az.Resources
+* Added properties 'Condition', 'ConditionVersion' and 'Description' to 'New-AzRoleAssignment'
+    - This included all the relevant changes to the data models
+
+#### Az.Sql
+* Fixed potential server name case insensitive error in 'New-AzSqlServer' and 'Set-AzSqlServer'
+* Fixed wrong database name returned on existing database error in 'New-AzSqlDatabaseSecondary'
+
+#### Az.Storage
+* Supported create container/blob Sas token with new permission x,t
+    -  'New-AzStorageBlobSASToken'
+    -  'New-AzStorageContainerSASToken'
+* Supported create account Sas token with new permission x,t,f
+    -  'New-AzStorageAccountSASToken'
+* Supported get single file share usage
+    - 'Get-AzRmStorageShare'
+
 ## 4.4.0 - July 2020
 #### Az.Accounts
 * Added new cmdlet 'Invoke-AzRestMethod'

build.proj

@@ -100,7 +100,12 @@
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(MSBuildThisFileDirectory) -Recurse -Include 'bin','obj','TestResults' | Remove-Item -Recurse -Force -ErrorAction Ignore&quot;" IgnoreExitCode="true" />
   </Target>
 
-  <Target Name="FilterBuild" Condition="$(PullRequestNumber) != '' OR $(TargetModule) != ''">
+  <Target Name="BuildTools">
+    <!-- Publish static analysis for use cross-platform -->
+    <Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration) -f netcoreapp2.1" />
+  </Target>
+
+  <Target Name="FilterBuild" Condition="$(PullRequestNumber) != '' OR $(TargetModule) != ''" DependsOnTargets="BuildTools">
     <Message Importance="high" Text="Filtering projects and modules..." />
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/CreateFilterMappings.ps1&quot;" />
 
@@ -175,15 +180,12 @@
     <!-- Build version controller -->
     <Exec Command="dotnet build $(RepoTools)VersionController/VersionController.Netcore.csproj -c $(Configuration)" />
 
-    <!-- Publish static analysis for use cross-platform -->
-    <Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration) -f netcoreapp2.1" />
-
     <!-- Delete powershell runtime files -->
     <PropertyGroup>
       <RuntimeDllsIncludeList>Microsoft.Powershell.*.dll,System*.dll,Microsoft.VisualBasic.dll,Microsoft.CSharp.dll,Microsoft.CodeAnalysis.dll,Microsoft.CodeAnalysis.CSharp.dll</RuntimeDllsIncludeList>
       <RuntimeDllsExcludeList>System.Security.Cryptography.ProtectedData.dll,System.Configuration.ConfigurationManager.dll,System.Runtime.CompilerServices.Unsafe.dll,System.IO.FileSystem.AccessControl.dll,System.Buffers.dll,System.Text.Encodings.Web.dll,System.CodeDom.dll,System.Management.dll,System.Text.Json.dll,System.Threading.Tasks.Extensions.dll</RuntimeDllsExcludeList>
     </PropertyGroup>
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include $(RuntimeDllsIncludeList) -Exclude $(RuntimeDllsExcludeList) | Where-Object {{$_}.FullName -notlike '*PreloadAssemblies*' -and {$_}.FullName -notlike '*NetCoreAssemblies*'} | Remove-Item -Force&quot;" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include $(RuntimeDllsIncludeList) -Exclude $(RuntimeDllsExcludeList) | Where-Object {$_.FullName -notlike '*PreloadAssemblies*' -and $_.FullName -notlike '*NetCoreAssemblies*'} | Remove-Item -Force&quot;" />
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include 'runtimes' | Remove-Item -Recurse -Force&quot;" Condition="'$(CodeSign)' == 'true'" />
 
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/UpdateModules.ps1 -BuildConfig $(Configuration) -Scope $(Scope)&quot;" />

documentation/development-docs/design-guidelines/parameter-best-practices.md

@@ -155,3 +155,33 @@ In addition, there should be no two parameters with the same position in the sam
 Allowing the user to pipe an object from one cmdlet to another is a major scenario in PowerShell, but allowing multiple parameters in the same parameter set to accept their value from the pipeline can cause issues. From the remarks section of [_Parameter Attribute Declaration_](https://docs.microsoft.com/en-us/powershell/scripting/developer/cmdlet/parameter-attribute-declaration#remarks):
 
 > _Only one parameter in a parameter set should declare ValueFromPipeline = true. Multiple parameters can define ValueFromPipelineByPropertyName = true._
+
+
+## Appendix: Parameter Syntax
+
+In PowerShell documentation, square brackets (`[]`) indicate optional. 
+Convention is as follows: 
+
+```powershell
+command-name
+    -RequiredParameterName <RequiredParameterValue>
+    [-OptionalParameterName <OptionalParameterValue>]
+    [-OptionalSwitchParameters]
+    [-OptionalParameterName] <RequiredParameterValue>
+```
+
+Using `New-Alias` cmdlet as an example: 
+
+```powershell
+New-Alias 
+    [-Name] <string>                                                     -required 'positional' parameter
+    [-Value] <string>                                                 
+    [-Description <string>]                                              -optional parameter
+    [-Force]                                                             -optional switch parameter (all switch parameters are optional, non-positional)
+    [-Option {None | ReadOnly | Constant | Private | AllScope}]
+    [-PassThru] 
+    [-Scope <string>] 
+    [-Confirm] 
+    [-WhatIf] 
+    [<CommonParameters>]
+```

setup/generate.ps1

@@ -37,7 +37,7 @@ if( (-not (get-command -ea 0 light)) -or (-not (get-command -ea 0 heat)) -or (-n
 $outputName ="Az-Cmdlets"
 
 # generate the product name from the current month/year.
-$productName = "Microsoft Azure PowerShell - July 2020"
+$productName = "Microsoft Azure PowerShell - August 2020"
 
 # where to put temp files
 $tmp = Join-Path $env:temp azure-cmdlets-tmp

src/Accounts/Accounts.Test/AzureRMProfileTests.cs

@@ -24,7 +24,7 @@
 using Microsoft.Azure.Commands.Profile.Models;
 using Microsoft.Azure.Commands.Profile.Test;
 using Microsoft.Azure.Commands.ScenarioTest;
-using Microsoft.Azure.Internal.Subscriptions.Models;
+using Microsoft.Azure.Management.ResourceManager.Version2019_06_01.Models;
 using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.Rest;
 using Microsoft.Rest.Azure;
@@ -66,7 +66,8 @@ private static RMProfileClient SetupTestEnvironment(List<string> tenants, params
             var clientFactory = new MockSubscriptionClientFactory(tenants, subscriptionList);
             var mock = new MockClientFactory(new List<object>
             {
-                clientFactory.GetSubscriptionClient()
+                clientFactory.GetSubscriptionClientVer2019(),
+                clientFactory.GetSubscriptionClientVer2016()
             }, true);
             mock.MoqClients = true;
             AzureSession.Instance.ClientFactory = mock;
@@ -93,7 +94,8 @@ private static AzureRmProfile SetupLogin(List<string> tenants, params List<strin
             var clientFactory = new MockSubscriptionClientFactory(tenants, subscriptionList);
             var mock = new MockClientFactory(new List<object>
             {
-                clientFactory.GetSubscriptionClient()
+                clientFactory.GetSubscriptionClientVer2019(),
+                clientFactory.GetSubscriptionClientVer2016()
             }, true);
             mock.MoqClients = true;
             AzureSession.Instance.ClientFactory = mock;
@@ -146,6 +148,7 @@ public void SpecifyTenantAndSubscriptionIdSucceed()
                 null,
                 false,
                 null);
+            Assert.Equal("2019-06-01", client.SubscriptionAndTenantClient.ApiVersion);
         }
 
         [Fact]
@@ -165,13 +168,12 @@ public void SubscriptionIdNotExist()
                 TenantId = DefaultTenant.ToString()
             };
 
-            var getAsyncResponses = new Queue<Func<AzureOperationResponse<Subscription>>>();
-            getAsyncResponses.Enqueue(() =>
+            MockSubscriptionClientFactory.SubGetQueueVer2019 = new Queue<Func<AzureOperationResponse<Subscription>>>();
+            MockSubscriptionClientFactory.SubGetQueueVer2019.Enqueue(() =>
             {
                 throw new CloudException("InvalidAuthenticationTokenTenant: The access token is from the wrong issuer");
             });
-            MockSubscriptionClientFactory.SetGetAsyncResponses(getAsyncResponses);
-
+            
             Assert.Throws<PSInvalidOperationException>(() => client.Login(
                Context.Account,
                Context.Environment,
@@ -181,6 +183,7 @@ public void SubscriptionIdNotExist()
                null,
                false,
                null));
+            Assert.Equal("2019-06-01", client.SubscriptionAndTenantClient.ApiVersion);
         }
 
         [Fact]
@@ -231,12 +234,11 @@ public void SubscriptionIdNotInFirstTenant()
                 TenantId = DefaultTenant.ToString()
             };
 
-            var getAsyncResponses = new Queue<Func<AzureOperationResponse<Subscription>>>();
-            getAsyncResponses.Enqueue(() =>
+            MockSubscriptionClientFactory.SubGetQueueVer2019 = new Queue<Func<AzureOperationResponse<Subscription>>>();
+            MockSubscriptionClientFactory.SubGetQueueVer2019.Enqueue(() =>
             {
                 throw new CloudException("InvalidAuthenticationTokenTenant: The access token is from the wrong issuer");
             });
-            MockSubscriptionClientFactory.SetGetAsyncResponses(getAsyncResponses);
 
             var azureRmProfile = client.Login(
                 Context.Account,
@@ -268,8 +270,8 @@ public void SubscriptionNameNotInFirstTenant()
                 TenantId = DefaultTenant.ToString()
             };
 
-            var listAsyncResponses = new Queue<Func<AzureOperationResponse<IPage<Subscription>>>>();
-            listAsyncResponses.Enqueue(() =>
+            MockSubscriptionClientFactory.SubListQueueVer2019 = new Queue<Func<AzureOperationResponse<IPage<Subscription>>>>();
+            MockSubscriptionClientFactory.SubListQueueVer2019.Enqueue(() =>
             {
                 var sub1 = new Subscription(
                     id: DefaultSubscription.ToString(),
@@ -292,7 +294,6 @@ public void SubscriptionNameNotInFirstTenant()
                     Body = new MockPage<Subscription>(new List<Subscription> { sub1, sub2 })
                 };
             });
-            MockSubscriptionClientFactory.SetListAsyncResponses(listAsyncResponses);
 
             var azureRmProfile = client.Login(
                 Context.Account,
@@ -1097,7 +1098,6 @@ public void CanRenewTokenLogin()
             Assert.Contains(graphToken2, graphMessage.Headers.Authorization.Parameter);
         }
 
-
         private class MockPage<T> : IPage<T>
         {
             public MockPage(IList<T> Items)