Merge branch 'dotnet:main' into patch-2

Author: colejohnson66

.github/ISSUE_TEMPLATE/01-general-issue.yml

@@ -0,0 +1,13 @@
+name: "General feedback"
+description: Provide general feedback about the .NET API reference docs or a specific article.
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for helping us improve the docs!
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the issue or suggestion
+      description: "Note: If your issue is about a specific article, it's best to submit your feedback by clicking the 'Open a documentation issue' link in the '.NET feedback' box at the end of the article."
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/z-customer-feedback.yml

@@ -0,0 +1,59 @@
+name: Learn feedback control.
+description: |
+  ⛔ This template is hooked into the feedback control on the bottom of every page on the live site. It automatically fills in several fields for you. Don't use for other purposes. ⛔
+body:
+  - type: markdown
+    attributes:
+      value: "## Issue information"
+  - type: markdown
+    attributes:
+      value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Type of issue
+      options:
+        - Typo
+        - Code doesn't work
+        - Missing information
+        - Outdated article
+        - Thank you
+        - Other (describe below)
+    validations:
+      required: true
+  - type: textarea
+    id: feedback
+    validations:
+      required: true
+    attributes:
+      label: Description
+  - type: markdown
+    attributes:
+      value: "## 🚧 Article information 🚧"
+  - type: markdown
+    attributes:
+      value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
+  - type: input
+    id: pageUrl
+    validations:
+      required: true
+    attributes:
+      label: Page URL
+  - type: input
+    id: contentSourceUrl
+    validations:
+      required: true
+    attributes:
+      label: Content source URL
+  - type: input
+    id: documentVersionIndependentId
+    validations:
+      required: true
+    attributes:
+      label: Document Version Independent Id
+  - type: input
+    id: author
+    validations:
+      required: true
+    attributes:
+      label: Article author

.github/policies/assign-prs.yml

@@ -5,7 +5,8 @@ resource: repository
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-      - if:
+      - description: Assign team PRs to author
+        if:
         - payloadType: Pull_Request
         - isAction:
             action: Opened
@@ -15,4 +16,4 @@ configuration:
         then:
         - assignTo:
             author: True
-        description: Assign team PRs to author
+

.github/policies/author-action.yml

@@ -5,15 +5,17 @@ resource: repository
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-      - if:
+      - description: Needs-author-action notification
+        if:
         - payloadType: Issues
         - labelAdded:
             label: needs-author-action
         then:
         - addReply:
-            reply: This issue has been marked `needs-author-action` and may be missing some important information.
-        description: Needs-author-action notification
-      - if:
+            reply: This issue has been marked `needs-author-action` and might be missing some important information.
+
+      - description: PR reviews with "changes requested" applies the needs-author-action label
+        if:
         - payloadType: Pull_Request_Review
         - not:
             activitySenderHasPermission:
@@ -25,8 +27,9 @@ configuration:
         then:
         - addLabel:
             label: needs-author-action
-        description: PR reviews with "changes requested" applies the needs-author-action label
-      - if:
+
+      - description: Replace `needs-author-action` label with `needs-further-triage` label when the author comments on an issue that's not "untriaged"
+        if:
         - payloadType: Issue_Comment
         - isAction:
             action: Created
@@ -43,8 +46,9 @@ configuration:
             label: needs-further-triage
         - removeLabel:
             label: needs-author-action
-        description: Replace `needs-author-action` label with `needs-further-triage` label when the author comments on an issue that is not still untriaged
-      - if:
+
+      - description: Remove `needs-author-action` label when the author comments on an `untriaged` issue
+        if:
         - payloadType: Issue_Comment
         - isAction:
             action: Created
@@ -58,8 +62,9 @@ configuration:
         then:
         - removeLabel:
             label: needs-author-action
-        description: Remove `needs-author-action` label when the author comments on an `untriaged` issue
-      - if:
+
+      - description: Pushing changes to PR branch removes the needs-author-action label
+        if:
         - payloadType: Pull_Request
         - isAction:
             action: Synchronize
@@ -68,8 +73,9 @@ configuration:
         then:
         - removeLabel:
             label: needs-author-action
-        description: Pushing changes to PR branch removes the needs-author-action label
-      - if:
+
+      - description: Author commenting in PR removes the needs-author-action label
+        if:
         - payloadType: Issue_Comment
         - isActivitySender:
             issueAuthor: True
@@ -81,8 +87,9 @@ configuration:
         then:
         - removeLabel:
             label: needs-author-action
-        description: Author commenting in PR removes the needs-author-action label
-      - if:
+
+      - description: Author responding to a PR review comment removes the needs-author-action label
+        if:
         - payloadType: Pull_Request_Review
         - isActivitySender:
             issueAuthor: True
@@ -94,4 +101,3 @@ configuration:
         then:
         - removeLabel:
             label: needs-author-action
-        description: Author responding to a pull request review comment removes the needs-author-action label

.github/policies/auto-merge.yml

@@ -0,0 +1,38 @@
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+resource: repository
+
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+    - description: Auto-squash-merge PRs to main labeled with auto-merge
+      triggerOnOwnActions: true
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: ':octocat: auto-merge'
+      - targetsBranch:
+          branch: main
+      then:
+      - enableAutoMerge:
+          mergeMethod: Squash
+
+    - description: Auto-merge PRs to live labeled with auto-merge
+      triggerOnOwnActions: true
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: ':octocat: auto-merge'
+      - targetsBranch:
+          branch: live
+      then:
+      - enableAutoMerge:
+          mergeMethod: Merge
+
+    - description: Don't auto-merge PRs with auto-merge label removed
+      if:
+      - payloadType: Pull_Request
+      - labelRemoved:
+          label: ':octocat: auto-merge'
+      then:
+      - disableAutoMerge

