resolved merge conflicts

Author: subashchandra31

.azure-pipelines/powershell-core.yml

@@ -5,7 +5,7 @@ variables:
   LinuxImage: ubuntu-18.04
   MacOSName: macOS
   MacOSImage: macOS-10.14
-  TestFramework: netcoreapp2.2
+  TestFramework: netcoreapp2.1
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true
@@ -22,8 +22,8 @@ jobs:
       linux:
         OSName: ${{ variables.LinuxName }}
         ImageName: ${{ variables.LinuxImage }}
-      macOS:
-        OSName: ${{ variables.MacOSName }}
+      macOS:	
+        OSName: ${{ variables.MacOSName }}	
         ImageName: ${{ variables.MacOSImage }}
   pool:
     vmImage: $(ImageName)
@@ -47,8 +47,8 @@ jobs:
       linux:
         OSName: ${{ variables.LinuxName }}
         ImageName: ${{ variables.LinuxImage }}
-      macOS:
-        OSName: ${{ variables.MacOSName }}
+      macOS:	
+        OSName: ${{ variables.MacOSName }}	
         ImageName: ${{ variables.MacOSImage }}
   pool:
     vmImage: $(ImageName)
@@ -72,8 +72,8 @@ jobs:
       linux:
         OSName: ${{ variables.LinuxName }}
         ImageName: ${{ variables.LinuxImage }}
-      macOS:
-        OSName: ${{ variables.MacOSName }}
+      macOS:	
+        OSName: ${{ variables.MacOSName }}	
         ImageName: ${{ variables.MacOSImage }}
   pool:
     vmImage: $(ImageName)

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

@@ -28,7 +28,8 @@ steps:
 - pwsh: |
    Install-Module -Name Pester -RequiredVersion 4.10.1 -Force
    Install-Module -Name Az.Accounts -Scope CurrentUser -Force
-   $env:PSModulePath = $env:PSModulePath + ";" + (pwd).Path
+   if ($IsWindows) { $sp = ";" } else { $sp = ":" }
+   $env:PSModulePath = $env:PSModulePath + $sp + (pwd).Path
    Get-ChildItem -Directory Az.* | ForEach-Object {if (Test-Path $_/test-module.ps1) {cd $_; ./test-module.ps1}}
   workingDirectory: 'artifacts/Debug'
   displayName: 'Test for AutoGen Modules With PowerShell Core'

.azure-pipelines/windows-powershell.yml

@@ -1,7 +1,7 @@
 variables:
   WindowsName: windows
   WindowsImage: VS2017-Win2016
-  TestFramework: netcoreapp2.2
+  TestFramework: netcoreapp2.1
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true

ChangeLog.md

