Merge branch 'main' of https://github.com/Azure/azure-powershell into mergestoragepreview

Author: yifanz7

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,20 +6,15 @@
 
 ## Checklist
 
+- **Mandatory**: please state whether this PR targets a [**general** release](../blob/main/CONTRIBUTING.md#target-release-types) / [**public preview**](../blob/main/CONTRIBUTING.md#target-release-types) / [**private preview**]((../blob/main/CONTRIBUTING.md#target-release-types)) / [**engineering build**](../blob/main/CONTRIBUTING.md#target-release-types) of Azure PowerShell?
+    - `{Enter your answer here}`
 - [ ] Check this box to confirm: **I have read the [_Submitting Changes_](../blob/main/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../blob/main/CONTRIBUTING.md) and reviewed the following information:**
 
-* **SHOULD** select appropriate branch. Cmdlets from Autorest.PowerShell should go to [`generation`](https://github.com/Azure/azure-powershell/tree/generation) branch. 
-* **SHOULD** make the title of PR clear and informative, and in the present imperative tense. 
 * **SHOULD** update `ChangeLog.md` file(s) appropriately
-    * For any service, the `ChangeLog.md` file can be found at `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`
-    * A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header in the past tense. Add changelog in description section if PR goes into [`generation`](https://github.com/Azure/azure-powershell/tree/generation) branch.
+    * For SDK-based development mode, update `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`.
+        * A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header in the past tense. 
+    * For autorest-based development mode, include the changelog in the PR description.
     * Should **not** change `ChangeLog.md` if no new release is required, such as fixing test case only.
-* **SHOULD** have approved design review for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) ([_Microsoft internal only_](../blob/main/CONTRIBUTING.md#onboarding)) with following situations
-    * Create new module from scratch
-    * Create new resource types which are not easy to conform to [Azure PowerShell Design Guidelines](../blob/main/documentation/development-docs/design-guidelines)
-    * Create new resource type which name doesn't use module name as prefix
-    * Have design question before implementation
 * **SHOULD** regenerate markdown help files if there is cmdlet API change. [Instruction](../blob/main/documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
 * **SHOULD** have proper test coverage for changes in pull request.
-* **SHOULD NOT** introduce [breaking changes](../blob/main/documentation/breaking-changes/breaking-changes-definition.md) in Az minor release except preview version.
 * **SHOULD NOT** adjust version of module manually in pull request

CONTRIBUTING.md

@@ -90,6 +90,27 @@ completed checklist.
 The following set of guidelines must be adhered to when opening pull requests in the Azure
 PowerShell repository.
 
+#### Target Release Types
+
+Here are all types of releases of **Azure PowerShell**. Note that the type of release isn't necessarily aligned to the state of the swagger or service feature.
+
+- **General** release
+  - This PR targets an [official general release](https://github.com/Azure/azure-powershell/milestones) of Azure PowerShell.
+  - Target version is `x.y.z`, no suffix.
+    - Note: versions < 1.0.0 are also included in this category.
+  - Target branch should be `main` or `generation` depending on the development approach.
+- **Preview** release
+  - **Public preview**
+    - This PR targets a preview release of Azure PowerShell. It is independent to the normal release cycle.
+    - Target version is `x.y.z-preview`.
+      - Note: if the major version is 0, it is considered a general release rather than preview.
+    - Target branch should not be `main` nor `generation`. Please contact [sprint master](https://github.com/Azure/azure-powershell/milestones) if you are unsure about which branch to target.
+  - **Private preview** / **Embargoed preview**
+    - This PR is related to some business secret. It should not be submitted to this repository. Contact [sprint master](https://github.com/Azure/azure-powershell/milestones) for more details.
+- **Engineering build**
+  - This PR does not require any kind of releases. It's for internal or private distribution.
+  - Target branch should not be `main` nor `generation`. Please contact [sprint master](https://github.com/Azure/azure-powershell/milestones) if you are unsure about which branch to target.
+
 #### General guidelines
 
 The following guidelines must be followed for **every** pull request that is opened.

src/CognitiveServices/CognitiveServices.Management.Sdk/Generated/AccountsOperations.cs

@@ -349,7 +349,8 @@ internal AccountsOperations (CognitiveServicesManagementClient client)
 
         }
         /// <summary>
-        /// Returns all the resources of a particular type belonging to a resource group
+        /// Returns all the resources of a particular type belonging to a resource
+        /// group
         /// </summary>
         /// <param name='resourceGroupName'>
         /// The name of the resource group. The name is case insensitive.
@@ -995,7 +996,8 @@ internal AccountsOperations (CognitiveServicesManagementClient client)
 
         }
         /// <summary>
-        /// Regenerates the specified account key for the specified Cognitive Services account.
+        /// Regenerates the specified account key for the specified Cognitive Services
+        /// account.
         /// </summary>
         /// <param name='resourceGroupName'>
         /// The name of the resource group. The name is case insensitive.
@@ -1492,7 +1494,9 @@ internal AccountsOperations (CognitiveServicesManagementClient client)
         /// The name of Cognitive Services account.
         /// </param>
         /// <param name='filter'>
-        /// An OData filter expression that describes a subset of usages to return. The supported parameter is name.value (name of the metric, can have an or of multiple names).
+        /// An OData filter expression that describes a subset of usages to return. The
+        /// supported parameter is name.value (name of the metric, can have an or of
+        /// multiple names).
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1968,7 +1972,9 @@ internal AccountsOperations (CognitiveServicesManagementClient client)
 
         }
         /// <summary>
-        /// Create Cognitive Services Account. Accounts is a resource group wide resource type. It holds the keys for developer to access intelligent APIs. It&#39;s also the resource type for billing.
+        /// Create Cognitive Services Account. Accounts is a resource group wide
+        /// resource type. It holds the keys for developer to access intelligent APIs.
+        /// It&#39;s also the resource type for billing.
         /// </summary>
         /// <param name='resourceGroupName'>
         /// The name of the resource group. The name is case insensitive.
@@ -2530,7 +2536,7 @@ internal AccountsOperations (CognitiveServicesManagementClient client)
 
         }
         /// <summary>
-        /// Deletes a Cognitive Services account from the resource group. 
+        /// Deletes a Cognitive Services account from the resource group.
         /// </summary>
         /// <param name='resourceGroupName'>
         /// The name of the resource group. The name is case insensitive.
@@ -2747,7 +2753,8 @@ internal AccountsOperations (CognitiveServicesManagementClient client)
 
         }
         /// <summary>
-        /// Returns all the resources of a particular type belonging to a resource group
+        /// Returns all the resources of a particular type belonging to a resource
+        /// group
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.

src/CognitiveServices/CognitiveServices.Management.Sdk/Generated/AccountsOperationsExtensions.cs

@@ -13,7 +13,9 @@ namespace Microsoft.Azure.Management.CognitiveServices
     public static partial class AccountsOperationsExtensions
     {
         /// <summary>
-        /// Create Cognitive Services Account. Accounts is a resource group wide resource type. It holds the keys for developer to access intelligent APIs. It&#39;s also the resource type for billing.
+        /// Create Cognitive Services Account. Accounts is a resource group wide
+        /// resource type. It holds the keys for developer to access intelligent APIs.
+        /// It&#39;s also the resource type for billing.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -30,7 +32,9 @@ public static Account Create(this IAccountsOperations operations, string resourc
         }
 
         /// <summary>
-        /// Create Cognitive Services Account. Accounts is a resource group wide resource type. It holds the keys for developer to access intelligent APIs. It&#39;s also the resource type for billing.
+        /// Create Cognitive Services Account. Accounts is a resource group wide
+        /// resource type. It holds the keys for developer to access intelligent APIs.
+        /// It&#39;s also the resource type for billing.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -91,7 +95,7 @@ public static Account Update(this IAccountsOperations operations, string resourc
             }
         }
         /// <summary>
-        /// Deletes a Cognitive Services account from the resource group. 
+        /// Deletes a Cognitive Services account from the resource group.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -108,7 +112,7 @@ public static void Delete(this IAccountsOperations operations, string resourceGr
         }
 
         /// <summary>
-        /// Deletes a Cognitive Services account from the resource group. 
+        /// Deletes a Cognitive Services account from the resource group.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -166,7 +170,8 @@ public static Account Get(this IAccountsOperations operations, string resourceGr
             }
         }
         /// <summary>
