All tags on master affect develops version. This addresses GitTools#796

Author: JakeGinnivan

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -20,11 +20,10 @@ public void NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch()
             fixture.Repository.MergeNoFF("release/1.0.0");
             fixture.Repository.ApplyTag("1.0.0");
             fixture.Repository.Checkout("develop");
-            fixture.Repository.MakeACommit();
 
             fixture.Repository.Branches.Remove(releaseBranch);
 
-            fixture.AssertFullSemver("1.1.0-alpha.1");
+            fixture.AssertFullSemver("1.1.0-alpha.0");
         }
     }
 

src/GitVersionCore/GitVersionCore.csproj

@@ -139,7 +139,6 @@
     <Compile Include="VersionCalculation\BaseVersionCalculator.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\BaseVersion.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\ConfigNextVersionBaseVersionStrategy.cs" />
-    <Compile Include="VersionCalculation\BaseVersionCalculators\TrackMergeTargetBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\TaggedCommitVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\MergeMessageBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\VersionInBranchBaseVersionStrategy.cs" />

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs

@@ -1,5 +1,6 @@
 namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using LibGit2Sharp;
@@ -8,14 +9,13 @@ public class TaggedCommitVersionStrategy : BaseVersionStrategy
     {
         public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
         {
-            return GetTaggedVersions(context, context.CurrentBranch);
+            return GetTaggedVersions(context, context.CurrentBranch, context.CurrentCommit.When());
         }
 
-        public IEnumerable<BaseVersion> GetTaggedVersions(GitVersionContext context, Branch currentBranch)
+        public IEnumerable<BaseVersion> GetTaggedVersions(GitVersionContext context, Branch currentBranch, DateTimeOffset? olderThan)
         {
-            var olderThan = context.CurrentCommit.When();
             var allTags = context.Repository.Tags
-                .Where(tag => ((Commit) tag.PeeledTarget()).When() <= olderThan)
+                .Where(tag => !olderThan.HasValue || ((Commit) tag.PeeledTarget()).When() <= olderThan.Value)
                 .ToList();
             var tagsOnBranch = currentBranch
                 .Commits

src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs

@@ -30,7 +30,7 @@ private IEnumerable<BaseVersion> MasterTagsVersions(GitVersionContext context)
             var master = context.Repository.FindBranch("master");
             if (master != null)
             {
-                return taggedCommitVersionStrategy.GetTaggedVersions(context, master);
+                return taggedCommitVersionStrategy.GetTaggedVersions(context, master, null);
             }
 
             return new BaseVersion[0];