Fixing some develop tests

Author: JakeGinnivan

GitVersionCore.Tests/GitVersionContextBuilder.cs

@@ -29,6 +29,12 @@ public GitVersionContextBuilder WithTaggedMaster()
             return this;
         }
 
+        public GitVersionContextBuilder AddCommit()
+        {
+            ((MockBranch)repository.Head).Add(new MockCommit());
+            return this;
+        }
+
         public GitVersionContextBuilder WithDevelopBranch()
         {
             repository = CreateRepository();

GitVersionCore.Tests/IntegrationTests/GitFlow/DevelopScenarios.cs

@@ -41,7 +41,7 @@ public void CanChangeDevelopTagViaConfig()
         {
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.CreateBranch("develop").Checkout();
-            fixture.AssertFullSemver("1.1.0-alpha.0+0");
+            fixture.AssertFullSemver("1.0.0-alpha.1+0");
         }
     }
 
@@ -55,7 +55,7 @@ public void CanHandleContinuousDelivery()
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.CreateBranch("develop").Checkout();
             fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
-            fixture.AssertFullSemver("1.1.0-alpha.7+1");
+            fixture.AssertFullSemver("1.1.0-alpha.7+0");
         }
     }
 
@@ -68,7 +68,7 @@ public void CanClearDevelopTagViaConfig()
         {
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.CreateBranch("develop").Checkout();
-            fixture.AssertFullSemver("1.1.0+0");
+            fixture.AssertFullSemver("1.0.0+0");
         }
     }
 

GitVersionCore.Tests/VersionCalculation/Strategies/LastTagBaseVersionStrategyTests.cs

@@ -8,16 +8,30 @@
     public class LastTagBaseVersionStrategyTests
     {
         [Test]
-        public void ShouldAllowVersionIncremenet()
+        public void ShouldAllowVersionIncrement()
         {
             var context = new GitVersionContextBuilder()
                 .WithTaggedMaster()
+                .AddCommit()
                 .Build();
             var sut = new LastTagBaseVersionStrategy();
 
             var baseVersion = sut.GetVersion(context);
 
             baseVersion.ShouldIncrement.ShouldBe(true);
         }
+
+        [Test]
+        public void ShouldNotAllowVersionIncrementWhenTagComesFromCurrentCommit()
+        {
+            var context = new GitVersionContextBuilder()
+                .WithTaggedMaster()
+                .Build();
+            var sut = new LastTagBaseVersionStrategy();
+
+            var baseVersion = sut.GetVersion(context);
+
+            baseVersion.ShouldIncrement.ShouldBe(false);
+        }
     }
 }

GitVersionCore/VersionCalculation/BaseVersionCalculators/LastTagBaseVersionStrategy.cs

@@ -6,7 +6,10 @@ public override BaseVersion GetVersion(GitVersionContext context)
         {
             VersionTaggedCommit version;
             if (new LastTaggedReleaseFinder(context).GetVersion(out version))
-                return new BaseVersion(true, version.SemVer, version.Commit);
+            {
+                var shouldIncrement = version.Commit != context.CurrentCommit;
+                return new BaseVersion(shouldIncrement, version.SemVer, version.Commit);
+            }
 
             return null;
         }

GitVersionCore/VersionCalculation/MetaDataCalculator.cs

@@ -14,8 +14,10 @@ public SemanticVersionBuildMetaData Create(Commit baseVersionSource, GitVersionC
                 SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
             };
 
+            var commitsSinceTag = context.Repository.Commits.QueryBy(qf).Count();
+
             return new SemanticVersionBuildMetaData(
-                context.Repository.Commits.QueryBy(qf).Count(),
+                commitsSinceTag,
                 context.CurrentBranch.Name,
                 context.CurrentCommit.Sha,
                 context.CurrentCommit.When());

GitVersionCore/VersionCalculation/NewNextVersionCalculator.cs

@@ -57,8 +57,11 @@ static void IncrementVersion(GitVersionContext context, BaseVersion baseVersion)
             }
             else
             {
-                baseVersion.SemanticVersion.PreReleaseTag.Number = baseVersion.SemanticVersion.PreReleaseTag.Number ?? 0;
-                baseVersion.SemanticVersion.PreReleaseTag.Number++;
+                if (baseVersion.SemanticVersion.PreReleaseTag.Number != null)
+                {
+                    baseVersion.SemanticVersion.PreReleaseTag.Number = baseVersion.SemanticVersion.PreReleaseTag.Number;
+                    baseVersion.SemanticVersion.PreReleaseTag.Number++;
+                }
             }
         }
     }