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

@@ -63,6 +63,6 @@ jobs:
 
         ----
 
-        ## When servicing release/2.1
+        ## When servicing release/2.3
 
         - [ ] Make necessary changes in eng/PatchConfig.props

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

@@ -7,6 +7,7 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  issues: write
 
 jobs:
   Merge:

eng/Version.Details.props

@@ -10,8 +10,8 @@
 #    displayName: Setup Private Feeds Credentials
 #    condition: eq(variables['Agent.OS'], 'Windows_NT')
 #    inputs:
-#      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-#      arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
+#      filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
+#      arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
 #    env:
 #      Token: $(dn-bot-dnceng-artifact-feeds-rw)
 #

eng/Version.Details.xml

@@ -11,8 +11,8 @@
 #  - task: Bash@3
 #    displayName: Setup Internal Feeds
 #    inputs:
-#      filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-#      arguments: $(Build.SourcesDirectory)/NuGet.config
+#      filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
+#      arguments: $(System.DefaultWorkingDirectory)/NuGet.config
 #    condition: ne(variables['Agent.OS'], 'Windows_NT')
 #  - task: NuGetAuthenticate@1
 #