(GitToolsGH-2456) Testing stuff out just now

Will rebase with proper commit message and tests later.
gep13 · Feb 6, 2021 · 60de537 · 60de537
1 parent 6c8e199
commit 60de537
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs
@@ -56,15 +56,23 @@ public SemanticVersion FindVersion()
             }
 
             var baseVersion = baseVersionCalculator.GetBaseVersion();
+            baseVersion.SemanticVersion.BuildMetaData = mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
             SemanticVersion semver;
             if (context.Configuration.VersioningMode == VersioningMode.Mainline)
             {
                 semver = mainlineVersionCalculator.FindMainlineModeVersion(baseVersion);
             }
             else
             {
-                semver = PerformIncrement(baseVersion);
-                semver.BuildMetaData = mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
+                if (taggedSemanticVersion?.BuildMetaData == null || (taggedSemanticVersion.BuildMetaData.Sha != baseVersion.SemanticVersion.BuildMetaData.Sha))
+                {
+                    semver = PerformIncrement(baseVersion);
+                    semver.BuildMetaData = mainlineVersionCalculator.CreateVersionBuildMetaData(baseVersion.BaseVersionSource);
+                }
+                else
+                {
+                    semver = baseVersion.SemanticVersion;
+                }
             }
 
             var hasPreReleaseTag = semver.PreReleaseTag.HasTag();