[Build] Fix Version for branches with dashes

diff --git a/Version.targets b/Version.targets
index 54bea53..34b19d1 100644 (file)
--- 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>