Merge pull request #1899 from GitTools/pr/release-branch-should-not-p…

…atch Change default increment strategy for release branches to None instead of Patch
GitTools · Nov 7, 2019 · cbed74a · cbed74a
2 parents ef652c1 + 3b10296
commit cbed74a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -41,7 +41,7 @@ branches:
   release:
     mode: ContinuousDelivery
     tag: beta
-    increment: Patch
+    increment: None
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
     regex: ^releases?[/-]

diff --git a/src/GitVersionCore/Configuration/ConfigExtensions.cs b/src/GitVersionCore/Configuration/ConfigExtensions.cs
@@ -50,7 +50,7 @@ public static void Reset(this Config config)
                     { "develop", "master", "support", "release" },
                 defaultTag: "beta",
                 defaultPreventIncrement: true,
-                defaultIncrementStrategy: IncrementStrategy.Patch,
+                defaultIncrementStrategy: IncrementStrategy.None,
                 isReleaseBranch: true);
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, Config.FeatureBranchKey), Config.FeatureBranchRegex,
                 new List<string>

diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs
@@ -135,6 +135,11 @@ private class Versions
         {
             public SemanticVersion IncrementedVersion { get; set; }
             public BaseVersion Version { get; set; }
+
+            public override string ToString()
+            {
+                return $"{Version} | {IncrementedVersion}";
+            }
         }
     }
 }
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -69,6 +69,11 @@ public VersionTaggedCommit(Commit commit, SemanticVersion semVer, string tag)
                 Commit = commit;
                 SemVer = semVer;
             }
+
+            public override string ToString()
+            {
+                return $"{Tag} | {Commit} | {SemVer}";
+            }
         }
     }
 }