From 4192463ce6119ec298459ea60cd12f5c2fa1f07c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 6 Jun 2018 10:55:28 -0700
Subject: [PATCH] fix issue with setReleaseTag using variable meant for
 non-release branches during a release (#7011)

There was a regression in the script where a variable meant for non-release branches was used during releases
---
 tools/releaseBuild/setReleaseTag.ps1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
index 61e4aee2df..c59df66d9e 100644
--- a/tools/releaseBuild/setReleaseTag.ps1
+++ b/tools/releaseBuild/setReleaseTag.ps1
@@ -21,13 +21,15 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
     # Branch is named release-<semver>
     if($Branch -match '^.*(release-)')
     {
-        $releaseTag = $branchOnly -replace '^.*(release-)'
+        Write-verbose "release branch:" -verbose
+        $releaseTag = $Branch -replace '^.*(release-)'
         $vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag"
         Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose
         Write-Host -Object "##$vstsCommandString"
     }
     else
     {
+        Write-verbose "non-release branch" -verbose
         # Branch is named <previewname>
         # Get version from metadata and append -<previewname>
         $metaDataJsonPath = Join-Path $PSScriptRoot -ChildPath '..\metadata.json'