From 02f44e6bf06abc82043de765ae5b7859f5ad4ff2 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis@ez13.net>
Date: Wed, 24 Mar 2021 11:26:25 -0700
Subject: [PATCH 1/2] treat rebuild branches like release branches

---
 tools/releaseBuild/setReleaseTag.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
index 121425d963b..8475701cc6b 100644
--- a/tools/releaseBuild/setReleaseTag.ps1
+++ b/tools/releaseBuild/setReleaseTag.ps1
@@ -65,11 +65,12 @@ $isDaily = $false
 if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
 {
     # Branch is named release-<semver>
-    if($Branch -match '^.*(release[-/])')
+    $releaseBranchRegex = '^.*((release|rebuild)[-/])'
+    if($Branch -match $releaseBranchRegex)
     {
         $msixType = 'release'
         Write-Verbose "release branch:" -Verbose
-        $releaseTag = $Branch -replace '^.*(release[-/])'
+        $releaseTag = $Branch -replace $releaseBranchRegex
         $vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag"
         Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose
         Write-Host -Object "##$vstsCommandString"

From 26e541b3b5a8e2f5c5e4bd0a2a3703c4922d03cb Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 24 Mar 2021 18:02:09 -0700
Subject: [PATCH 2/2] Update tools/releaseBuild/setReleaseTag.ps1

---
 tools/releaseBuild/setReleaseTag.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
index 8475701cc6b..1659dbc74cb 100644
--- a/tools/releaseBuild/setReleaseTag.ps1
+++ b/tools/releaseBuild/setReleaseTag.ps1
@@ -65,7 +65,7 @@ $isDaily = $false
 if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
 {
     # Branch is named release-<semver>
-    $releaseBranchRegex = '^.*((release|rebuild)[-/])'
+    $releaseBranchRegex = '^.*((release/|rebuild/.*rebuild))'
     if($Branch -match $releaseBranchRegex)
     {
         $msixType = 'release'