Removed ShouldUpdateTag as context.IsCurrentCommitTagged should be enough

Author: JakeGinnivan

GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -64,7 +64,7 @@ public V1Strategy(DateTimeOffset? when)
 
             public override BaseVersion GetVersion(GitVersionContext context)
             {
-                return new BaseVersion("Source 1", false, true, new SemanticVersion(1), when, null);
+                return new BaseVersion("Source 1", false, new SemanticVersion(1), when, null);
             }
         }
 
@@ -79,7 +79,7 @@ public V2Strategy(DateTimeOffset? when)
 
             public override BaseVersion GetVersion(GitVersionContext context)
             {
-                return new BaseVersion("Source 2", true, true, new SemanticVersion(2), when, null);
+                return new BaseVersion("Source 2", true, new SemanticVersion(2), when, null);
             }
         }
     }

GitVersionCore.Tests/VersionCalculation/NewNextVersionCalculatorTests.cs renamed to GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

@@ -11,7 +11,7 @@ public class NextVersionCalculatorTests
         [Test]
         public void ShouldIncrementVersionBasedOnConfig()
         {
-            var baseCalculator = new TestBaseVersionCalculator(true, true, new SemanticVersion(1), new MockCommit());
+            var baseCalculator = new TestBaseVersionCalculator(true, new SemanticVersion(1), new MockCommit());
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(1, "master", "b1a34e", DateTimeOffset.Now);
             var sut = new NextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var config = new Config();
@@ -25,7 +25,7 @@ public void ShouldIncrementVersionBasedOnConfig()
         [Test]
         public void DoesNotIncrementWhenBaseVersionSaysNotTo()
         {
-            var baseCalculator = new TestBaseVersionCalculator(false, true, new SemanticVersion(1), new MockCommit());
+            var baseCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit());
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(1, "master", "b1a34e", DateTimeOffset.Now);
             var sut = new NextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var config = new Config();
@@ -39,7 +39,7 @@ public void DoesNotIncrementWhenBaseVersionSaysNotTo()
         [Test]
         public void AppliesBranchPreReleaseTag()
         {
-            var baseCalculator = new TestBaseVersionCalculator(false, true, new SemanticVersion(1), new MockCommit());
+            var baseCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit());
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(2, "develop", "b1a34e", DateTimeOffset.Now);
             var sut = new NextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var context = new GitVersionContextBuilder()
@@ -54,7 +54,7 @@ public void AppliesBranchPreReleaseTag()
         [Test]
         public void PreReleaseTagCanUseBranchName()
         {
-            var baseCalculator = new TestBaseVersionCalculator(false, true, new SemanticVersion(1), new MockCommit());
+            var baseCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit());
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(2, "develop", "b1a34e", DateTimeOffset.Now);
             var sut = new NextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var config = new Config();

GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs

@@ -9,20 +9,18 @@ public class TestBaseVersionCalculator : IBaseVersionCalculator
     {
         readonly SemanticVersion semanticVersion;
         bool shouldIncrement;
-        bool shouldUpdateTag;
         Commit source;
 
-        public TestBaseVersionCalculator(bool shouldIncrement, bool shouldUpdateTag, SemanticVersion semanticVersion, Commit source)
+        public TestBaseVersionCalculator(bool shouldIncrement, SemanticVersion semanticVersion, Commit source)
         {
             this.semanticVersion = semanticVersion;
             this.source = source;
-            this.shouldUpdateTag = shouldUpdateTag;
             this.shouldIncrement = shouldIncrement;
         }
 
         public BaseVersion GetBaseVersion(GitVersionContext context)
         {
-            return new BaseVersion("Test source", shouldIncrement, shouldUpdateTag, semanticVersion, source, null);
+            return new BaseVersion("Test source", shouldIncrement, semanticVersion, source, null);
         }
     }
 }

GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -32,10 +32,10 @@ public BaseVersion GetBaseVersion(GitVersionContext context)
                 {
                     if (v1.SemanticVersion > v2.SemanticVersion)
                     {
-                        return new BaseVersion(v1.Source, v1.ShouldIncrement, v1.ShouldUpdateTag, v1.SemanticVersion, v1.BaseVersionSource ?? v2.BaseVersionSource, v1.BranchNameOverride);
+                        return new BaseVersion(v1.Source, v1.ShouldIncrement, v1.SemanticVersion, v1.BaseVersionSource ?? v2.BaseVersionSource, v1.BranchNameOverride);
                     }
 
-                    return new BaseVersion(v2.Source, v2.ShouldIncrement, v2.ShouldUpdateTag, v2.SemanticVersion, v2.BaseVersionSource ?? v1.BaseVersionSource, v2.BranchNameOverride);
+                    return new BaseVersion(v2.Source, v2.ShouldIncrement, v2.SemanticVersion, v2.BaseVersionSource ?? v1.BaseVersionSource, v2.BranchNameOverride);
                 });
 
             Logger.WriteInfo(string.Format("Base version used: {0}", baseVersion));

GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs

@@ -4,11 +4,10 @@
 
     public class BaseVersion
     {
-        public BaseVersion(string source, bool shouldIncrement, bool shouldUpdateTag, SemanticVersion semanticVersion, Commit baseVersionSource, string branchNameOverride)
+        public BaseVersion(string source, bool shouldIncrement, SemanticVersion semanticVersion, Commit baseVersionSource, string branchNameOverride)
         {
             Source = source;
             ShouldIncrement = shouldIncrement;
-            ShouldUpdateTag = shouldUpdateTag;
             SemanticVersion = semanticVersion;
             BaseVersionSource = baseVersionSource;
             BranchNameOverride = branchNameOverride;
@@ -18,8 +17,6 @@ public BaseVersion(string source, bool shouldIncrement, bool shouldUpdateTag, Se
 
         public bool ShouldIncrement { get; private set; }
 
-        public bool ShouldUpdateTag { get; private set; }
-
         public SemanticVersion SemanticVersion { get; private set; }
 
         public Commit BaseVersionSource { get; private set; }

GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionBaseVersionStrategy.cs

@@ -7,7 +7,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
             if (string.IsNullOrEmpty(context.Configuration.NextVersion) || context.IsCurrentCommitTagged)
                 return null;
             var semanticVersion = SemanticVersion.Parse(context.Configuration.NextVersion, context.Configuration.GitTagPrefix);
-            return new BaseVersion("NextVersion in GitVersionConfig.yaml", false, true, semanticVersion, null, null);
+            return new BaseVersion("NextVersion in GitVersionConfig.yaml", false, semanticVersion, null, null);
         }
     }
 }

GitVersionCore/VersionCalculation/BaseVersionCalculators/HighestTagBaseVersionStrategy.cs

@@ -11,7 +11,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
             if (GetVersion(context, out version))
             {
                 var shouldUpdateVersion = version.Commit.Sha != context.CurrentCommit.Sha;
-                return new BaseVersion(string.Format("Git tag '{0}'", version.Tag), shouldUpdateVersion, shouldUpdateVersion, version.SemVer, version.Commit, null);
+                return new BaseVersion(string.Format("Git tag '{0}'", version.Tag), shouldUpdateVersion, version.SemVer, version.Commit, null);
             }
 
             return null;

GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

@@ -19,7 +19,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
                         var shouldIncrement = !context.Configuration.PreventIncrementForMergedBranchVersion;
                         return new[]
                         {
-                            new BaseVersion(string.Format("Merge message '{0}'", c.Message.Trim()), shouldIncrement, true, semanticVersion, c, null)
+                            new BaseVersion(string.Format("Merge message '{0}'", c.Message.Trim()), shouldIncrement, semanticVersion, c, null)
                         };
                     }
                     return Enumerable.Empty<BaseVersion>();

GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchBaseVersionStrategy.cs

@@ -11,7 +11,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
             {
                 var commitBranchWasBranchedFrom = context.CurrentBranch.FindCommitBranchWasBranchedFrom(context.Repository, context.OnlyEvaluateTrackedBranches);
                 var branchNameOverride = context.CurrentBranch.Name.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
-                return new BaseVersion("Version in branch name", false, true, versionInBranch.Item2, commitBranchWasBranchedFrom, branchNameOverride);
+                return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom, branchNameOverride);
             }
 
             return null;

GitVersionCore/VersionCalculation/FallbackBaseVersionStrategy.cs

@@ -7,7 +7,7 @@ public class FallbackBaseVersionStrategy : BaseVersionStrategy
     {
         public override BaseVersion GetVersion(GitVersionContext context)
         {
-            return new BaseVersion("Fallback base version", false, true, new SemanticVersion(minor: 1), context.CurrentBranch.Commits.Last(), null);
+            return new BaseVersion("Fallback base version", false, new SemanticVersion(minor: 1), context.CurrentBranch.Commits.Last(), null);
         }
     }
 }