Merge branch 'MicrosoftDocs:main' into master

Author: tinaschrepfer

.github/policies/auto-merge.yml

@@ -3,29 +3,29 @@ name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
 owner:
 resource: repository
-disabled: false
+disabled: true
 where:
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
     - description: Auto-merge PRs to live labeled with auto-merge
       triggerOnOwnActions: true
       if:
-      - payloadType: Pull_Request
-      - labelAdded:
-          label: ':octocat: auto-merge'
-      - targetsBranch:
-          branch: live
-      - isActivitySender:
-          user: microsoft-github-policy-service[bot]
+        - payloadType: Pull_Request
+        - labelAdded:
+            label: ':octocat: auto-merge'
+        - targetsBranch:
+            branch: live
+        - isActivitySender:
+            user: microsoft-github-policy-service[bot]
       then:
-      - enableAutoMerge:
-          mergeMethod: Merge
+        - enableAutoMerge:
+            mergeMethod: Merge
 
     - description: Don't auto-merge PRs with auto-merge label removed
       if:
-      - payloadType: Pull_Request
-      - labelRemoved:
-          label: ':octocat: auto-merge'
+        - payloadType: Pull_Request
+        - labelRemoved:
+            label: ':octocat: auto-merge'
       then:
-      - disableAutoMerge
+        - disableAutoMerge

.github/policies/label-prs.yml

@@ -3,7 +3,7 @@ name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
 owner:
 resource: repository
-disabled: false
+disabled: true
 where:
 configuration:
   resourceManagementConfiguration:
@@ -22,3 +22,5 @@ configuration:
       then:
       - addLabel:
           label: ':octocat: auto-merge'
+      - removeLabel:
+          label: 'do-not-merge'