From c7ed7129b2d1e47477dd4d337198dab28091702a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 7 Sep 2018 18:12:10 -0700
Subject: [PATCH] update metadata json in preparation for 6.1 release (#7741)

ReleaseTag is now StableReleaseTag
NextReleaseTag is not PreviewReleaseTag
Added ServicingReleaseTag for the N-1 Stable release
---
 tools/appveyor.psm1                  | 2 +-
 tools/metadata.json                  | 3 +++
 tools/releaseBuild/setReleaseTag.ps1 | 2 +-
 tools/releaseTools.psm1              | 2 +-
 tools/travis.ps1                     | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
index 5a6f4649c8..b70cb093cd 100644
--- a/tools/appveyor.psm1
+++ b/tools/appveyor.psm1
@@ -501,7 +501,7 @@ function Get-ReleaseTag
     $metaDataPath = Join-Path -Path $PSScriptRoot -ChildPath 'metadata.json'
     $metaData = Get-Content $metaDataPath | ConvertFrom-Json
 
-    $releaseTag = $metadata.NextReleaseTag
+    $releaseTag = $metadata.PreviewReleaseTag
     if($env:APPVEYOR_BUILD_NUMBER)
     {
         $releaseTag = $releaseTag.split('.')[0..2] -join '.'
diff --git a/tools/metadata.json b/tools/metadata.json
index 2c7d8fe068..81916e29ce 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,4 +1,7 @@
 {
+  "StableReleaseTag": "v6.0.4",
+  "PreviewReleaseTag": "v6.1.0-rc.1",
+  "ServicingReleaseTag": "v6.0.4",
   "ReleaseTag": "v6.0.4",
   "NextReleaseTag": "v6.1.0-rc.1"
 }
diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
index c59df66d9e..4a86ef5644 100644
--- a/tools/releaseBuild/setReleaseTag.ps1
+++ b/tools/releaseBuild/setReleaseTag.ps1
@@ -34,7 +34,7 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
         # Get version from metadata and append -<previewname>
         $metaDataJsonPath = Join-Path $PSScriptRoot -ChildPath '..\metadata.json'
         $metadata = Get-content $metaDataJsonPath | ConvertFrom-Json
-        $versionPart = $metadata.NextReleaseTag
+        $versionPart = $metadata.PreviewReleaseTag
         if($versionPart -match '-.*$')
         {
             $versionPart = $versionPart -replace '-.*$'
diff --git a/tools/releaseTools.psm1 b/tools/releaseTools.psm1
index 30395ed668..4c539ddfe5 100644
--- a/tools/releaseTools.psm1
+++ b/tools/releaseTools.psm1
@@ -428,7 +428,7 @@ function Update-PsVersionInCode
 
     $metaDataPath = (Join-Path -Path $PSScriptRoot -ChildPath 'metadata.json')
     $metaData = Get-Content -Path $metaDataPath | convertfrom-json
-    $currentTag = $metaData.ReleaseTag
+    $currentTag = $metaData.StableReleaseTag
 
     $currentVersion = $currentTag -replace '^v'
     $newVersion = $NewReleaseTag -replace '^v'
diff --git a/tools/travis.ps1 b/tools/travis.ps1
index 217377ca55..791ca4560c 100644
--- a/tools/travis.ps1
+++ b/tools/travis.ps1
@@ -50,7 +50,7 @@ function Get-ReleaseTag
     $metaDataPath = Join-Path -Path $PSScriptRoot -ChildPath 'metadata.json'
     $metaData = Get-Content $metaDataPath | ConvertFrom-Json
 
-    $releaseTag = $metadata.NextReleaseTag
+    $releaseTag = $metadata.PreviewReleaseTag
     if($env:TRAVIS_BUILD_NUMBER)
     {
         $releaseTag = $releaseTag.split('.')[0..2] -join '.'