Version as v<epoch+height>, not v<height>

Resolve PackageVersion as the base tag's epoch plus the MinVer height (e.g. tag 1.9.1-v5 + height 9 -> 1.9.1-v14), matching the nativebinaries repo. The number now continues from the tag instead of restarting at the height; on the tag itself the height is 0, so the number equals the tag. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
andrei-balint · Jul 7, 2026 · Jul 6, 2026 · Jul 6, 2026 · Jul 6, 2026 · Jul 6, 2026
commit fe981184d948a99ddd23a0cac2c9ab13c1e4e8a5
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -52,16 +52,18 @@
   <Target Name="AdjustVersions" AfterTargets="MinVer">
     <PropertyGroup>
       <AssemblyVersion>$(MinVerMajor).$(MinVerMinor).0.0</AssemblyVersion>
-      <!-- Collapse MinVer's "<epoch>.<height>" pre-release (e.g. v5.22) into a single
-           auto-incrementing "v<height>" (e.g. v22). The base tag (1.9.1-v5) is only a permanent
-           counting anchor: v<height> rises monotonically on every develop commit, so no manual
-           version tagging is needed. NEVER cut another -vN tag on this line, or the height (hence
-           v<N>) resets and the package version would regress. On the base tag itself there is no
-           height, so the pre-release has no '.' and the height is 0. -->
-      <_VersionHeight>0</_VersionHeight>
-      <_VersionHeight Condition="$(MinVerPreRelease.Contains('.'))">$(MinVerPreRelease.Substring($([MSBuild]::Add($(MinVerPreRelease.LastIndexOf('.')), 1))))</_VersionHeight>
+      <!-- Turn MinVer's "v<epoch>.<height>" pre-release (base tag 1.9.1-v5 at height 1 -> "v5.1")
+           into a single continuing "v<epoch+height>" (e.g. v6). The base tag sets the epoch and each
+           commit past it increments the number (v6, v7, ...); on the tag itself the height is 0 so
+           the number equals the tag, making a later re-tag at v<N> seamless. Merge topology only
+           affects the height, and epoch+height keeps climbing. -->
+      <_PreNoV>$(MinVerPreRelease.TrimStart('v'))</_PreNoV>
+      <_Epoch Condition="$(_PreNoV.Contains('.'))">$(_PreNoV.Substring(0, $(_PreNoV.IndexOf('.'))))</_Epoch>
+      <_Epoch Condition="!$(_PreNoV.Contains('.'))">$(_PreNoV)</_Epoch>
+      <_Height>0</_Height>
+      <_Height Condition="$(_PreNoV.Contains('.'))">$(_PreNoV.Substring($([MSBuild]::Add($(_PreNoV.IndexOf('.')), 1))))</_Height>
       <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)</PackageVersion>
-      <PackageVersion Condition="'$(MinVerPreRelease)' != ''">$(PackageVersion)-v$(_VersionHeight)</PackageVersion>
+      <PackageVersion Condition="'$(MinVerPreRelease)' != ''">$(PackageVersion)-v$([MSBuild]::Add($(_Epoch), $(_Height)))</PackageVersion>
     </PropertyGroup>
   </Target>