resolve merge conflicts

Author: yifanz7

.azure-pipelines/daily-build.yml

@@ -76,10 +76,15 @@ jobs:
       custom: msbuild
       arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true;ModifiedModuleBuild=true'
 
-  - task: EsrpCodeSigning@4
+  - task: EsrpCodeSigning@5
     displayName: "Sign Dll [Authenticode + Strong Name]"
     inputs:
-      ConnectedServiceName: '$(signServiceConnection)'
+      ConnectedServiceName: '$(ESRPServiceConnectionName)' 
+      AppRegistrationClientId: '$(ESRPAppClientId)' 
+      AppRegistrationTenantId: '$(ESRPAppTenantId)' 
+      AuthAKVName: '$(ESRPKVName)' 
+      AuthCertName: '$(ESRPAuthCertName)' 
+      AuthSignCertName: '$(ESRPSignCertName)'
       FolderPath: 'artifacts'
       Pattern: |
         Release/**/Microsoft*Azure*PowerShell*.dll
@@ -128,10 +133,15 @@ jobs:
       SessionTimeout: '60'
       MaxConcurrency: '50'
       MaxRetryAttempts: '5'
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
     displayName: "Sign Scripts [Authenticode]"
     inputs:
-      ConnectedServiceName: '$(signServiceConnection)'
+      ConnectedServiceName: '$(ESRPServiceConnectionName)' 
+      AppRegistrationClientId: '$(ESRPAppClientId)' 
+      AppRegistrationTenantId: '$(ESRPAppTenantId)' 
+      AuthAKVName: '$(ESRPKVName)' 
+      AuthCertName: '$(ESRPAuthCertName)' 
+      AuthSignCertName: '$(ESRPSignCertName)'
       FolderPath: 'artifacts'
       Pattern: |
         Release/**/*.ps1
@@ -164,10 +174,15 @@ jobs:
             "ToolVersion": "1.0"
           }
         ]
-  - task: EsrpCodeSigning@4
+  - task: EsrpCodeSigning@5
     displayName: 'Sign 3rd Party [Strong Name]'
     inputs:
-      ConnectedServiceName: '$(signServiceConnection)'
+      ConnectedServiceName: '$(ESRPServiceConnectionName)' 
+      AppRegistrationClientId: '$(ESRPAppClientId)' 
+      AppRegistrationTenantId: '$(ESRPAppTenantId)' 
+      AuthAKVName: '$(ESRPKVName)' 
+      AuthCertName: '$(ESRPAuthCertName)' 
+      AuthSignCertName: '$(ESRPSignCertName)'
       FolderPath: artifacts
       Pattern: 'Release/**/FuzzySharp.dll'
       UseMinimatch: true

.github/policies/resourceManagement.yml

@@ -726,6 +726,22 @@ configuration:
             - sgellock
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Cloud Service (Ext)
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Cloud Service (Ext)
+        then:
+        - mentionUsers:
+            mentionees:
+            - hirenshah1
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -1026,6 +1042,22 @@ configuration:
             - swmachan
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Cognitive Services
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Cognitive Services
+        then:
+        - mentionUsers:
+            mentionees:
+            - gxy001
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -1599,7 +1631,6 @@ configuration:
             mentionees:
             - edwinc
             - mvvsubbu
-            - v-vyedavelly
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2370,6 +2401,23 @@ configuration:
             - Lighthouse-Azure
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Management Groups
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Management Groups
+        then:
+        - mentionUsers:
+            mentionees:
+            - rthorn17
+            - cemheren
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -3374,6 +3422,23 @@ configuration:
             - ricardo-espinoza
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Quota
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Quota
+        then:
+        - mentionUsers:
+            mentionees:
+            - rahuls-microsoft
+            - devatula
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:

documentation/development-docs/design-guidelines/managed-identity-best-practices.md

@@ -58,3 +58,32 @@ We are recommended to use string array as the type of UserAssignedIdentity with
 - No syntax changes if service supports one more user assigned identity in future;
 - Service will provide correct error response if customer reaches the count limitation of `UserAssignedIdentity` ideally, which means no harm.
 
+### How to disable transforming IdentityType and UserAssignedIdentity to avoid breaking changes when migrate from autorest.powershell v3 to v4.
+See details at [here](https://github.com/Azure/autorest.powershell/blob/main/docs/migration-from-v3-to-v4.md#how-to-mitigate-the-breaking-changes-of-managed-identity-best-practice-alignment).
+
+### What should I do to mitigate one patch operation which is reported to parameter IdentityType can not be transformed as the best practice design?
+
+autorest.powershell is unable to transform IdentityType as the best practice design for certain reasons. To mitigate this issue,
+- Include a customization script to transform the parameter IdentityType to EnableSystemAssignedIdentity by `get` + `patch` update for this type of operation. The following are the detailed steps on how to accomplish this.
+  - disable transformation for the operation which reported error in README.md by
+  ```
+  disable-transform-identity-type-for-operation
+    - Operation_id
+  ```
+  - hide the corresponding Update cmdlet in directive by
+  ```
+   -  where:
+        verb: Update
+        subject: {Subject-Name}
+      hide: true
+  ```
+  - run `autorest` and `./build-module.ps1`
+  - manually change IdentityType to EnableSystemAssignedIdentity<bool> in `Update-Az{ModuleName}{Subject-Name}` like
+  ```
+      [Parameter()]
+      [Microsoft.Azure.PowerShell.Cmdlets.{ModuleName}.Category('Body')]
+      [System.Nullable[System.Boolean]]
+      # Decides if enable a system assigned identity for the resource.
+      ${EnableSystemAssignedIdentity},
+  ```
+  - calculate the value of IdentityType as swagger defined in process block, see [instance](https://github.com/Azure/azure-powershell/blob/827001c79c4416e0b74f5857c2ad72b7932b1f9a/src/Astro/Astro.Autorest/custom/Update-AzAstroOrganization.ps1#L269) for Update-Az{ModuleName}{Subject-Name}.

documentation/migration-guides/Az.7.0.0-migration-guide.md

@@ -272,7 +272,7 @@ The `-DisplayName` parameter was removed.
 
 #### Before
 ```powershell
-PS C:\> New-AzManagedServicesDefinition -DisplayName "MyTestDefinition" -ManagedByTenantId 72f9acbf-86f1-41af-91ab-2d7ef011db47 -RoleDefinitionId acdd72a7-3385-48ef-bd42-f606fba81ae7 -PrincipalId 714160ec-87d5-42bb-8b17-287c0dd7417d
+PS C:\> New-AzManagedServicesDefinition -DisplayName "MyTestDefinition" -ManagedByTenantId 00001111-aaaa-2222-bbbb-3333cccc4444 -RoleDefinitionId acdd72a7-3385-48ef-bd42-f606fba81ae7 -PrincipalId 714160ec-87d5-42bb-8b17-287c0dd7417d
 ```
 #### After
 ```powershell