Merge remote-tracking branch 'remotes/upstream/master' into merge-from-master

# Conflicts:
#	src/Network/Network/Az.Network.psd1
#	src/Network/Network/ChangeLog.md
#	src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs

Author: anton-evseev

.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

src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs

@@ -10,7 +10,7 @@ public static class CustomAssemblyResolver
         private static IDictionary<string, Version> NetFxPreloadAssemblies =
             new Dictionary<string, Version>(StringComparer.InvariantCultureIgnoreCase)
             {
-                {"Azure.Core", new Version("1.2.1.0")},
+                {"Azure.Core", new Version("1.2.2.0")},
                 {"Microsoft.Bcl.AsyncInterfaces", new Version("1.0.0.0")},
                 {"Microsoft.IdentityModel.Clients.ActiveDirectory", new Version("3.19.2.6005")},
                 {"Microsoft.IdentityModel.Clients.ActiveDirectory.Platform", new Version("3.19.2.6005")},

src/ApplicationInsights/ApplicationInsights.Test/ApplicationInsights.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="17.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="17.1.0" />
   </ItemGroup>
 
 </Project>

src/Automation/Automation.Test/Automation.Test.csproj

@@ -9,7 +9,7 @@
   <PropertyGroup>
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,4 +27,4 @@
     <None Update="ScenarioTests\Resources\*.*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-</Project>
+</Project>

src/Az.Test.props

@@ -11,7 +11,7 @@
 
   <!-- Build -->
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netstandard2.0</TargetFrameworks>
     <AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName>
     <RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -40,4 +40,4 @@
     <None Update="ScenarioTests\*.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-</Project>
+</Project>

src/Compute/Compute/help/Disable-AzVmssDiskEncryption.md

@@ -24,12 +24,20 @@ Disables disk encryption on a VM scale set.
 ## EXAMPLES
 
 ### Example 1
-```
+```powershell
 PS C:\> Disable-AzVmssDiskEncryption -ResourceGroupName "Group001" -VMScaleSetName "VMSS001"
 ```
 
 Disables disk encryption on the VM scale set named VMSS001 that belongs to the resource group named Group001.
 
+### Example 2
+
+Disables disk encryption on a VM scale set. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Disable-AzVmssDiskEncryption -ResourceGroupName 'Group001' -VMScaleSetName 'VMSS001' -VolumeType OS
+```
+
 ## PARAMETERS
 
 ### -AsJob

src/Compute/Compute/help/Get-AzVMADDomainExtension.md

@@ -23,6 +23,14 @@ The **Get-AzVMADDomainExtension** cmdlet gets information about the specified Az
 
 ## EXAMPLES
 
+### Example 1
+
+Gets information about an AD domain extension. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Get-AzVMADDomainExtension -Name 'AgentPool01' -ResourceGroupName myresourcegroup -VMName 'VM01'
+```
+
 ## PARAMETERS
 
 ### -DefaultProfile

src/Compute/Compute/help/Get-AzVMDiagnosticsExtension.md

@@ -24,12 +24,20 @@ The **Get-AzVMDiagnosticsExtension** cmdlet gets the settings of the Azure Diagn
 ## EXAMPLES
 
 ### Example 1: Get the diagnostics extension applied to a virtual machine
-```
+```powershell
 PS C:\> Get-AzVMDiagnosticsExtension -ResourceGroupName "ResourceGroup11" -VMName "ContosoVM22"
 ```
 
 This command gets the diagnostics extension applied to the virtual machine named ContosoVM22.
 
+### Example 2
+
+Gets the settings of the Diagnostics extension on a virtual machine. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Get-AzVMDiagnosticsExtension -Name 'AgentPool01' -ResourceGroupName 'ResourceGroup11' -Status -VMName 'ContosoVM22'
+```
+
 ## PARAMETERS
 
 ### -DefaultProfile

src/Compute/Compute/help/Get-AzVMDscExtensionStatus.md

@@ -24,6 +24,14 @@ When a configuration is applied this cmdlet produces output consistent with the
 
 ## EXAMPLES
 
+### Example 1
+
+Gets the status of the DSC extension handler for a virtual machine. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Get-AzVMDscExtensionStatus -Name 'AgentPool01' -ResourceGroupName myresourcegroup -VMName 'VM01'
+```
+
 ## PARAMETERS
 
 ### -DefaultProfile

src/Compute/Compute/help/New-AzProximityPlacementGroup.md

@@ -24,7 +24,7 @@ This cmdlet will create Proximity Placement Group resource.
 ## EXAMPLES
 
 ### Example 1
-```
+```powershell
 PS C:\> New-AzureRmProximityPlacementGroup -ResourceGroupName $resourceGroupName -Name $proximityPlacementGroupName -Location $location -Tag @{key1 = "val1"}
 
 ResourceGroupName           : rg0
@@ -38,6 +38,14 @@ Tags                        : {"key1":"val1"}
 
 This command creates a proximity place group in the given location.
 
+### Example 2
+
+Create Proximity Placement Group resource. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+New-AzProximityPlacementGroup -Location westus -Name 'AgentPool01' -ProximityPlacementGroupType <String> -ResourceGroupName myresourcegroup
+```
+
 ## PARAMETERS
 
 ### -AsJob

src/Compute/Compute/help/New-AzSnapshotConfig.md

@@ -28,7 +28,7 @@ The **New-AzSnapshotConfig** cmdlet creates a configurable snapshot object.
 ## EXAMPLES
 
 ### Example 1
-```
+```powershell
 PS C:\> $snapshotconfig = New-AzSnapshotConfig -Location 'Central US' -DiskSizeGB 5 -AccountType StandardLRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
 PS C:\> $secretUrl = https://myvault.vault-int.azure-int.net/secrets/123/;
 PS C:\> $secretId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault123';
@@ -43,6 +43,14 @@ The first command creates a local empty snapshot object with size 5GB in Standar
 The second and third commands set the disk encryption key and key encryption key settings for the snapshot object.
 The last command takes the snapshot object and creates a snapshot with name 'Snapshot01' in resource group 'ResourceGroup01'.
 
+### Example 2
+
+Creates a configurable snapshot object. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+New-AzSnapshotConfig -CreateOption Empty -Location 'Central US' -SourceUri 'https://contosoaccount.blob.core.windows.net/vhdstore/win7baseimage.vhd'
+```
+
 ## PARAMETERS
 
 ### -CreateOption

src/Compute/Compute/help/New-AzVMDataDisk.md

@@ -33,7 +33,7 @@ The **New-AzVMDataDisk** cmdlet creates a local data disk object for a virtual m
 ## EXAMPLES
 
 ### Example 1: Add a managed data disk to a Vmss VM.
-```
+```powershell
 PS C:\> $disk = Get-AzDisk -ResourceGroupName $rgname -DiskName $diskname0
 PS C:\> $datadisk = New-AzVMDataDisk -Caching 'ReadOnly' -Lun 2 -CreateOption Attach -StorageAccountType Standard_LRS -ManagedDiskId $disk.Id
 PS C:\> $VmssVM = Get-AzVmssVM -ResourceGroupName "myrg" -VMScaleSetName "myvmss" -InstanceId 0
@@ -45,6 +45,14 @@ The next command creates a data disk object with the managed disk.
 The next command gets an existing Vmss VM given by the resource group name, the vmss name and the instance ID.
 The final command updates the Vmss VM by adding a new data disk.
 
+### Example 2
+
+Creates a local data disk object for a virtual machine or a Vmss VM. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+New-AzVMDataDisk -Caching None -CreateOption Attach -DiskSizeInGB 1 -Lun 2 -Name 'AgentPool01'
+```
+
 ## PARAMETERS
 
 ### -Caching

src/Compute/Compute/help/New-AzVmssConfig.md

@@ -58,7 +58,7 @@ object. Other cmdlets are needed to configure the VMSS object. These cmdlets are
 ## EXAMPLES
 
 ### Example 1: Create a VMSS configuration object
-```
+```powershell
 PS C:\> $VMSS = New-AzVmssConfig -Location $Loc -SkuCapacity 2 -SkuName "Standard_A0" -UpgradePolicyMode "Automatic" -NetworkInterfaceConfiguration $NetCfg `
             | Add-AzVmssNetworkInterfaceConfiguration -Name "Test" -Primary $True -IPConfiguration $IPCfg `
             | Set-AzVmssOSProfile -ComputerNamePrefix "Test" -AdminUsername $adminUsername -AdminPassword $AdminPassword `
@@ -76,6 +76,14 @@ This example creates a VMSS configuration object. The first command uses the
 variable named $VMSS. The second command uses the **New-AzVmss** cmdlet to create a VMSS that
 uses the VMSS configuration object created in the first command.
 
+### Example 2
+
+Creates a VMSS configuration object. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+New-AzVmssConfig -Location <String> -Overprovision $false -SkuCapacity 2 -SkuName 'Standard_A0' -Tag 'Sql' -UpgradePolicyMode Automatic
+```
+
 ## PARAMETERS
 
 ### -AutomaticRepairGracePeriod

src/Compute/Compute/help/Remove-AzProximityPlacementGroup.md

@@ -36,12 +36,20 @@ This cmdlet will delete Proximity Placement Group resource.
 ## EXAMPLES
 
 ### Example 1
-```
+```powershell
 PS C:\> Get-AzureRmProximityPlacementGroup  -ResourceGroupName $resourceGroupName -Name $proximityPlacementGroupName  | Remove-AzureRmProximityPlacementGroup
 ```
 
 This command removes the given proximity placement group.
 
+### Example 2
+
+This command removes the given proximity placement group. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Remove-AzProximityPlacementGroup -Name 'AgentPool01' -ResourceGroupName myresourcegroup
+```
+
 ## PARAMETERS
 
 ### -AsJob

src/Compute/Compute/help/Remove-AzVMAccessExtension.md

@@ -23,6 +23,14 @@ The **Remove-AzVMAccessExtension** cmdlet removes the Virtual Machine Access (VM
 
 ## EXAMPLES
 
+### Example 1
+
+Removes the VMAccess extension from a virtual machine. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Remove-AzVMAccessExtension -Name 'AgentPool01' -ResourceGroupName myresourcegroup -VMName 'VM01'
+```
+
 ## PARAMETERS
 
 ### -DefaultProfile

src/Compute/Compute/help/Remove-AzVMCustomScriptExtension.md

@@ -23,6 +23,14 @@ The **Remove-AzVMCustomScriptExtension** cmdlet removes a custom script Virtual
 
 ## EXAMPLES
 
+### Example 1
+
+Removes a custom script extension from a virtual machine. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Remove-AzVMCustomScriptExtension -Name 'AgentPool01' -ResourceGroupName myresourcegroup -VMName 'VM01'
+```
+
 ## PARAMETERS
 
 ### -DefaultProfile

src/Compute/Compute/help/Set-AzVMAccessExtension.md

@@ -26,13 +26,21 @@ The **Set-AzVMAccessExtension** cmdlet adds the Virtual Machine Access (VMAccess
 ## EXAMPLES
 
 ### Example 1: Add a VMAccess extension
-```
+```powershell
 PS C:\> Set-AzVMAccessExtension -ResourceGroupName "ResourceGroup11" -Location "Central US" -VMName "VirtualMachine07" -Name "ContosoTest" -TypeHandlerVersion "2.4" -UserName "PFuller" -Password "Password"
 ```
 
 This command adds a VMAccess extension for the virtual machine named VirtualMachine07 in ResourceGroup11.
 The command specifies the name and type handler version for VMAccess.
 
+### Example 2
+
+Adds the VMAccess extension to a virtual machine. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Set-AzVMAccessExtension -Credential <PSCredential> -Location 'Central US' -Name 'ContosoTest' -ResourceGroupName 'ResourceGroup11' -TypeHandlerVersion '2.4' -VMName 'VirtualMachine07'
+```
+
 ## PARAMETERS
 
 ### -Credential

src/Compute/Compute/help/Set-AzVMCustomScriptExtension.md

@@ -88,13 +88,21 @@ This extension lets you run your own scripts on the virtual machine.
 ## EXAMPLES
 
 ### Example 1: Add a custom script
-```
+```powershell
 PS C:\> Set-AzVMCustomScriptExtension -ResourceGroupName "ResourceGroup11" -Location "Central US" -VMName "VirtualMachine07" -Name "ContosoTest" -TypeHandlerVersion "1.1" -StorageAccountName "Contoso" -StorageAccountKey <StorageKey> -FileName "ContosoScript.exe" -ContainerName "Scripts"
 ```
 
 This command adds a custom script to the virtual machine named VirtualMachine07.
 The script file is contososcript.exe.
 
+### Example 2
+
+Adds a custom script extension to a virtual machine. (autogenerated)
+
+```powershell <!-- Aladdin Generated Example --> 
+Set-AzVMCustomScriptExtension -Argument <String> -ContainerName 'Scripts' -DefaultProfile <IAzureContextContainer> -FileName 'ContosoScript.exe' -Location 'Central US' -Name 'ContosoTest' -ResourceGroupName 'ResourceGroup11' -Run 'myScript.ps1' -SecureExecution -StorageAccountKey <String> -StorageAccountName 'Contoso' -TypeHandlerVersion '1.1' -VMName 'VirtualMachine07'
+```
+
 ## PARAMETERS
 
 ### -Argument