From 9d9271d08a11ef371acba060b253d1d62ec1730b Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Wed, 22 May 2019 04:04:10 +0100
Subject: [PATCH] [Build] Fix Version for branches with dashes

---
 Version.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Version.targets b/Version.targets
index 54bea53..34b19d1 100644
--- a/Version.targets
+++ b/Version.targets
@@ -27,8 +27,8 @@
       <VersionMetadataPlusLabel Condition="'$(VersionMetadataLabel)' != ''">+$(VersionMetadataLabel)</VersionMetadataPlusLabel>
 
       <GitSemVerDashLabel Condition="'$(GitSemVerDashLabel)' != '' and '$(GitCommits)' != '0'">$(GitSemVerDashLabel).$(GitCommits)</GitSemVerDashLabel>
-      <PackageVersion>$(GitBaseVersion)$(GitSemVerDashLabel)$(VersionMetadataPlusLabel)</PackageVersion>
-      <Version>$(GitBaseVersion)</Version>
+      <Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</Version>
+      <PackageVersion>$(Version)$(GitSemVerDashLabel)$(VersionMetadataPlusLabel)</PackageVersion>
     </PropertyGroup>
 
     <PropertyGroup>
-- 
2.7.4