From 01cb68f763fe6c049de5873c5a6e3524f7b2a8cb Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Wed, 9 Sep 2020 22:27:49 -0700
Subject: [PATCH] Fix release tagging (#636)

* add ReleaseTag
* pkgId -> pkgName
* pkgId -> pkgName
* beta.2
---
 eng/common/scripts/artifact-metadata-parsing.ps1           | 2 +-
 eng/scripts/Language-Settings.ps1                          | 1 +
 sdk/template/azure-template/CHANGELOG.md                   | 4 ++++
 sdk/template/azure-template/inc/azure/template/version.hpp | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/eng/common/scripts/artifact-metadata-parsing.ps1 b/eng/common/scripts/artifact-metadata-parsing.ps1
index 94e95ca17..052dccc73 100644
--- a/eng/common/scripts/artifact-metadata-parsing.ps1
+++ b/eng/common/scripts/artifact-metadata-parsing.ps1
@@ -336,7 +336,7 @@ function ParseCppArtifact($pkg, $workingDirectory) {
   return New-Object PSObject -Property @{
     PackageId      = $pkgName
     PackageVersion = $pkgVersion
-    ReleaseTag     = "$($pkgId)_$($pkgVersion)"
+    ReleaseTag     = "$($pkgName)_$($pkgVersion)"
     # Artifact info is always considered deployable for now becasue it is not
     # deployed anywhere. Dealing with duplicate tags happens downstream in
     # CheckArtifactShaAgainstTagsList
diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index 2741361fa..61279e606 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -30,6 +30,7 @@ function Get-cpp-PackageInfoFromPackageFile($pkg, $workingDirectory)
   return New-Object PSObject -Property @{
     PackageId      = $pkgName
     PackageVersion = $pkgVersion
+    ReleaseTag     = "$($pkgName)_$($pkgVersion)"
     # Artifact info is always considered deployable for now becasue it is not
     # deployed anywhere. Dealing with duplicate tags happens downstream in
     # CheckArtifactShaAgainstTagsList
diff --git a/sdk/template/azure-template/CHANGELOG.md b/sdk/template/azure-template/CHANGELOG.md
index 6d13270db..24187c4ba 100644
--- a/sdk/template/azure-template/CHANGELOG.md
+++ b/sdk/template/azure-template/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History
 
+## 1.0.0-beta.2 (2020-09-09)
+
+* Validate engineering system changes
+
 ## 1.0.0-beta.1 (2020-09-01)
 
 * Template package validating release pipeline
diff --git a/sdk/template/azure-template/inc/azure/template/version.hpp b/sdk/template/azure-template/inc/azure/template/version.hpp
index febd1ce61..6517f1a45 100644
--- a/sdk/template/azure-template/inc/azure/template/version.hpp
+++ b/sdk/template/azure-template/inc/azure/template/version.hpp
@@ -8,7 +8,7 @@
 #define AZURE_TEMPLATE_VERSION_MAJOR 1
 #define AZURE_TEMPLATE_VERSION_MINOR 0
 #define AZURE_TEMPLATE_VERSION_PATCH 0
-#define AZURE_TEMPLATE_VERSION_PRERELEASE "beta.1"
+#define AZURE_TEMPLATE_VERSION_PRERELEASE "beta.2"
 
 namespace Azure { namespace Template {