From a7a521349e00949b458af29c018feaf74ed3c39a Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Fri, 10 Feb 2023 14:44:25 -0600
Subject: [PATCH] Automate MSBuild's merge chain

---
 Maestro/subscriptions.json | 49 +++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/Maestro/subscriptions.json b/Maestro/subscriptions.json
index aad22b25d4a..087d04ffc12 100644
--- a/Maestro/subscriptions.json
+++ b/Maestro/subscriptions.json
@@ -1316,11 +1316,11 @@
         }
       }
     },
-    // Automate opening PRs to merge msbuild's vs17* branches into main
-    // For details on how the triggerpath globbing syntax works, see: https://github.com/dotnet/versions/issues/558
+    // MSBuild servicing chain from oldest supported through currently-supported to main
+    // Automate opening PRs to merge msbuild's vs16.11 into vs17.0
     {
       "triggerPaths": [
-        "https://github.com/dotnet/msbuild/blob/vs17/**/*"
+        "https://github.com/dotnet/msbuild/blob/vs16.11/**/*"
       ],
       "action": "github-dnceng-branch-merge-pr-generator",
       "actionArguments": {
@@ -1329,14 +1329,14 @@
           "GithubRepoOwner": "dotnet",
           "GithubRepoName": "<trigger-repo>",
           "HeadBranch": "<trigger-branch>",
-          "BaseBranch": "main"
+          "BaseBranch": "vs17.0"
         }
       }
     },
-    // Automate opening PRs to merge msbuild's vs16.10 into vs16.11 and vs16.11 into main
+    // Automate opening PRs to merge msbuild's vs17.0 into vs17.2
     {
       "triggerPaths": [
-        "https://github.com/dotnet/msbuild/blob/vs16.10/**/*"
+        "https://github.com/dotnet/msbuild/blob/vs17.0/**/*"
       ],
       "action": "github-dnceng-branch-merge-pr-generator",
       "actionArguments": {
@@ -1345,13 +1345,46 @@
           "GithubRepoOwner": "dotnet",
           "GithubRepoName": "<trigger-repo>",
           "HeadBranch": "<trigger-branch>",
-          "BaseBranch": "vs16.11"
+          "BaseBranch": "vs17.2"
         }
       }
     },
+    // Automate opening PRs to merge msbuild's vs17.2 into vs17.4
     {
       "triggerPaths": [
-        "https://github.com/dotnet/msbuild/blob/vs16.11/**/*"
+        "https://github.com/dotnet/msbuild/blob/vs17.2/**/*"
+      ],
+      "action": "github-dnceng-branch-merge-pr-generator",
+      "actionArguments": {
+        "vsoSourceBranch": "main",
+        "vsoBuildParameters": {
+          "GithubRepoOwner": "dotnet",
+          "GithubRepoName": "<trigger-repo>",
+          "HeadBranch": "<trigger-branch>",
+          "BaseBranch": "vs17.4"
+        }
+      }
+    },
+    // Automate opening PRs to merge msbuild's vs17.4 into vs17.5
+    {
+      "triggerPaths": [
+        "https://github.com/dotnet/msbuild/blob/vs17.4/**/*"
+      ],
+      "action": "github-dnceng-branch-merge-pr-generator",
+      "actionArguments": {
+        "vsoSourceBranch": "main",
+        "vsoBuildParameters": {
+          "GithubRepoOwner": "dotnet",
+          "GithubRepoName": "<trigger-repo>",
+          "HeadBranch": "<trigger-branch>",
+          "BaseBranch": "vs17.5"
+        }
+      }
+    },
+    // MSBuild latest release to main
+    {
+      "triggerPaths": [
+        "https://github.com/dotnet/msbuild/blob/vs17.5/**/*"
       ],
       "action": "github-dnceng-branch-merge-pr-generator",
       "actionArguments": {