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

Author: yifanz7

documentation/development-docs/generate-format.ps1xml-file.md

@@ -359,21 +359,21 @@ This will place the column at the very beginning of the table.
 
     * Below is an example of how to generate a format.ps1xml file for the ```Az.Storage``` module:
     ```Powershell
-    PS E:\git\azure-powershell> New-FormatPs1Xml -OnlyMarkedProperties -ModulePath .\artifacts\Debug\Az.Storage\Az.Storage.psd1
+    PS E:\git\azure-powershell> New-FormatPs1Xml -OnlyMarkedProperties -ModulePath .\src\Storage\Storage\Az.Storage.psd1
     E:\git\azure-powershell\Microsoft.Azure.PowerShell.Cmdlets.Storage.Management.generated.format.ps1xml
     E:\git\azure-powershell\Microsoft.Azure.PowerShell.Cmdlets.Storage.generated.format.ps1xml
     ```
     * Below is an example of how to generate a format.ps1xml file for the ```Az.Account``` module:
     ```powershell
-    PS E:\git\azure-powershell> New-FormatPs1Xml -OnlyMarkedProperties -ModulePath .\artifacts\Debug\Az.Accounts\Az.Accounts.psd1
+    PS E:\git\azure-powershell> New-FormatPs1Xml -OnlyMarkedProperties -ModulePath .\src\Accounts\Accounts\Az.Accounts.psd1
     E:\git\azure-powershell\Microsoft.Azure.PowerShell.Cmdlets.Accounts.generated.format.ps1xml
     PS E:\git\azure-powershell>
     ```
 
 # How to test the format.ps1xml file.
 
 ## Let's take a look at how to check the newly created format.ps1xml file for the ```Az.Account``` module.
