From 25fe58bfb93773536599b5a4f0c159afe76a0597 Mon Sep 17 00:00:00 2001
From: oddMLan <oddMLan2@gmail.com>
Date: Wed, 2 Oct 2019 21:57:18 -0700
Subject: [PATCH] Actually fix Zip file name Get the correct version string
 from SetGitProperties.cmd

---
 Source/Script/SetGitProperties.cmd |  1 +
 appveyor.yml                       | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/Script/SetGitProperties.cmd b/Source/Script/SetGitProperties.cmd
index cba58fc01..b2aec39c7 100644
--- a/Source/Script/SetGitProperties.cmd
+++ b/Source/Script/SetGitProperties.cmd
@@ -12,6 +12,7 @@ for /F "tokens=1,2,3 delims=-" %%i in ("%GIT_DESCRIBE%") do call :process_git_de
 for /F "tokens=1,2,3" %%i in (%base_dir%\Source\Project64-core\version.h.in) do call :process_version %%i %%j %%k
 set VERSION=v%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_REVISION%-%VERSION_BUILD%-%VERSION_COMMIT%
 
+echo %VERSION%
 echo GIT_DESCRIBE = %VERSION% > "%base_dir%\git.properties"
 goto :EOF
 
diff --git a/appveyor.yml b/appveyor.yml
index 63130badf..9e11159b1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,17 +9,15 @@ configuration:
 before_build:
 - ps: >-
     If ($env:APPVEYOR_BUILD_VERSION -Like "1.0*") {
-      echo  $env:APPVEYOR_BUILD_VERSION
-      $current_tag = git describe --tags --long --dirty
-      echo  $current_tag
-      appveyor UpdateBuild -Version $current_tag
+      $version = Source/Script/SetGitProperties.cmd
+      appveyor UpdateBuild -Version $version
     }
 build:
   project: Project64.sln
   parallel: true
   verbosity: minimal
 after_build:
-- Source/Script/package_zip.cmd %current_tag%-%platform%.zip %platform%
+- Source/Script/package_zip.cmd %APPVEYOR_BUILD_VERSION%-%platform%.zip %platform%
 
 artifacts:
-- path: Package/*.zip
\ No newline at end of file
+- path: Package/*.zip