From 66737611c3190f39932df8d1c30bdc1fe0eb48ef Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Mon, 12 Dec 2016 23:23:06 +0100
Subject: [PATCH] Fix: new versioning scheme failing with PR builds

---
 .appveyor/gitDescribe.ps1 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.appveyor/gitDescribe.ps1 b/.appveyor/gitDescribe.ps1
index 98fe26ca..3a144393 100644
--- a/.appveyor/gitDescribe.ps1
+++ b/.appveyor/gitDescribe.ps1
@@ -1,9 +1,3 @@
-if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
-{
-	$Env:VersionTag = "PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
-	Return $Env:VersionTag
-}
-
 $currentCommitSha = $Env:CurrentCommitSha
 $githubRepoApiUri = $Env:githubRepoApiUri #"https://api.github.com/repos/:user/:repo/"
 $Env:VersionTag = ""
@@ -59,5 +53,12 @@ if(!$latestTag){
 	Return ;
 }
 
-$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
+if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
+{
+	$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
+}
+else
+{
+    $Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
+}
 Return $Env:VersionTag