-**Note:** All the paths used in the example in the section are under **_azure-powershell/artifacts/Debug_**
+**Note:** All the paths used in the example in the section are under **_azure-powershell/src/<module_name>_**
 
 1. **Copy** the generated format.ps1xml file to the built module folder (this is where your module manifest file psd1 is located). In our example the module folder is 
 ```

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

@@ -105,6 +105,26 @@ public partial class CognitiveServicesManagementClient : Microsoft.Rest.ServiceC
         /// </summary>
         public virtual ICommitmentPlansOperations CommitmentPlans { get; private set; }
         /// <summary>
+        /// Gets the IEncryptionScopesOperations
+        /// </summary>
+        public virtual IEncryptionScopesOperations EncryptionScopes { get; private set; }
+        /// <summary>
+        /// Gets the IRaiPoliciesOperations
+        /// </summary>
+        public virtual IRaiPoliciesOperations RaiPolicies { get; private set; }
+        /// <summary>
+        /// Gets the IRaiBlocklistsOperations
+        /// </summary>
+        public virtual IRaiBlocklistsOperations RaiBlocklists { get; private set; }
+        /// <summary>
+        /// Gets the IRaiBlocklistItemsOperations
+        /// </summary>
+        public virtual IRaiBlocklistItemsOperations RaiBlocklistItems { get; private set; }
+        /// <summary>
+        /// Gets the IRaiContentFiltersOperations
+        /// </summary>
+        public virtual IRaiContentFiltersOperations RaiContentFilters { get; private set; }
+        /// <summary>
         /// Initializes a new instance of the CognitiveServicesManagementClient class.
         /// </summary>
         /// <param name='httpClient'>
@@ -350,8 +370,13 @@ private void Initialize()
             this.PrivateLinkResources = new PrivateLinkResourcesOperations(this);
             this.Deployments = new DeploymentsOperations(this);
             this.CommitmentPlans = new CommitmentPlansOperations(this);
+            this.EncryptionScopes = new EncryptionScopesOperations(this);
+            this.RaiPolicies = new RaiPoliciesOperations(this);
+            this.RaiBlocklists = new RaiBlocklistsOperations(this);
+            this.RaiBlocklistItems = new RaiBlocklistItemsOperations(this);
+            this.RaiContentFilters = new RaiContentFiltersOperations(this);
             this.BaseUri = new System.Uri("https://management.azure.com");
-            this.ApiVersion = "2023-05-01";
+            this.ApiVersion = "2023-10-01-preview";
             this.AcceptLanguage = "en-US";
             this.LongRunningOperationRetryTimeout = 30;
             this.GenerateClientRequestId = true;

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

@@ -2034,6 +2034,9 @@ internal CommitmentPlansOperations (CognitiveServicesManagementClient client)
         /// <param name='commitmentPlanAssociationName'>
         /// The name of the commitment plan association with the Cognitive Services Account
         /// </param>
+        /// <param name='tags'>
+        /// Resource tags.
+        /// </param>
         /// <param name='accountId'>
         /// The Azure resource id of the account.
         /// </param>
@@ -2043,10 +2046,10 @@ internal CommitmentPlansOperations (CognitiveServicesManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<CommitmentPlanAccountAssociation>> CreateOrUpdateAssociationWithHttpMessagesAsync(string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, string accountId = default(string), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<CommitmentPlanAccountAssociation>> CreateOrUpdateAssociationWithHttpMessagesAsync(string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), string accountId = default(string), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
                 // Send Request
-                Microsoft.Rest.Azure.AzureOperationResponse<CommitmentPlanAccountAssociation> _response = await BeginCreateOrUpdateAssociationWithHttpMessagesAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, accountId, customHeaders, cancellationToken).ConfigureAwait(false);
+                Microsoft.Rest.Azure.AzureOperationResponse<CommitmentPlanAccountAssociation> _response = await BeginCreateOrUpdateAssociationWithHttpMessagesAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, tags, accountId, customHeaders, cancellationToken).ConfigureAwait(false);
                 return await this.Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -3064,6 +3067,9 @@ internal CommitmentPlansOperations (CognitiveServicesManagementClient client)
         /// <param name='commitmentPlanAssociationName'>
         /// The name of the commitment plan association with the Cognitive Services Account
         /// </param>
+        /// <param name='tags'>
+        /// Resource tags.
+        /// </param>
         /// <param name='accountId'>
         /// The Azure resource id of the account.
         /// </param>
@@ -3088,7 +3094,7 @@ internal CommitmentPlansOperations (CognitiveServicesManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<CommitmentPlanAccountAssociation>> BeginCreateOrUpdateAssociationWithHttpMessagesAsync(string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, string accountId = default(string), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<CommitmentPlanAccountAssociation>> BeginCreateOrUpdateAssociationWithHttpMessagesAsync(string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), string accountId = default(string), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
 
 
@@ -3148,8 +3154,9 @@ internal CommitmentPlansOperations (CognitiveServicesManagementClient client)
                 }
             }
             CommitmentPlanAccountAssociation association = new CommitmentPlanAccountAssociation();
-            if(accountId != null)
+            if(tags != null||accountId != null)
             {
+                association.Tags = tags;
                 association.AccountId = accountId;
             }
             // Tracing

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

@@ -498,9 +498,9 @@ public static CommitmentPlanAccountAssociation GetAssociation(this ICommitmentPl
         /// <param name='commitmentPlanAssociationName'>
         /// The name of the commitment plan association with the Cognitive Services Account
         /// </param>
-        public static CommitmentPlanAccountAssociation CreateOrUpdateAssociation(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, string accountId = default(string))
+        public static CommitmentPlanAccountAssociation CreateOrUpdateAssociation(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), string accountId = default(string))
         {
-                return ((ICommitmentPlansOperations)operations).CreateOrUpdateAssociationAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, accountId).GetAwaiter().GetResult();
+                return ((ICommitmentPlansOperations)operations).CreateOrUpdateAssociationAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, tags, accountId).GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -521,9 +521,9 @@ public static CommitmentPlanAccountAssociation GetAssociation(this ICommitmentPl
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public static async System.Threading.Tasks.Task<CommitmentPlanAccountAssociation> CreateOrUpdateAssociationAsync(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, string accountId = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public static async System.Threading.Tasks.Task<CommitmentPlanAccountAssociation> CreateOrUpdateAssociationAsync(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), string accountId = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            using (var _result = await operations.CreateOrUpdateAssociationWithHttpMessagesAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, accountId, null, cancellationToken).ConfigureAwait(false))
+            using (var _result = await operations.CreateOrUpdateAssociationWithHttpMessagesAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, tags, accountId, null, cancellationToken).ConfigureAwait(false))
             {
                 return _result.Body;
             }
@@ -747,9 +747,9 @@ public static CommitmentPlansDeletePlanHeaders BeginDeletePlan(this ICommitmentP
         /// <param name='commitmentPlanAssociationName'>
         /// The name of the commitment plan association with the Cognitive Services Account
         /// </param>
-        public static CommitmentPlanAccountAssociation BeginCreateOrUpdateAssociation(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, string accountId = default(string))
+        public static CommitmentPlanAccountAssociation BeginCreateOrUpdateAssociation(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), string accountId = default(string))
         {
-                return ((ICommitmentPlansOperations)operations).BeginCreateOrUpdateAssociationAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, accountId).GetAwaiter().GetResult();
+                return ((ICommitmentPlansOperations)operations).BeginCreateOrUpdateAssociationAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, tags, accountId).GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -770,9 +770,9 @@ public static CommitmentPlansDeletePlanHeaders BeginDeletePlan(this ICommitmentP
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public static async System.Threading.Tasks.Task<CommitmentPlanAccountAssociation> BeginCreateOrUpdateAssociationAsync(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, string accountId = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public static async System.Threading.Tasks.Task<CommitmentPlanAccountAssociation> BeginCreateOrUpdateAssociationAsync(this ICommitmentPlansOperations operations, string resourceGroupName, string commitmentPlanName, string commitmentPlanAssociationName, System.Collections.Generic.IDictionary<string, string> tags = default(System.Collections.Generic.IDictionary<string, string>), string accountId = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            using (var _result = await operations.BeginCreateOrUpdateAssociationWithHttpMessagesAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, accountId, null, cancellationToken).ConfigureAwait(false))
+            using (var _result = await operations.BeginCreateOrUpdateAssociationWithHttpMessagesAsync(resourceGroupName, commitmentPlanName, commitmentPlanAssociationName, tags, accountId, null, cancellationToken).ConfigureAwait(false))
             {
                 return _result.Body;
             }