Merge branch 'main' into merge/release/10.0-to-main

Author: wtgodbe

.azuredevops/pull_request_template/branches/internal.md

@@ -40,6 +40,6 @@ Fixes #{bug number} (in this specific format)
 
 ----
 
-## When servicing release/2.1
+## When servicing release/2.3
 
 - [ ] Make necessary changes in eng/PatchConfig.props

.azuredevops/pull_request_template/branches/release.md

@@ -46,6 +46,6 @@ Fixes #{bug number} (in this specific format)
 
 ----
 
-## When servicing release/2.1
+## When servicing release/2.3
 
 - [ ] Make necessary changes in eng/PatchConfig.props

.github/PULL_REQUEST_TEMPLATE/servicing.md

@@ -40,6 +40,6 @@ Fixes #{bug number} (in this specific format)
 
 ----
 
-## When servicing release/2.1
+## When servicing release/2.3
 
 - [ ] Make necessary changes in eng/PatchConfig.props

.github/policies/resourceManagement.yml

@@ -441,19 +441,30 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-rc1
+          milestone: 11.0-preview1
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview7
+          branch: release/10.0-rc1
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview7
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
+          milestone: 10.0-rc1
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-rc1 branch'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Closed
+      - targetsBranch:
+          branch: release/10.0
+      then:
+      - removeMilestone
+      - addMilestone:
+          milestone: 10.0-rc2
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0 branch'
     - if:
       - payloadType: Issues
       - isAction:
@@ -566,6 +577,25 @@ configuration:
 
             Otherwise, please add `tell-mode` label.
       description: Add release/2.3 targeting PRs to the servicing project
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - targetsBranch:
+          branch: release/10.0
+      - activitySenderHasPermission:
+          permission: Read
+      - not:
+          isActivitySender:
+            user: dotnet-maestro
+            issueAuthor: False
+      - not:
+          isActivitySender:
+            user: dotnet-maestro-bot
+            issueAuthor: False
+      then:
+      - addLabel:
+          label: servicing-consider
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -743,3 +773,5 @@ configuration:
 onFailure: 
 onSuccess: 
 
+
+

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@f2cdf946c00a12a2c283835bb41ddc2255832055 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%
@@ -63,6 +63,6 @@ jobs:
 
         ----
 
-        ## When servicing release/2.1
+        ## When servicing release/2.3
 
         - [ ] Make necessary changes in eng/PatchConfig.props

.github/workflows/copilot-setup-steps.yml

@@ -16,9 +16,28 @@ jobs:
     steps:
       - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
 
-        # Include PrepareForHelix to maximise what is downloaded here
+      # Include PrepareForHelix to maximise what is downloaded here
       - name: Build solution
         env:
           # prevent GitInfo errors
           CI: false
         run: ./restore.sh
+
+      # For MCP servers like nuget's
+      - name: Install .NET 10.x
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            10.x
+          dotnet-quality: preview
+
+      # for MCP servers
+      - name: Install .NET 8.x
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            8.x
+
+      # Diagnostics in the log
+      - name: dotnet --info
+        run: dotnet --info

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

@@ -7,7 +7,8 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  issues: write
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@f2cdf946c00a12a2c283835bb41ddc2255832055 # 2024-06-24

eng/Version.Details.props

@@ -10,7 +10,7 @@
     <AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
-    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <ValidateBaseline>true</ValidateBaseline>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">8.0.1</IdentityModelVersion>
     <IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">*-*</IdentityModelVersion>