From 938478f06d735757653012eabf40a1d09c89fe24 Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Thu, 7 Nov 2019 14:45:33 +0100 Subject: [PATCH 1/2] Change default increment strategy for release branches to None instead of Patch --- src/GitVersionCore/Configuration/ConfigExtensions.cs | 2 +- .../VersionCalculation/BaseVersionCalculator.cs | 5 +++++ .../BaseVersionCalculators/TaggedCommitVersionStrategy.cs | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/GitVersionCore/Configuration/ConfigExtensions.cs b/src/GitVersionCore/Configuration/ConfigExtensions.cs index 2bffb54f41..529fb4d5ea 100644 --- 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 diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs index 847f79b52b..d054312ec6 100644 --- 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 index fc5a3f0c7c..664f30f76d 100644 --- 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}"; + } } } } From c200fa0ff41098ff20d679b5108f8902db983cba Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Thu, 7 Nov 2019 14:50:17 +0100 Subject: [PATCH 2/2] Approve new changes in unit tests --- ...ProviderTests.CanWriteOutEffectiveConfiguration.approved.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt index 0c3764505e..bcac7119f9 100644 --- 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?[/-]