-        /// Returns all the resources of a particular type belonging to a resource group
+        /// Returns all the resources of a particular type belonging to a resource
+        /// group
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -180,7 +185,8 @@ public static Microsoft.Rest.Azure.IPage<Account> ListByResourceGroup(this IAcco
         }
 
         /// <summary>
-        /// Returns all the resources of a particular type belonging to a resource group
+        /// Returns all the resources of a particular type belonging to a resource
+        /// group
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -265,7 +271,8 @@ public static ApiKeys ListKeys(this IAccountsOperations operations, string resou
             }
         }
         /// <summary>
-        /// Regenerates the specified account key for the specified Cognitive Services account.
+        /// Regenerates the specified account key for the specified Cognitive Services
+        /// account.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -282,7 +289,8 @@ public static ApiKeys RegenerateKey(this IAccountsOperations operations, string
         }
 
         /// <summary>
-        /// Regenerates the specified account key for the specified Cognitive Services account.
+        /// Regenerates the specified account key for the specified Cognitive Services
+        /// account.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -355,7 +363,9 @@ public static AccountSkuListResult ListSkus(this IAccountsOperations operations,
         /// The name of Cognitive Services account.
         /// </param>
         /// <param name='filter'>
-        /// An OData filter expression that describes a subset of usages to return. The supported parameter is name.value (name of the metric, can have an or of multiple names).
+        /// An OData filter expression that describes a subset of usages to return. The
+        /// supported parameter is name.value (name of the metric, can have an or of
+        /// multiple names).
         /// </param>
         public static UsageListResult ListUsages(this IAccountsOperations operations, string resourceGroupName, string accountName, string filter = default(string))
         {
@@ -375,7 +385,9 @@ public static AccountSkuListResult ListSkus(this IAccountsOperations operations,
         /// The name of Cognitive Services account.
         /// </param>
         /// <param name='filter'>
-        /// An OData filter expression that describes a subset of usages to return. The supported parameter is name.value (name of the metric, can have an or of multiple names).
+        /// An OData filter expression that describes a subset of usages to return. The
+        /// supported parameter is name.value (name of the metric, can have an or of
+        /// multiple names).
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
@@ -427,7 +439,9 @@ public static Microsoft.Rest.Azure.IPage<AccountModel> ListModels(this IAccounts
             }
         }
         /// <summary>
-        /// Create Cognitive Services Account. Accounts is a resource group wide resource type. It holds the keys for developer to access intelligent APIs. It&#39;s also the resource type for billing.
+        /// Create Cognitive Services Account. Accounts is a resource group wide
+        /// resource type. It holds the keys for developer to access intelligent APIs.
+        /// It&#39;s also the resource type for billing.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -444,7 +458,9 @@ public static Account BeginCreate(this IAccountsOperations operations, string re
         }
 
         /// <summary>