.github/policies/community-contrib.yml

@@ -5,7 +5,8 @@ resource: repository
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-      - if:
+      - description: Label community PRs
+        if:
         - payloadType: Pull_Request
         - isAction:
             action: Opened
@@ -46,4 +47,3 @@ configuration:
         then:
         - addLabel:
             label: community-contribution
-        description: Label community PRs

.github/policies/label-prs.yml

@@ -0,0 +1,23 @@
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+resource: repository
+
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+    - description: Label publish PRs with auto-merge
+      triggerOnOwnActions: true
+      if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - isActivitySender:
+          user: dotnet-policy-service[bot]
+      - titleContains:
+          pattern: Merge main into live
+          isRegex: False
+      then:
+      - addLabel:
+          label: ':octocat: auto-merge'
+
+

.github/policies/scheduled-pr.yml

@@ -5,7 +5,8 @@ resource: repository
 configuration:
   resourceManagementConfiguration:
     scheduledSearches:
-      - frequencies:
+      - description: Push to live branch (publish)
+        frequencies:
           - daily:
               time: 08:0
         filters: []
@@ -15,5 +16,4 @@ configuration:
               base: live
               title: Merge main into live
               body: Please don't squash-merge this PR.
-        description: Push to live branch (publish)
 

.github/policies/untriaged-label.yml

@@ -6,7 +6,8 @@ resource: repository
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-    - if:
+    - description: Add untriaged label to new/reopened issues without a milestone
+      if:
       - payloadType: Issues
       - isOpen
       - not:
@@ -22,8 +23,9 @@ configuration:
       then:
       - addLabel:
           label: untriaged
-      description: Add untriaged label to new/reopened issues without a milestone
-    - if:
+
+    - description: Remove untriaged label from issues when closed or added to a milestone
+      if:
       - payloadType: Issues
       - or:
         - isAction:
@@ -34,4 +36,3 @@ configuration:
       then:
       - removeLabel:
           label: untriaged
-      description: Remove untriaged label from issues when closed or added to a milestone

.github/workflows/quest-bulk.yml

@@ -8,12 +8,17 @@ on:
         description: "The reason for running the bulk import workflow"
         required: true
         default: "Initial import into Quest (Azure DevOps)"
+      duration:
+        description: "The number of days to import issues for. Defaults to 5 days."
+        required: false
+        default: "5"
 
 jobs:
   bulk-import:
     runs-on: ubuntu-latest
     permissions:
       issues: write
+      id-token: write
       pull-requests: write
     if: ${{ github.repository_owner == 'dotnet' }}
 
@@ -23,16 +28,25 @@ jobs:
         run: |
           echo "Reason: ${{ github.event.inputs.reason }}"
 
+      - name: Azure OpenID Connect
+        id: azure-oidc-auth
+        uses: dotnet/docs-tools/.github/actions/oidc-auth-flow@main
+        with:
+          client-id: ${{ secrets.CLIENT_ID }}
+          tenant-id: ${{ secrets.TENANT_ID }}
+          audience: ${{ secrets.OSMP_API_AUDIENCE }}
+
       - name: bulk-sequester
         id: bulk-sequester
         uses: dotnet/docs-tools/actions/sequester@main
         env:
           ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
           ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
+          ImportOptions__ApiKeys__AzureAccessToken: ${{ steps.azure-oidc-auth.outputs.access-token }}
           ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
           ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
         with:
           org: ${{ github.repository_owner }}
           repo: ${{ github.repository }}
           issue: '-1'
+          duration: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.duration || 5 }}

.github/workflows/quest.yml

@@ -21,6 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       issues: write
+      id-token: write
       pull-requests: write
 
     steps:
@@ -30,14 +31,22 @@ jobs:
           echo "Reason: ${{ github.event.inputs.reason }}"
           echo "Issue number: ${{ github.event.inputs.issue }}"
 
+      - name: Azure OpenID Connect
+        id: azure-oidc-auth
+        uses: dotnet/docs-tools/.github/actions/oidc-auth-flow@main
+        with:
+          client-id: ${{ secrets.CLIENT_ID }}
+          tenant-id: ${{ secrets.TENANT_ID }}
+          audience: ${{ secrets.OSMP_API_AUDIENCE }}
+
       # This step occurs when ran manually, passing the manual issue number input
       - name: manual-sequester
         if: ${{ github.event_name == 'workflow_dispatch' }}
         id: manual-sequester
         uses: dotnet/docs-tools/actions/sequester@main
         env:
           ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
+          ImportOptions__ApiKeys__AzureAccessToken:  ${{ steps.azure-oidc-auth.outputs.access-token }}
           ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
           ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
           ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
@@ -53,12 +62,11 @@ jobs:
         uses: dotnet/docs-tools/actions/sequester@main
         env:
           ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
+          ImportOptions__ApiKeys__AzureAccessToken: ${{ steps.azure-oidc-auth.outputs.access-token }}
           ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
           ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
           ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
         with:
           org: ${{ github.repository_owner }}
           repo: ${{ github.repository }}
           issue: ${{ github.event.issue.number }}
-