[Build] Fix Version for branches with dashes

fredatgithub · May 22, 2019 · 9d9271d · 9d9271d
1 parent 043d5b0
commit 9d9271d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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>