-        /// Create Cognitive Services Account. Accounts is a resource group wide resource type. It holds the keys for developer to access intelligent APIs. It&#39;s also the resource type for billing.
+        /// Create Cognitive Services Account. Accounts is a resource group wide
+        /// resource type. It holds the keys for developer to access intelligent APIs.
+        /// It&#39;s also the resource type for billing.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -505,7 +521,7 @@ public static Account BeginUpdate(this IAccountsOperations operations, string re
             }
         }
         /// <summary>
-        /// Deletes a Cognitive Services account from the resource group. 
+        /// Deletes a Cognitive Services account from the resource group.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -522,7 +538,7 @@ public static void BeginDelete(this IAccountsOperations operations, string resou
         }
 
         /// <summary>
-        /// Deletes a Cognitive Services account from the resource group. 
+        /// Deletes a Cognitive Services account from the resource group.
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -541,7 +557,8 @@ public static void BeginDelete(this IAccountsOperations operations, string resou
             (await operations.BeginDeleteWithHttpMessagesAsync(resourceGroupName, accountName, null, cancellationToken).ConfigureAwait(false)).Dispose();
         }
         /// <summary>
-        /// Returns all the resources of a particular type belonging to a resource group
+        /// Returns all the resources of a particular type belonging to a resource
+        /// group
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.
@@ -555,7 +572,8 @@ public static Microsoft.Rest.Azure.IPage<Account> ListByResourceGroupNext(this I
         }
 
         /// <summary>
-        /// Returns all the resources of a particular type belonging to a resource group
+        /// Returns all the resources of a particular type belonging to a resource
+        /// group
         /// </summary>
         /// <param name='operations'>
         /// The operations group for this extension method.

src/CognitiveServices/CognitiveServices.Management.Sdk/Generated/CognitiveServicesManagementClient.cs

@@ -49,14 +49,14 @@ public partial class CognitiveServicesManagementClient : Microsoft.Rest.ServiceC
 
         /// <summary>
         /// The retry timeout in seconds for Long Running Operations. Default
-        /// value is 30.
+        /// /// value is 30.
         /// </summary>
         public int? LongRunningOperationRetryTimeout { get; set;}
 
         /// <summary>
-        /// Whether a unique x-ms-client-request-id should be generated. When 
-        /// set to true a unique x-ms-client-request-id value is generated and 
-        /// included in each request. Default is true.
+        /// Whether a unique x-ms-client-request-id should be generated. When
+        /// /// set to true a unique x-ms-client-request-id value is generated and
+        /// /// included in each request. Default is true.
         /// </summary>
         public bool? GenerateClientRequestId { get; set;}