Don't put metadata in package versions (#2743) (#2744)

(cherry picked from commit 39d0829) Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
mono · Feb 6, 2024 · db4313e · db4313e
1 parent 9198bd8
commit db4313e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets
@@ -104,9 +104,9 @@
     <PropertyGroup>
       <Version>$(_VersionNuGetMatch)</Version>
       <Version Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</Version>
-      <Version Condition="'$(AssemblyVersionGitBranch)' != '' and !$(AssemblyVersionGitBranch.StartsWith('release/'))">$(Version)+$(AssemblyVersionGitBranch.Replace('/', '-').Replace('\', '-'))</Version>
-      <Version Condition="'$(AssemblyVersionGitSha)' != ''">$(Version).$(AssemblyVersionGitSha)</Version>
       <InformationalVersion>$(Version)</InformationalVersion>
+      <InformationalVersion Condition="'$(AssemblyVersionGitBranch)' != ''">$(InformationalVersion)+$(AssemblyVersionGitBranch.Replace('/', '-').Replace('\', '-'))</InformationalVersion>
+      <InformationalVersion Condition="'$(AssemblyVersionGitSha)' != ''">$(InformationalVersion).$(AssemblyVersionGitSha)</InformationalVersion>
       <AssemblyVersion>$(_VersionAssemblyMatch)</AssemblyVersion>
       <FileVersion>$(_VersionFileMatch)</FileVersion>
     </PropertyGroup>