Merge branch 'main' into mbuck/passkeys

Author: MackinnonBuck

.azure/pipelines/components-e2e-tests.yml

@@ -59,7 +59,7 @@ jobs:
     - script: .dotnet/dotnet build ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-restore
       displayName: Build
     - script: |
-        set -o pipefail
+        set -eo pipefail
 
         .dotnet/dotnet test ./src/Components/test/E2ETest \
           -c $(BuildConfiguration) \

.github/policies/resourceManagement.yml

@@ -168,6 +168,45 @@ configuration:
             To make sure no conflicting changes have occurred, please rerun validation before merging. You can do this by leaving an `/azp run` comment here (requires commit rights), or by simply closing and reopening.
       - addLabel:
           label: pending-ci-rerun
+    - description: '[Idle Issue Management] Tag aspnet-build on dependency PRs (non-weekend)'
+      frequencies:
+      - weekday:
+          day: Tuesday
+          time: 0:0
+      - weekday:
+          day: Wednesday
+          time: 0:0
+      - weekday:
+          day: Thursday
+          time: 0:0
+      - weekday:
+          day: Friday
+          time: 0:0
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: 'build-ops'
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This dependency PR has had no activity for a full business day - @dotnet/aspnet-build please take a look if you are on build-ops.
+    - description: '[Idle Issue Management] Tag aspnet-build on dependency PRs (weekend)'
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 0:0
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: 'build-ops'
+      - noActivitySince:
+          days: 3
+      actions:
+      - addReply:
+          reply: This dependency PR has had no activity for a full business day - @dotnet/aspnet-build please take a look if you are on build-ops.
     eventResponderTasks:
     - if:
       - payloadType: Issue_Comment
@@ -247,6 +286,26 @@ configuration:
       - approvePullRequest:
           comment: Auto-approving dependency update.
       description: '[Infrastructure PRs] Add area-infrastructure label to dependency update Pull Requests'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - isActivitySender:
+          user: dotnet-maestro[bot]
+          issueAuthor: False
+      - targetsBranch:
+          branch: main
+      - or:
+        - titleContains:
+            pattern: Update dependencies
+            isRegex: False
+        - titleContains:
+            pattern: Source code updates
+            isRegex: False
+      then:
+      - addLabel:
+          label: 'build-ops'
+      description: '[Infrastructure PRs] Add build-ops label to dependency update Pull Requests against main'
     - if:
       - payloadType: Pull_Request
       - isAction:
@@ -264,6 +323,8 @@ configuration:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Merge Forward :fast_forward:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving branch merge.
       description: '[Infrastructure PRs] Add area-infrastructure label to auto-merge Pull Requests'
@@ -380,18 +441,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview6
+          milestone: 10.0-preview7
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview5
+          branch: release/10.0-preview6
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview5
+          milestone: 10.0-preview6
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues
@@ -495,16 +556,16 @@ configuration:
       - isAction:
           action: Opened
       - targetsBranch:
-          branch: release/2.1
+          branch: release/2.3
       then:
       - addMilestone:
-          milestone: 2.1.x
+          milestone: 2.3.x
       - addReply:
           reply: >-
             Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.
 
             Otherwise, please add `tell-mode` label.
-      description: Add release/2.1 targeting PRs to the servicing project
+      description: Add release/2.3 targeting PRs to the servicing project
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -651,6 +712,8 @@ configuration:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Dependency Update :arrow_up_small:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving SDK update.
       - enableAutoMerge:
@@ -670,6 +733,8 @@ configuration:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Dependency Update :arrow_up_small:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving dependabot update.
       - enableAutoMerge:

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@d237be4630776450573bc588eb995bb8f9ebc04f # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@7a09c1144283309440a7966c664199944198c920 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

.github/workflows/inter-branch-merge-flow.yml

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@d237be4630776450573bc588eb995bb8f9ebc04f # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@7a09c1144283309440a7966c664199944198c920 # 2024-06-24