From 94a31fe6306e4a51e2f8914c5d1c6c9ac21dbb99 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 27 Aug 2016 13:54:19 +0100
Subject: [PATCH] Set correct version text for upload filenames

---
 openrct2.proj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openrct2.proj b/openrct2.proj
index edc667dc4b..ffee1c1c29 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -18,6 +18,9 @@
 
   <PropertyGroup>
     <Version>0.0.5</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>
     <TargetLibsVersion>9</TargetLibsVersion>
 
     <BUILD_SERVER Condition="'$(BUILD_SERVER)'==''">$(COMPUTERNAME)</BUILD_SERVER>
@@ -52,7 +55,7 @@
     <PublishSymbolsZip Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(ArtifactsDir)openrct2-symbols$(PublishPostfix).zip</PublishSymbolsZip>
     <PublishInstallerExe>$(ArtifactsDir)openrct2-installer$(PublishPostfix).exe</PublishInstallerExe>
 
-    <UploadFilename>OpenRCT2-$(Version)$(VersionExtension)-windows</UploadFilename>
+    <UploadFilename>OpenRCT2-$(Version)$(VersionExtra)-windows</UploadFilename>
   </PropertyGroup>
 
   <!-- 3rd party libraries / dependencies -->
@@ -226,9 +229,6 @@
           Outputs="$(PublishInstallerExe)"
           Condition="'$(NO_NSIS)'!='true'">
     <PropertyGroup>
-      <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>
       <PublishInstallerExeName>$([System.IO.Path]::GetFilename($(PublishInstallerExe)))</PublishInstallerExeName>
     </PropertyGroup>