From a5528fc661a310461d4169f70d6ee51db620b0e4 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 28 Jan 2017 22:27:40 +0000
Subject: [PATCH] Improve tag deployment on AppVeyor

[ci skip]
---
 openrct2.proj                   | 3 +--
 scripts/ps/appveyor_install.ps1 | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/openrct2.proj b/openrct2.proj
index daf52dfe1f..7f1a80d974 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -21,8 +21,7 @@
 
     <Version>0.0.6.0</Version>
     <VersionExtra Condition="'$(GIT_BRANCH)'!=''">-$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT)</VersionExtra>
-    <VersionTag Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(GIT_TAG)', '^v[0-9]'))">$(GIT_TAG)</VersionTag>
-    <VersionExtra Condition="'$(GIT_TAG)'!='' AND '$(VersionTag)'==''">-$(GIT_TAG)</VersionExtra>
+    <VersionExtra Condition="'$(GIT_TAG)'!=''"></VersionExtra>
     <TargetLibsVersion>11</TargetLibsVersion>
 
     <!-- Set dynamic OpenRCT2 #defines -->
diff --git a/scripts/ps/appveyor_install.ps1 b/scripts/ps/appveyor_install.ps1
index dadc11a679..66607a515f 100644
--- a/scripts/ps/appveyor_install.ps1
+++ b/scripts/ps/appveyor_install.ps1
@@ -54,4 +54,8 @@ else
 
 $env:GIT_TAG            = $env:APPVEYOR_REPO_TAG_NAME
 $env:GIT_BRANCH         = $env:APPVEYOR_REPO_BRANCH
+if (${env:APPVEYOR_REPO_TAG} -eq "true")
+{
+    $env:GIT_BRANCH = $env:GIT_TAG
+}
 $env:GIT_COMMIT_SHA1    = $env:APPVEYOR_REPO_COMMIT