Merge remote-tracking branch 'origin/main' into feature/llm

microsoft · Jan 9, 2025 · 587b50e · 587b50e
2 parents 6b5f5ec + 3e66902
commit 587b50e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 31 deletions.
diff --git a/build/pipelines/ob-nightly.yml b/build/pipelines/ob-nightly.yml
@@ -37,6 +37,8 @@ extends:
       akvName: $(SigningAKVName)
       authCertName: $(SigningAuthCertName)
       signCertName: $(SigningSignCertName)
+      useManagedIdentity: $(SigningUseManagedIdentity)
+      clientId: $(SigningOriginalClientId)
     publishSymbolsToPublic: true
     publishVpackToWindows: false
     symbolExpiryTime: 15

diff --git a/build/pipelines/ob-release.yml b/build/pipelines/ob-release.yml
@@ -85,6 +85,8 @@ extends:
       akvName: $(SigningAKVName)
       authCertName: $(SigningAuthCertName)
       signCertName: $(SigningSignCertName)
+      useManagedIdentity: $(SigningUseManagedIdentity)
+      clientId: $(SigningOriginalClientId)
     terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
     publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
     publishVpackToWindows: ${{ parameters.publishVpackToWindows }}

diff --git a/build/pipelines/templates-v2/steps-esrp-signing.yml b/build/pipelines/templates-v2/steps-esrp-signing.yml
@@ -19,4 +19,6 @@ steps:
       AuthAKVName: ${{ parameters.signingIdentity.akvName }}
       AuthCertName: ${{ parameters.signingIdentity.authCertName }}
       AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
+      UseMSIAuthentication: ${{ coalesce(parameters.signingIdentity.useManagedIdentity, 'false') }}
+      EsrpClientId: ${{ parameters.signingIdentity.clientId }}
       ${{ insert }}: ${{ parameters.inputs }}
diff --git a/tools/ReleaseEngineering/ServicingPipeline.ps1 b/tools/ReleaseEngineering/ServicingPipeline.ps1
@@ -105,48 +105,59 @@ Function Get-GraphQlProjectNumberGivenName($Organization, $Name) {
 
 Function Get-GraphQlProjectWithNodes($Organization, $Number) {
     # It's terrible, but it pulls *all* of the info we need all at once!
-    $Project = Invoke-GitHubGraphQlApi -Query '
-    query($organization: String! $number: Int!) {
-        organization(login: $organization) {
-            projectV2(number: $number) {
-                id
-                number
-                title
-                fields(first:20){
-                    nodes {
-                        ... on ProjectV2FieldCommon { id name }
-                        ... on ProjectV2SingleSelectField { options { id name } }
-                    }
-                }
-                items {
-                    nodes {
-                        id
-                        status: fieldValueByName(name: "Status") {
-                            ... on ProjectV2ItemFieldSingleSelectValue { name }
+    $cursor = ""
+    $hasMore = $true
+    $nodes = @()
+    While ($hasMore) {
+        $Project = Invoke-GitHubGraphQlApi -Query '
+        query($organization: String!, $number: Int!, $after: String) {
+            organization(login: $organization) {
+                projectV2(number: $number) {
+                    id
+                    number
+                    title
+                    fields(first:20){
+                        nodes {
+                            ... on ProjectV2FieldCommon { id name }
+                            ... on ProjectV2SingleSelectField { options { id name } }
                         }
-                        content {
-                            ... on Issue {
-                                number
-                                closedByPullRequestsReferences(first: 8) {
-                                    ... on PullRequestConnection {
-                                        nodes {
-                                            number
-                                            mergeCommit { oid }
+                    }
+                    items(first: 100, after: $after) {
+                        pageInfo { hasNextPage endCursor }
+                        nodes {
+                            id
+                            status: fieldValueByName(name: "Status") {
+                                ... on ProjectV2ItemFieldSingleSelectValue { name }
+                            }
+                            content {
+                                ... on Issue {
+                                    number
+                                    closedByPullRequestsReferences(first: 8) {
+                                        ... on PullRequestConnection {
+                                            nodes {
+                                                number
+                                                mergeCommit { oid }
+                                            }
                                         }
                                     }
                                 }
-                            }
-                            ... on PullRequest {
-                                number
-                                mergeCommit { oid }
+                                ... on PullRequest {
+                                    number
+                                    mergeCommit { oid }
+                                }
                             }
                         }
                     }
                 }
             }
         }
+        ' -Variables @{ organization = $Organization; number = $Number; after = $cursor }
+
+        $n += $Project.organization.projectV2.items.nodes
+        $cursor = $Project.organization.projectV2.items.pageInfo.endCursor
+        $hasMore = $Project.organization.projectV2.items.pageInfo.hasNextPage
     }
-    ' -Variables @{ organization = $Organization; number = $Number }
+    $Project.organization.projectV2.items.nodes = $n
     $Project
 }