update

documentation/development-docs/examples/private-link-resource-example.md

@@ -1,63 +1,68 @@
 ## Applicability
-Az.Network supports the retrieval of private link resource in `Get-AzPrivateLinkResource` as well as the management of private endpoint connection in `Approve-AzPrivateEndpointConnect`, `Deny-AzPrivateEndpointConnect`, `Remove-AzPrivateEndpointConnect` and `Set-AzPrivateEndpointConnect`. 
+Az.Network supports the retrieval of private link resource in `Get-AzPrivateLinkResource` as well as the management of private endpoint connection by `Get-AzPrivateEndpointConnection`, `Approve-AzPrivateEndpointConnection`, `Deny-AzPrivateEndpointConnection`, `Remove-AzPrivateEndpointConnection` and `Set-AzPrivateEndpointConnection`. 
 
-For providers who 
-- supports the features of private linke resource and private endpoint connection already
-- and want to onboard these features in Azure PowerShell, 
+For provider who 
+- supports the features of private link resource or private endpoint connection already
+- and wants to onboard these features in Azure PowerShell, 
+You need to register provider configuration in [ProviderConfiguration.cs](https://github.com/Azure/azure-powershell/blob/main/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs#L12).
 
-they need register provider configuration in [ProviderConfiguration.cs](https://github.com/Azure/azure-powershell/blob/main/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs#L12).
-
-Notes: No additional commands for the features of private linke resource and private endpoint connection need to be added.
+Notes: No additional commands for the features of PrivateLinkResource and PrivateEndpointConnection need to be added.
 
 ## Prerequisite
 We assume the API for `List` private link resource and `Get` private endpoint connection is available in the provider that claims to support private endpoint connection features. That means it supports following APIs:
 
 ```
 # List Private Link Resource API
-"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{Top-Level-Resource}/{Top-Level-Resource-Name}/privateLinkResources"
+"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{topResourceType}/{topResourceName}/privateLinkResources"
 ```
 ```
 # Get Private Endpoint Connection API
-"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{Top-Level-Resource}/{Top-Level-Resource-Name}/privateEndpointConnections/{PrivateEndpointConnection-Name}"
+"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{topResourceType}/{topResourceName}/privateEndpointConnections/{privateEndpointConnectionName}"
 ```
 
-if "List Private Endpoint Connection API" is not available, `privateEndpointConnections` must be included in the properties of top resource returned by 
-"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{Top-Level-Resource}/{Top-Level-Resource-Name}". So that `Private Endpoint Connections` will be retrieved from the top resource.
+if "List Private Endpoint Connection API" below is not available, `privateEndpointConnections` must be included in the properties of top resource returned by 
+"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{topResourceType}/{topResourceName}". So that `Get-AzPrivateEndpointConnect` will retrieve connections from the top resource.
 
 ```
 # List Private Endpoint Connection API
-"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{Top-Level-Resource}/{Top-Level-Resource-Name}/privateEndpointConnections"
+"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{topResourceType}/{topResourceName}/privateEndpointConnections"
 ```
 
 ## Code Changes Needed
-To add corresponding {Provider}, {Top-Level-Resource} and {API-Version} into [ProviderConfiguration.cs](https://github.com/Azure/azure-powershell/blob/main/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs#L12), we need to follow 
-in following pattern:
+To add corresponding {Provider}, {topResourceType} and {API-Version} into [ProviderConfiguration.cs](https://github.com/Azure/azure-powershell/blob/main/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs#L12), we need to follow in following pattern:
 ```
-RegisterConfiguration("{Provider}/{Top-Level-Resource}", "{API-Version}", bool hasPrivateEndppointConnectionsURI, bool hasPrivateLinkResourceURI)
+RegisterConfiguration(string type, string apiVersion, bool hasConnectionsURI = false, bool supportGetPrivateLinkResource = false, bool supportPrivateLinkResource = true)
 ```
-- "{Provider}/{Top-Level-Resource}" describes the type of provider. For example, "Microsoft.Sql/servers".
-- "{API-Version}" specifies the API version to be used. For example, "2018-06-01-preview".
-- `hasPrivateEndppointConnectionsURI` marks the provider whether provides "List Private Endpoint Connection API".
+- `type` includes resource provider and resource type which supports PrivateLink feature. For example, "Microsoft.Sql/servers".
+- `apiVersion` specifies the API version to be used. For example, "2018-06-01-preview".
+- `hasConnectionsURI` marks whether the provider exposes "List Private Endpoint Connection API". Default value is false.
 ```
 # Get Private Link Resource API
-"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{Top-Level-Resource}/{Top-Level-Resource-Name}/privateLinkResources/{PrivateLinkResource-Name}"
+"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{provider}/{topResourceType}/{topResourceName}/privateLinkResources/{privateLinkResourceName}"
 ```
-- `hasPrivateLinkResourceURI` marks the provider whether providers "Get Private Endpoint Connection API".
+- `supportGetPrivateLinkResource` marks whether the provider supports Get API of PrivateLinkResource. Default value is false.
 
-For instance, for provider "Microsoft.Sql/servers" with API version "2018-06-01-preview", it supports "List Private Endpoint Connection API" and "Get Private Endpoint Connection API". So it's registration configuration should be
+For instance, for provider "Microsoft.Sql/servers" with API version "2018-06-01-preview", it supports "List Private Endpoint Connection API" and "Get Private Link Resource API". So its registration configuration should be:
 ```
 RegisterConfiguration("Microsoft.Sql/servers", "2018-06-01-preview", true, true);
 ```
 
+- `supportListPrivateLinkResource` marks whether the provider supports List API of PrivateLinkResource. Default value is true.
+
+For instance, `Microsoft.Network/privateLinkServices` supports PrivateEndpointConnections but doesn't support resource type PrivateLinkResource (We assume List API is mandatory to resource support). Its configuration should be:
+```
+RegisterConfiguration("Microsoft.Network/privateLinkServices", "2020-05-01", true, false, false);
+```
+
 ## End-To-End Test
 
 ### Item Needed
 
 + Top level resource
 ```
-New-Az{Top-Level-Resource} -ResourceGroupName {rg_name} -Name {top_level_resource_name}
+New-Az{topResourceType} -ResourceGroupName {rgName} -Name {topResourceName}
 
-$TopLevelResource = Get-Az{Top-Level-Resource} -ResourceGroupName {rg_name} -Name {top_level_resource_name}
+$TopLevelResource = Get-Az{topResourceType} -ResourceGroupName {rgName} -Name {topResourceName}
 ```
 
 + private link resource
@@ -67,24 +72,24 @@ $PrivateLinkResource = Get-AzPrivateLinkResource -PrivateLinkResourceId $TopLeve
 
 + subnet config (object in memory)
 ```
-$SubnetConfig = New-AzVirtualNetworkSubnetConfig -Name {config_name} -AddressPrefix "11.0.1.0/24"      -PrivateEndpointNetworkPolicies "Disabled"
+$SubnetConfig = New-AzVirtualNetworkSubnetConfig -Name {configName} -AddressPrefix "11.0.1.0/24"      -PrivateEndpointNetworkPolicies "Disabled"
 ```
 
 + virtual network
 ```
-New-AzVirtualNetwork -ResourceGroupName {rg_name} -Name {vnet_name} -Location {location} -AddressPrefix "11.0.0.0/16" -Subnet $SubnetConfig
+New-AzVirtualNetwork -ResourceGroupName {rgName} -Name {vnetName} -Location {location} -AddressPrefix "11.0.0.0/16" -Subnet $SubnetConfig
 
-$VNet=Get-AzVirtualNetwork -ResourceGroupName {rg_name} -Name {vnet_name}
+$VNet=Get-AzVirtualNetwork -ResourceGroupName {rgName} -Name {vnetName}
 ```
 
 + private link service connection (object in memory)
 ```
-$PLSConnection = New-AzPrivateLinkServiceConnection -Name {pls_connection_name} -PrivateLinkServiceId $TopLevelResource.Id -GroupId $TopLevelResource.GroupId
+$PLSConnection = New-AzPrivateLinkServiceConnection -Name {plsConnectionName} -PrivateLinkServiceId $TopLevelResource.Id -GroupId $TopLevelResource.GroupId
 ```
 
 + endpoint
 ```
-New-AzPrivateEndpoint -ResourceGroupName {rg_name} -Name {endpoint_name} -Location {location} -Subnet $VNet.subnets[0] -PrivateLinkServiceConnection $PLSConnection -ByManualRequest
+New-AzPrivateEndpoint -ResourceGroupName {rgName} -Name {endpointName} -Location {location} -Subnet $VNet.subnets[0] -PrivateLinkServiceConnection $PLSConnection -ByManualRequest
 ```
 
 ### step-by-step
@@ -99,7 +104,7 @@ $connection = Get-AzPrivateEndpointConnection -PrivateLinkResourceId $TopLevelRe
 
 * To get the connection, if `list` for private endpoint connection was not supported,
 ```
-$TopLevelResource = Get-Az{Top-Level-Resource} -ResourceGroupName {rg_name} -Name {top_level_resource_name}
+$TopLevelResource = Get-Az{topResourceType} -ResourceGroupName {rgName} -Name {topResourceName}
 
 $ConnectionId = $TopLevelResource.PrivateEndpointConnection[0].Id
 

src/ADDomainServices/examples/New-AzADDomainService.md

@@ -10,4 +10,20 @@ youriADdomain youriAddomain.com westus   Enterprise
 
 Create new ADDomainService
 
+### Example 2: Create new ADDomainService with certificate 
+```powershell
+# Variables
+$replicaSet = New-AzADDomainServiceReplicaSet -Location westus -SubnetId /subscriptions/********-****-****-****-**********/resourceGroups/yishitest/providers/Microsoft.Network/virtualNetworks/aadds-vnet/subnets/default\
+$certificateBytes = get-content "certificate.pfx" -AsByteStream
+$base64String = [System.Convert]::ToBase64String($certificateBytes) 
+$ldaps_pfx_pass = "MyStrongPassword"
+New-AzADDomainService -name youriADdomain -ResourceGroupName youriAddomain -DomainName youriAddomain.com -ReplicaSet $replicaSet -LdapSettingLdaps Enabled -LdapSettingPfxCertificate $base64String -LdapSettingPfxCertificatePassword $($ldaps_pfx_pass | ConvertTo-SecureString -Force -AsPlainText)
+```
+
+```output
+Name          Domain Name       Location Sku
+----          -----------       -------- ---
+youriADdomain youriAddomain.com westus   Enterprise
+```
 
+Create new ADDomainService with certificate

src/ADDomainServices/help/New-AzADDomainService.md

@@ -46,6 +46,24 @@ youriADdomain youriAddomain.com westus   Enterprise
 
 Create new ADDomainService
 
+### Example 2: Create new ADDomainService with certificate 
+```powershell
+# Variables
+$replicaSet = New-AzADDomainServiceReplicaSet -Location westus -SubnetId /subscriptions/********-****-****-****-**********/resourceGroups/yishitest/providers/Microsoft.Network/virtualNetworks/aadds-vnet/subnets/default\
+$certificateBytes = get-content "certificate.pfx" -AsByteStream
+$base64String = [System.Convert]::ToBase64String($certificateBytes) 
+$ldaps_pfx_pass = "MyStrongPassword"
+New-AzADDomainService -name youriADdomain -ResourceGroupName youriAddomain -DomainName youriAddomain.com -ReplicaSet $replicaSet -LdapSettingLdaps Enabled -LdapSettingPfxCertificate $base64String -LdapSettingPfxCertificatePassword $($ldaps_pfx_pass | ConvertTo-SecureString -Force -AsPlainText)
+```
+
+```output
+Name          Domain Name       Location Sku
+----          -----------       -------- ---
+youriADdomain youriAddomain.com westus   Enterprise
+```
+
+Create new ADDomainService with certificate
+
 ## PARAMETERS
 
 ### -AsJob

src/Accounts/Accounts/ChangeLog.md

@@ -20,6 +20,7 @@
 
 ## Upcoming Release
 * Upgraded System.Reflection.DispatchProxy on Windows PowerShell [#17856]
+* Upgraded Azure.Identity to 1.6.0 and Azure.Core to 1.24.0
 
 ## Version 2.7.6
 * Upgraded Microsoft.Rest.ClientRuntime to 2.3.24

src/Accounts/Accounts/Common/ScopeHelpers.cs

@@ -61,11 +61,12 @@ public static ContextModificationScope GetContextModificationScopeForProcess(Deb
         }
 
         /// <summary>
-        /// Get the context modification scope for the current user.  This will be 'Process' if changes should 
-        /// only affect the current PowerShell session, or 'CurrentUser'  if any changes should be global.
+        /// Get the context modification scope for the current user. This will be 'Process' if changes should 
+        /// only affect the current PowerShell session, or 'CurrentUser' if any changes should be global.
         /// </summary>
+        /// <param name="session"> The PowerShell session to be affected</param>
         /// <param name="writer">A writer to write debug messages</param>
-        /// <returns>'Process'  if all changes should only impact the current session, or 'CurrentUser' if 
+        /// <returns>'Process' if all changes should only impact the current session, or 'CurrentUser' if 
         /// changes should be global.</returns>
         public static ContextModificationScope GetContextModificationScopeForUser(IAzureSession session, DebugWriter writer)
         {

src/Accounts/Accounts/CommonModule/TelemetryProvider.cs

@@ -102,21 +102,21 @@ public static TelemetryProvider Create(bool collect, IEventStore store)
         }
 
         /// <summary>
-        /// Log a telemtry event
+        /// Log a telemetry event
         /// </summary>
-        /// <param name="qosEvent">The event to log</param>
-        public virtual void LogEvent(string key)
+        /// <param name="qosEventKey">The event to log</param>
+        public virtual void LogEvent(string qosEventKey)
         {
             var dataCollection = _dataCollectionProfile.EnableAzureDataCollection;
             var enabled = dataCollection.HasValue ? dataCollection.Value : true;
 
-            AzurePSQoSEvent qos;
-            if (this.TryGetValue(key, out qos))
+            AzurePSQoSEvent qosEvent;
+            if (this.TryGetValue(qosEventKey, out qosEvent))
             {
-                qos.FinishQosEvent();
-                _helper.LogQoSEvent(qos, enabled, enabled);
+                qosEvent.FinishQosEvent();
+                _helper.LogQoSEvent(qosEvent, enabled, enabled);
                 _helper.FlushMetric();
-                this.Remove(key);
+                this.Remove(qosEventKey);
             }
         }
 

src/Accounts/Accounts/help/Connect-AzAccount.md

@@ -165,6 +165,7 @@ you sign into Azure from a virtual machine that has an assigned MSI.
 
 ```powershell
 Connect-AzAccount -Identity
+Set-AzContext -Subscription Subscription1
 ```
 
 ```Output

src/Accounts/Authentication/Authentication.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.5.0" />
+    <PackageReference Include="Azure.Identity" Version="1.6.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs

@@ -24,10 +24,10 @@ public static class CustomAssemblyResolver
         private static IDictionary<string, Version> NetFxPreloadAssemblies =
             new Dictionary<string, Version>(StringComparer.InvariantCultureIgnoreCase)
             {
-                {"Azure.Core", new Version("1.22.0.0")},
+                {"Azure.Core", new Version("1.24.0.0")},
                 {"Microsoft.Bcl.AsyncInterfaces", new Version("1.1.1.0")},
-                {"Microsoft.Identity.Client", new Version("4.30.1.0") },
-                {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.18.4.0") },
+                {"Microsoft.Identity.Client", new Version("4.39.0.0") },
+                {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.19.3.0") },
                 {"Microsoft.IdentityModel.Clients.ActiveDirectory", new Version("3.19.2.6005")},
                 {"Microsoft.IdentityModel.Clients.ActiveDirectory.Platform", new Version("3.19.2.6005")},
                 {"Newtonsoft.Json", new Version("10.0.0.0")},

src/Accounts/AuthenticationAssemblyLoadContext/AzAssemblyLoadContextInitializer.cs

@@ -31,11 +31,11 @@ static AzAssemblyLoadContextInitializer()
             //TODO: Generate assembly version info into AzSharedAssemblies.json during build
             var azSharedAssemblies = new Dictionary<string, Version>()
             {
-                {"Azure.Core", new Version("1.22.0.0")},
-                {"Azure.Identity", new Version("1.5.0.0")},
+                {"Azure.Core", new Version("1.24.0.0")},
+                {"Azure.Identity", new Version("1.6.0.0")},
                 {"Microsoft.Bcl.AsyncInterfaces", new Version("1.1.1.0")},
-                {"Microsoft.Identity.Client", new Version("4.30.1.0") },
-                {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.18.4.0") },
+                {"Microsoft.Identity.Client", new Version("4.39.0.0") },
+                {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.19.3.0") },
                 {"System.Memory.Data", new Version("1.0.2.0")},
                 {"System.Text.Json", new Version("4.0.1.2")},
             };

src/Accounts/Authenticators/Authenticators.csproj

@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.5.0" />
+    <PackageReference Include="Azure.Identity" Version="1.6.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Accounts/Authenticators/ClientAssertionAuthenticator.cs

@@ -25,6 +25,7 @@
 using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.Identity.Client;
 using Microsoft.Azure.PowerShell.Authenticators.Identity;
+using ClientAssertionCredential = Microsoft.Azure.PowerShell.Authenticators.Identity.ClientAssertionCredential;
 
 namespace Microsoft.Azure.PowerShell.Authenticators
 {

src/Advisor/Advisor.Test/ScenarioTests/AdvisorTestRunner.cs

@@ -0,0 +1,54 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using Microsoft.Azure.Commands.TestFx;
+using Microsoft.Azure.Internal.Subscriptions;
+using Microsoft.Azure.Management.Advisor;
+using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.Advisor.Test.ScenarioTests
+{
+    public class AdvisorTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected AdvisorTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance (output)
+                .WithNewPsScriptFilename ($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests ("ScenarioTests")
+                .WithCommonPsScripts (new[]
+                {
+                    @"Common.ps1"
+                })
+                .WithNewRmModules (helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath("Az.Advisor.psd1")
+                })
+                .WithNewRecordMatcherArguments (
+                    userAgentsToIgnore: new Dictionary<string, string>(),
+                    resourceProviders: new Dictionary<string, string>
+                    {
+                        {"Microsoft.Resources", null},
+                        {"Microsoft.Features", null},
+                        {"Microsoft.Authorization", null}
+                    }
+                )
+                .Build();
+        }
+    }
+}