@@ -1,3 +1,136 @@
+## 4.3.0 - June 2020
+#### Az.Accounts
+* Supported discovering environment setting by default and adding environment via 'Add-AzEnvironment'
+* Update preloaded assemblies [#12024], [#11976]
+* Updated Azure.Core assembly
+* Fixed an issue that may cause 'Connect-AzAccount' to fail in multi-threaded execution [#11201]
+
+#### Az.Aks
+* Replaced usage of old [AccessProfile API](https://docs.microsoft.com/rest/api/aks/managedclusters/getaccessprofile) with calls to [ListClusterAdmin](https://docs.microsoft.com/rest/api/aks/managedclusters/listclusteradmincredentials) and [ListClusterUser](https://docs.microsoft.com/rest/api/aks/managedclusters/listclusterusercredentials) APIs
+
+#### Az.Batch
+* Updated Az.Batch to use 'Microsoft.Azure.Management.Batch' SDK version to 11.0.0
+* Added the ability to set the BatchAccount Identity in the 'New-AzBatchAccount' cmdlet
+
+#### Az.CognitiveServices
+* Supported displaying account capabilities.
+* Supported modifying PublicNetworkAccess.
+
+#### Az.Compute
+* Added SimulateEviction parameter to Set-AzVM and Set-AzVmssVM cmdlets.
+* Added 'Premium_LRS' to the argument completer of StorageAccountType parameter for New-AzGalleryImageVersion cmdlet.
+* Added Substatuses to VMCustomScriptExtension [#11297]
+* Added 'Delete' to the argument completer of EvictionPolicy parameter for New-AzVM and New-AzVMConfig cmdlets.
+* Fixed name of new VM Extension for SAP
+
+#### Az.DataFactory
+* Updated ADF .Net SDK version to 4.9.0
+
+#### Az.EventHub
+* Added Managed Identity parameters to 'New-AzEventHubNamespace' and 'Set-AzEventHubNamespace' cmdlets
+
+#### Az.Functions
+* Added support to create PowerShell 7.0 and Java 11 function apps
+
+#### Az.HDInsight
+* Supported listing hosts and restart specific hosts of the HDInsight cluster.
+
+#### Az.HealthcareApis
+* Updated the SDK version to 1.1.0
+* Added support for Export settings and Managed Identity
+
+#### Az.Monitor
+* Fixed input object parameter for 'Set-AzActivityLogAlert'
+* Fixed 'InputObject' parameter for 'Set-AzActionGroup' [#10868]
+
+#### Az.Network
+* Added support for AddressPrefixType parameter to 'Remove-AzExpressRouteCircuitConnectionConfig'
+* Added new cmdlets for Azure FirewallPolicy
+    - 'New-AzFirewallPolicyDnsSetting'
+    - Support for Destination FQDN in Network Rules for Firewall Policy
+* Added support for backend address pool operations
+    - 'New-AzLoadBalancerBackendAddressConfig'
+    - 'New-AzLoadBalancerBackendAddressPool'
+    - 'Set-AzLoadBalancerBackendAddressPool'
+    - 'Remove-AzLoadBalancerBackendAddressPool'
+    - 'Get-AzLoadBalancerBackendAddressPool'
+* Added name validation for 'New-AzIpGroup'
+* Added new cmdlets for Azure FirewallPolicy
+    - 'New-AzFirewallPolicyThreatIntelWhitelist'
+* Updated below commands for feature: Custom dns servers set/remove on VirtualWan P2SVpnGateway.
+    - Updated New-AzP2sVpnGateway: Added optional parameter '-CustomDnsServer' for customers to specify their dns servers to set on P2SVpnGateway, which can be used by Point to site clients.
+    - Updated Update-AzP2sVpnGateway: Added optional parameter '-CustomDnsServer' for customers to specify their dns servers to set on P2SVpnGateway, which can be used by Point to site clients.
+* Updated 'Update-AzVpnGateway'
+    - Added optional parameter '-BgpPeeringAddress' for customers to specify their custom bgps to set on VpnGateway.
+* Added new cmdlet to support resetting the routing state of a VirtualHub resource:
+    - 'Reset-AzHubRouter'
+* Updated below things based on recent swagger change for Firewall Policy
+    - Changes names for RuleGroup, RuleCollectionGroup and RuleType
+    - Added support for Firewall Policy NAT Rule Collections to support multiple NAT Rule Collection
+* [Breaking Change] Added mandatory parameter 'SourceIpGroup' for 'New-AzFirewallPolicyApplicationRule' and 'New-AzFirewallPolicyNetworkRule'.
+* [Breaking Change] Fixed 'New-AzFirewallPolicyApplicationRule', parameter 'SourceAddress' to be mandatory.
+* [Breaking Change] Fixed 'New-AzFirewallPolicyApplicationRule', parameter 'SourceAddress' to be mandatory.
+* [Breaking Change] Removed mandatory parameters: 'TranslatedAddress', 'TranslatedPort' for 'New-AzFirewallPolicyNatRuleCollection'.
+* Added new cmdlets to support PrivateLink On Application Gateway
+    - 'New-AzApplicationGatewayPrivateLinkConfiguration'
+    - 'Get-AzApplicationGatewayPrivateLinkConfiguration'
+    - 'New-AzApplicationGatewayPrivateLinkConfiguration'
+    - 'Set-AzApplicationGatewayPrivateLinkConfiguration'
+    - 'Remove-AzApplicationGatewayPrivateLinkConfiguration'
+    - 'New-AzApplicationGatewayPrivateLinkIpConfiguration'
+* Added new cmdlets for HubRouteTables child resource of VirtualHub.
+    - 'New-AzVHubRoute'
+    - 'New-AzVHubRouteTable'
+    - 'Get-AzVHubRouteTable'
+    - 'Update-AzVHubRouteTable'
+    - 'Remove-AzVHubRouteTable'
+* Updated existing cmdlets to support optional RoutingConfiguration input parameter for custom routing in VirtualWan.
+    - 'New-AzExpressRouteConnection'
+    - 'Set-AzExpressRouteConnection'
+    - 'New-AzVirtualHubVnetConnection'
+    - 'Update-AzVirtualHubVnetConnection'
+    - 'New-AzVpnConnection'
+    - 'Update-AzVpnConnection'
+    - 'New-AzP2sVpnGateway'
+    - 'Update-AzP2sVpnGateway'
+
+#### Az.OperationalInsights
+* Fixed bug PSWorkspace doesn't implement IOperationalInsightsWorkspace [#12135]
+* Added 'pergb2018' to valid value set of parameter 'Sku' in 'Set-AzOperationalInsightsWorkspace' 
+* Added alias 'FunctionParameters' for parameter 'FunctionParameter' to
+    - 'New-AzOperationalInsightsSavedSearch'
+    - 'Set-AzOperationalInsightsSavedSearch'
+
+#### Az.RecoveryServices
+* Azure Backup added support for fetching MAB items.
+* Azure Site Recovery supports disk type 'StandardSSD_LRS'
+
+#### Az.Resources
+* Added 'UsageLocation', 'GivenName', 'Surname', 'AccountEnabled', 'MailNickname', 'Mail' on 'PSADUser' [#10526] [#10497]
+* Fixed issue that '-Mail' doesn't work on 'Get-AzADUser' [#11981]
+* Added '-ExcludeChangeType' parameter to 'Get-AzDeploymentWhatIfResult' and 'Get-AzResourceGroupDeploymentWhatIfResult'
+* Added '-WhatIfExcludeChangeType' parameter to 'New-AzDeployment' and 'New-AzResourceGroupDeployment'
+* Updated 'Test-Az*Deployment' cmdlets to show better error messages
+* Fixed help message for '-Name' parameter of deployment create and What-If cmdlets
+
+#### Az.Sql
+* Added support for service principal for Set SQL Server Azure Active Directory Admin cmdlet
+* Fixed sync issue in Data Classification cmdlets.
+* Supported searching user by mail on 'Set-AzSqlServerActiveDirectoryAdministrator' [#12192]
+
+#### Az.Storage
+* Supported create Storage account with RequireInfrastructureEncryption
+    -  'New-AzStorageAccount'
+* Moved the logic of loading Azure.Core to Az.Accounts
+
+#### Az.Websites
+* Added safeguard to delete created webapp if restore failed in 'Restore-AzDeletedWebApp'
+* Added 'SourceWebApp.Location' for 'New-AzWebApp' and 'New-AzWebAppSlot'
+* Fixed bug that prevented changing Container settings in 'Set-AzWebApp' and 'Set-AzWebAppSlot'
+* Fixed bug to get SiteConfig when -Name is not given for Get-AzWebApp
+* Added a support to create ASP for Linux Apps
+* Added exceptions for clone across resource groups
+
 ## 4.2.0 - June 2020
 #### Az.Accounts
 * Fixed an issue that may cause Az to skip logs in Azure Automation or PowerShell jobs [#11492]

documentation/azure-powershell-modules.md

@@ -65,6 +65,7 @@ Managed Services                      | `Az.ManagedServices`
 Management Partner                    | `Az.ManagementPartner`                  | [![ManagementPartner]][ManagementPartnerGallery]
 Maps                                  | `Az.Maps`                               | [![Maps]][MapsGallery]
 Database for MariaDB                  | `Az.MariaDb`                            | [![MariaDb]][MariaDbGallery]
+Marketplace                           | `Az.Marketplace`                        | [![Marketplace]][MarketplaceGallery]
 Marketplace Ordering                  | `Az.MarketplaceOrdering`                | [![MarketplaceOrdering]][MarketplaceOrderingGallery]
 Media                                 | `Az.Media`                              | [![Media]][MediaGallery]
 Mixed Reality                         | `Az.MixedReality`                       | [![MixedReality]][MixedRealityGallery]
@@ -163,6 +164,7 @@ Web App Service                       | `Az.Websites`
 [ManagementPartner]:          https://img.shields.io/powershellgallery/v/Az.ManagementPartner.svg?style=flat-square&label=Az.ManagementPartner
 [Maps]:                       https://img.shields.io/powershellgallery/v/Az.Maps.svg?style=flat-square&label=Az.Maps
 [MariaDb]:                    https://img.shields.io/powershellgallery/v/Az.MariaDb.svg?style=flat-square&label=Az.MariaDb
+[Marketplace]:                https://img.shields.io/powershellgallery/v/Az.Marketplace.svg?style=flat-square&label=Az.Marketplace
 [MarketplaceOrdering]:        https://img.shields.io/powershellgallery/v/Az.MarketplaceOrdering.svg?style=flat-square&label=Az.MarketplaceOrdering
 [Media]:                      https://img.shields.io/powershellgallery/v/Az.Media.svg?style=flat-square&label=Az.Media
 [MixedReality]:               https://img.shields.io/powershellgallery/v/Az.MixedReality.svg?style=flat-square&label=Az.MixedReality
@@ -259,6 +261,7 @@ Web App Service                       | `Az.Websites`
 [ManagementPartnerGallery]:          https://www.powershellgallery.com/packages/Az.ManagementPartner/
 [MapsGallery]:                       https://www.powershellgallery.com/packages/Az.Maps/
 [MariaDbGallery]:                    https://www.powershellgallery.com/packages/Az.MariaDb/
+[MarketplaceGallery]:                https://www.powershellgallery.com/packages/Az.Marketplace/
 [MarketplaceOrderingGallery]:        https://www.powershellgallery.com/packages/Az.MarketplaceOrdering/
 [MediaGallery]:                      https://www.powershellgallery.com/packages/Az.Media/
 [MixedRealityGallery]:               https://www.powershellgallery.com/packages/Az.MixedReality/

src/Accounts/Accounts.Test/EnvironmentCmdletTests.cs

@@ -16,7 +16,6 @@
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
-using Microsoft.Azure.Commands.Profile;
 using Microsoft.Azure.Commands.Profile.Models;
 using Microsoft.Azure.Commands.Profile.Utilities;
 using Microsoft.Azure.Commands.ResourceManager.Common;
@@ -61,7 +60,7 @@ public void AddsAzureEnvironment()
             var cmdlet = new AddAzureRMEnvironmentCommand()
             {
                 CommandRuntime = commandRuntimeMock.Object,
-                Name = "Katal",
+                Name = "Katal"
             };
             var dict =new Dictionary<string, object>
             {
@@ -74,6 +73,7 @@ public void AddsAzureEnvironment()
             };
 
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
             cmdlet.InvokeEndProcessing();
@@ -189,6 +189,7 @@ public void AddsEnvironmentMultipleTimes()
             dict["PublishSettingsFileUrl"] = "http://microsoft.com";
             dict["EnableAdfsAuthentication"] = true;
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
 
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
@@ -211,6 +212,7 @@ public void AddsEnvironmentMultipleTimes()
             dict.Clear();
             dict["EnableAdfsAuthentication"] = true;
             cmdlet2.SetBoundParameters(dict);
+            cmdlet2.SetParameterSet("Name");
 
             cmdlet2.InvokeBeginProcessing();
             cmdlet2.ExecuteCmdlet();
@@ -229,6 +231,7 @@ public void AddsEnvironmentMultipleTimes()
             };
             dict.Clear();
             cmdlet3.SetBoundParameters(dict);
+            cmdlet3.SetParameterSet("Name");
 
             cmdlet3.InvokeBeginProcessing();
             cmdlet3.ExecuteCmdlet();
@@ -257,6 +260,7 @@ public void AddsEnvironmentWithMinimumInformation()
             dict["EnableAdfsAuthentication"] = true;
             dict["PublishSettingsFileUrl"] = "http://microsoft.com";
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
             cmdlet.InvokeEndProcessing();
@@ -337,6 +341,7 @@ public void AddsEnvironmentWithStorageEndpoint()
                 StorageEndpoint = "core.windows.net",
             };
 
+            cmdlet.SetParameterSet("Name");
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
             cmdlet.InvokeEndProcessing();
@@ -412,6 +417,7 @@ public void CanCreateEnvironmentWithAllProperties()
             dict["AzureSynapseAnalyticsEndpointResourceId"] = "AzureSynapseAnalyticsEndpointResourceId";
             dict["AzureSynapseAnalyticsEndpointSuffix"] = "https://AzureSynapseAnalytics";
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
 
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
@@ -487,6 +493,8 @@ public void CreateEnvironmentWithTrailingSlashInActiveDirectory()
             var dict = new Dictionary<string, object>();
             dict["ActiveDirectoryEndpoint"] = "https://ActiveDirectoryEndpoint/";
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
+
             SetupConfirmation(commandRuntimeMock);
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();

src/Accounts/Accounts/Accounts.csproj

@@ -11,21 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Newtonsoft.Json.10.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Buffers.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Net.Http.WinHttpHandler.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Private.ServiceModel.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Reflection.DispatchProxy.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.AccessControl.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Permissions.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Principal.Windows.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.ServiceModel.Primitives.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Azure.Core\PreloadAssemblies\*.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Azure.Core\NetCoreAssemblies\*.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetCore\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetCore\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
+    <PreLoadAssemblies Include="$(RepoSrc)lib\NetFxPreloadAssemblies\*.dll" />
+    <NetCoreAssemblies Include="$(RepoSrc)lib\NetCorePreloadAssemblies\*.dll" />
     <StorageDependencies Include="$(RepoSrc)lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.dll" />
     <StorageDependencies Include="$(RepoSrc)lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.DataMovement.dll" />
   </ItemGroup>
@@ -38,10 +25,12 @@
     <Copy SourceFiles="@(PreLoadAssemblies)" DestinationFolder="$(TargetDir)\PreloadAssemblies" />
     <Copy SourceFiles="@(NetCoreAssemblies)" DestinationFolder="$(TargetDir)\NetCoreAssemblies" />
     <Copy SourceFiles="@(StorageDependencies)" DestinationFolder="$(TargetDir)" />
+    <Copy SourceFiles="$(RepoSrc)lib\PreloadAssemblyInfo.json" DestinationFolder="$(TargetDir)" />
   </Target>
 
   <ItemGroup>
     <None Update="StartupScripts\AzError.ps1" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="StartupScripts\InitializeAssemblyResolver.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <None Update="PostImportScripts\LoadAuthenticators.ps1" CopyToOutputDirectory="PreserveNewest" />

src/Accounts/Accounts/Accounts.generated.format.ps1xml

@@ -20,6 +20,10 @@
             <Alignment>Left</Alignment>
             <Label>ActiveDirectory Authority</Label>
           </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Type</Label>
+          </TableColumnHeader>
         </TableHeaders>
         <TableRowEntries>
           <TableRowEntry>
@@ -36,6 +40,10 @@
                 <Alignment>Left</Alignment>
                 <PropertyName>ActiveDirectoryAuthority</PropertyName>
               </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Type</PropertyName>
+              </TableColumnItem>
             </TableColumnItems>
           </TableRowEntry>
         </TableRowEntries>

src/Accounts/Accounts/Az.Accounts.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 5/28/2020
+# Generated on: 6/17/2020
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.8.1'
+ModuleVersion = '1.9.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -142,7 +142,10 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed an issue that may cause Az to skip logs in Azure Automation or PowerShell jobs [#11492]'
+        ReleaseNotes = '* Supported discovering environment setting by default and adding environment via ''Add-AzEnvironment''
+* Update preloaded assemblies [#12024], [#11976]
+* Updated Azure.Core assembly
+* Fixed an issue that may cause ''Connect-AzAccount'' to fail in multi-threaded execution [#11201]'
 
         # Prerelease string of this module
         # Prerelease = ''