Fixes version calculation issue introduced when fixing #465

src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

@@ -122,7 +122,15 @@ public void AssertFullSemver(string fullSemver, IRepository repository = null, s
         Trace.WriteLine("---------");
 
         var variables = GetVersion(repository, commitId);
-        variables.FullSemVer.ShouldBe(fullSemver);
+        try
+        {
+            variables.FullSemVer.ShouldBe(fullSemver);
+        }
+        catch (Exception)
+        {
+            if (repository != null)
+                repository.DumpGraph();
+        }
         if (commitId == null)
             diagramBuilder.AppendLineFormat("note over {0} #D3D3D3: {1}", GetParticipant(Repository.Head.Name), fullSemver);
     }

src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs

@@ -139,7 +139,7 @@ public void GitFlowMinorRelease()
 
             // Make a commit after a tag should bump up the beta
             fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-beta.2+2");
+            fixture.AssertFullSemver("1.3.0-beta.2+1");
 
             // Complete release
             fixture.Checkout("master");
@@ -195,7 +195,7 @@ public void GitFlowMajorRelease()
 
             // Make a commit after a tag should bump up the beta
             fixture.MakeACommit();
-            fixture.AssertFullSemver("2.0.0-beta.2+2");
+            fixture.AssertFullSemver("2.0.0-beta.2+1");
 
             // Complete release
             fixture.Checkout("master");

src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -6,6 +6,7 @@
 public class HotfixBranchScenarios
 {
     [Test]
+    // This test actually validates #465 as well
     public void PatchLatestReleaseExample()
     {
         using (var fixture = new BaseGitFlowRepositoryFixture("1.2.0"))

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -159,6 +159,26 @@ public void WhenReleaseBranch_OffMaster_IsMergedIntoMaster_VersionIsTakenWithIt(
         }
     }
 
+    [Test]
+    public void MasterVersioningContinuousCorrectlyAfterMergingReleaseBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.MakeCommits(1);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+            fixture.Repository.MakeCommits(4);
+            fixture.Repository.Checkout("master");
+            fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
+
+            fixture.AssertFullSemver("2.0.0+0");
+            fixture.Repository.ApplyTag("2.0.0");
+            fixture.Repository.MakeCommits(1);
+            fixture.AssertFullSemver("2.0.1+1");
+        }
+    }
+
     [Test]
     public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
     {
@@ -180,7 +200,7 @@ public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
 
-            fixture.AssertFullSemver("2.1.0-unstable.5");
+            fixture.AssertFullSemver("2.1.0-unstable.0");
         }
     }
 
@@ -231,15 +251,15 @@ public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
 
             fixture.Repository.MakeCommits(1);
 
-            fixture.AssertFullSemver("2.0.0-beta.2+2");
+            fixture.AssertFullSemver("2.0.0-beta.2+1");
 
             //merge down to develop
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
 
             //but keep working on the release
             fixture.Repository.Checkout("release-2.0.0");
-            fixture.AssertFullSemver("2.0.0-beta.2+2");
+            fixture.AssertFullSemver("2.0.0-beta.2+1");
         }
     }
 }

src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -29,38 +29,42 @@ public BaseVersion GetBaseVersion(GitVersionContext context)
 
                         return false;
                     })
+                    .Select(v => new
+                    {
+                        IncrementedVersion = MaybeIncrement(context, v),
+                        Version = v
+                    })
                     .ToList();
 
-                var maxVersion = baseVersions.Aggregate((v1, v2) =>
-                {
-                    if (v1.SemanticVersion > v2.SemanticVersion)
-                    {
-                        return new BaseVersion(v1.Source, v1.ShouldIncrement, v1.SemanticVersion, v1.BaseVersionSource ?? v2.BaseVersionSource, v1.BranchNameOverride);
-                    }
-                    return new BaseVersion(v2.Source, v2.ShouldIncrement, v2.SemanticVersion, v2.BaseVersionSource ?? v1.BaseVersionSource, v2.BranchNameOverride);
-                });
-                var incrementedMax = MaybeIncrement(context, maxVersion);
-                var matchingVersionsOnceIncremented = baseVersions.Where(b => b.BaseVersionSource != null && MaybeIncrement(context, b) == incrementedMax).ToList();
+                var maxVersion = baseVersions.Aggregate((v1, v2) => v1.IncrementedVersion > v2.IncrementedVersion ? v1 : v2);
+                var matchingVersionsOnceIncremented = baseVersions
+                    .Where(b => b != maxVersion && b.Version.BaseVersionSource != null && b.IncrementedVersion == maxVersion.IncrementedVersion)
+                    .ToList();
                 BaseVersion baseVersionWithOldestSource;
                 if (matchingVersionsOnceIncremented.Any())
                 {
-                    baseVersionWithOldestSource = matchingVersionsOnceIncremented.Aggregate((v1, v2) => v1.BaseVersionSource.Committer.When < v2.BaseVersionSource.Committer.When ? v1 : v2);
+                    baseVersionWithOldestSource = matchingVersionsOnceIncremented.Aggregate((v1, v2) => v1.Version.BaseVersionSource.Committer.When < v2.Version.BaseVersionSource.Committer.When ? v1 : v2).Version;
                     Logger.WriteInfo(string.Format(
                         "Found multiple base versions which will produce the same SemVer ({0}), taking oldest source for commit counting ({1})",
-                        incrementedMax,
+                        maxVersion.IncrementedVersion,
                         baseVersionWithOldestSource.Source));
                 }
                 else
                 {
-                    baseVersionWithOldestSource = maxVersion;
+                    baseVersionWithOldestSource = baseVersions
+                        .Where(v => v.Version.BaseVersionSource != null)
+                        .OrderBy(v => v.IncrementedVersion)
+                        .ThenByDescending(v => v.Version.BaseVersionSource.Committer.When)
+                        .First()
+                        .Version;
                 }
 
                 if (baseVersionWithOldestSource.BaseVersionSource == null)
                     throw new Exception("Base version should not be null");
 
                 var calculatedBase = new BaseVersion(
-                    maxVersion.Source, maxVersion.ShouldIncrement, maxVersion.SemanticVersion,
-                    baseVersionWithOldestSource.BaseVersionSource, maxVersion.BranchNameOverride);
+                    maxVersion.Version.Source, maxVersion.Version.ShouldIncrement, maxVersion.Version.SemanticVersion,
+                    baseVersionWithOldestSource.BaseVersionSource, maxVersion.Version.BranchNameOverride);
 
                 Logger.WriteInfo(string.Format("Base version used: {0}", calculatedBase));