When incrementing version using commit message, we only consider tags with a valid version

BREAKING_CHANGES.md

@@ -31,7 +31,7 @@
 *   The `useBranchName` magic string has been removed. Instead use `{BranchName}` for `label`.
 *   The `BranchPrefixToTrim` configuration property has been removed. `RegularExpression` is now used to capture named groups instead.
     *   Default `RegularExpression` for feature branches is changed from `^features?[/-]` to `^features?[/-](?<BranchName>.+)` to support using `{BranchName}` out-of-the-box
-    *   Default `RegularExpression` for unknown branches is changed from `.*` to `(?<BranchName>.*)` to support using `{BranchName}` out-of-the-box
+    *   Default `RegularExpression` for unknown branches is changed from `.*` to `(?<BranchName>.+)` to support using `{BranchName}` out-of-the-box
 *   The `Mainline` mode and the related implementation has been removed completely. The new `TrunkBased` version strategy should be used instead.
 *   The branch related property `is-mainline` in the configuration system has been renamed to `is-main-branch`
 *   The versioning mode has been renamed to deployment mode and consists of following values:

src/GitVersion.Configuration/SupportedWorkflows/GitFlow/v1.yml

@@ -1,6 +1,7 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-file-versioning-scheme: MajorMinorPatch
 tag-prefix: '[vV]?'
+version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
@@ -10,10 +11,14 @@ commit-date-format: yyyy-MM-dd
 merge-message-formats: {}
 update-build-number: true
 semantic-version-format: Strict
-strategies: [ConfigNext, MergeMessage, TaggedCommit, TrackReleaseBranches, VersionInBranchName]
+strategies:
+- ConfiguredNextVersion
+- MergeMessage
+- TaggedCommit
+- TrackReleaseBranches
+- VersionInBranchName
 branches:
   develop:
-    mode: ContinuousDeployment
     label: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: false
@@ -38,6 +43,7 @@ branches:
     is-main-branch: true
     pre-release-weight: 55000
   release:
+    mode: ManualDeployment
     label: beta
     increment: None
     prevent-increment-of-merged-branch-version: true
@@ -53,7 +59,7 @@ branches:
     is-main-branch: false
     pre-release-weight: 30000
   feature:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
     regex: ^features?[/-](?<BranchName>.+)
@@ -80,7 +86,7 @@ branches:
     - hotfix
     pre-release-weight: 30000
   hotfix:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: beta
     increment: Inherit
     regex: ^hotfix(es)?[/-]
@@ -89,6 +95,7 @@ branches:
     - main
     - support
     - hotfix
+    is-release-branch: true
     pre-release-weight: 30000
   support:
     label: ''
@@ -103,10 +110,10 @@ branches:
     is-main-branch: true
     pre-release-weight: 55000
   unknown:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
-    regex: (?<BranchName>.*)
+    regex: (?<BranchName>.+)
     source-branches:
     - main
     - develop

src/GitVersion.Configuration/SupportedWorkflows/GitHubFlow/v1.yml

@@ -1,6 +1,7 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-file-versioning-scheme: MajorMinorPatch
 tag-prefix: '[vV]?'
+version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
@@ -10,7 +11,12 @@ commit-date-format: yyyy-MM-dd
 merge-message-formats: {}
 update-build-number: true
 semantic-version-format: Strict
-strategies: [ConfigNext, MergeMessage, TaggedCommit, TrackReleaseBranches, VersionInBranchName]
+strategies:
+- ConfiguredNextVersion
+- MergeMessage
+- TaggedCommit
+- TrackReleaseBranches
+- VersionInBranchName
 branches:
   main:
     label: ''
@@ -25,6 +31,7 @@ branches:
     is-main-branch: true
     pre-release-weight: 55000
   release:
+    mode: ManualDeployment
     label: beta
     increment: None
     prevent-increment-of-merged-branch-version: true
@@ -38,7 +45,7 @@ branches:
     is-main-branch: false
     pre-release-weight: 30000
   feature:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
     regex: ^features?[/-](?<BranchName>.+)
@@ -59,10 +66,10 @@ branches:
     - feature
     pre-release-weight: 30000
   unknown:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
-    regex: (?<BranchName>.*)
+    regex: (?<BranchName>.+)
     source-branches:
     - main
     - release

src/GitVersion.Configuration/SupportedWorkflows/TrunkBased/v1.yml

@@ -1,6 +1,7 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-file-versioning-scheme: MajorMinorPatch
 tag-prefix: '[vV]?'
+version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
@@ -10,7 +11,9 @@ commit-date-format: yyyy-MM-dd
 merge-message-formats: {}
 update-build-number: true
 semantic-version-format: Strict
-strategies: [TrunkBased, ConfiguredNextVersion]
+strategies:
+- TrunkBased
+- ConfiguredNextVersion
 branches:
   main:
     mode: ContinuousDeployment
@@ -48,7 +51,7 @@ branches:
   unknown:
     mode: ManualDeployment
     increment: Inherit
-    regex: (?<BranchName>.*)
+    regex: (?<BranchName>.+)
     source-branches:
     - main
     - release

src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs

@@ -1,12 +1,80 @@
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
+using GitVersion.VersionCalculation;
 using LibGit2Sharp;
 
 namespace GitVersion.Core.Tests.IntegrationTests;
 
 [TestFixture]
 public class OtherBranchScenarios : TestBase
 {
+    [TestCase("", "NotAVersion", "2.0.0-1", "1.9.0", "1.9.0", "1.9.1-1")]
+    [TestCase("", "1.5.0", "1.5.0", "1.9.0", "1.9.0", "1.9.1-1")]
+    [TestCase("prefix", "1.5.0", "2.0.0-1", "1.9.0", "2.0.0-1", "2.0.0-2")]
+    [TestCase("prefix", "1.5.0", "2.0.0-1", "prefix1.9.0", "1.9.0", "1.9.1-1")]
+    [TestCase("prefix", "prefix1.5.0", "1.5.0", "1.9.0", "1.5.0", "1.5.1-1")]
+    public void CanUseCommitMessagesToBumpVersion_TagsTakePriorityOnlyIfVersions(
+        string tagPrefix,
+        string firstTag,
+        string expectedAfterFirstTag,
+        string secondTag,
+        string expectedAfterSecondTag,
+        string expectedVersionAfterNewCommit)
+    {
+        var configuration = GitFlowConfigurationBuilder.New
+            .WithTagPrefix(tagPrefix)
+            .Build();
+
+        using var fixture = new EmptyRepositoryFixture();
+        var repo = fixture.Repository;
+
+        repo.MakeATaggedCommit($"{tagPrefix}1.0.0");
+        repo.MakeACommit("+semver:major");
+        fixture.AssertFullSemver("2.0.0-1", configuration);
+
+        repo.ApplyTag(firstTag);
+        fixture.AssertFullSemver(expectedAfterFirstTag, configuration);
+
+        repo.ApplyTag(secondTag);
+        fixture.AssertFullSemver(expectedAfterSecondTag, configuration);
+
+        repo.MakeACommit();
+        fixture.AssertFullSemver(expectedVersionAfterNewCommit, configuration);
+    }
+
+    [TestCase("", null, "1.9.0-1", "2.0.0-1+1", ExpectedResult = "1.9.0-1")]
+    [TestCase("", "", "1.9.0-1", "2.0.0-1+1", ExpectedResult = "1.9.0-1")]
+    [TestCase("", "foo", "1.9.0-1", "2.0.0-foo.1+1", ExpectedResult = "2.0.0-foo.1+1")]
+    [TestCase("", "bar", "1.9.0-1", "2.0.0-bar.1+1", ExpectedResult = "2.0.0-bar.1+1")]
+    [TestCase("prefix", null, "1.9.0-1", "2.0.0-1+1", ExpectedResult = "2.0.0-1+1")]
+    [TestCase("prefix", "", "1.9.0-1", "2.0.0-1+1", ExpectedResult = "2.0.0-1+1")]
+    [TestCase("prefix", "foo", "1.9.0-1", "2.0.0-foo.1+1", ExpectedResult = "2.0.0-foo.1+1")]
+    [TestCase("prefix", "bar", "1.9.0-1", "2.0.0-bar.1+1", ExpectedResult = "2.0.0-bar.1+1")]
+
+    [TestCase("", null, "2.1.0-1", "2.0.0-1+1", ExpectedResult = "2.1.0-1")]
+    [TestCase("", "", "2.1.0-1", "2.0.0-1+1", ExpectedResult = "2.1.0-1")]
+    [TestCase("", "foo", "2.1.0-1", "2.0.0-foo.1+1", ExpectedResult = "2.1.0-foo.1+1")]
+    [TestCase("", "bar", "2.1.0-1", "2.0.0-bar.1+1", ExpectedResult = "2.1.0-bar.1+1")]
+    [TestCase("prefix", null, "2.1.0-1", "2.0.0-1+1", ExpectedResult = "2.0.0-1+1")]
+    [TestCase("prefix", "", "2.1.0-1", "2.0.0-1+1", ExpectedResult = "2.0.0-1+1")]
+    [TestCase("prefix", "foo", "2.1.0-1", "2.0.0-foo.1+1", ExpectedResult = "2.0.0-foo.1+1")]
+    [TestCase("prefix", "bar", "2.1.0-1", "2.0.0-bar.1+1", ExpectedResult = "2.0.0-bar.1+1")]
+    public string WhenTaggingACommitAsPreRelease(string tagPrefix, string? label, string tag, string expectedVersion)
+    {
+        var configuration = GitFlowConfigurationBuilder.New.WithLabel(null).WithTagPrefix(tagPrefix)
+            .WithBranch("main", _ => _.WithLabel(label).WithDeploymentMode(DeploymentMode.ManualDeployment))
+            .Build();
+
+        using EmptyRepositoryFixture fixture = new("main");
+
+        fixture.MakeATaggedCommit($"{tagPrefix}1.0.0");
+        fixture.MakeACommit("+semver:major");
+        fixture.AssertFullSemver(expectedVersion, configuration);
+        fixture.ApplyTag(tag);
+
+        return fixture!.GetVersion(configuration).FullSemVer;
+    }
+
     /// <summary>
     /// https://github.com/GitTools/GitVersion/issues/2340
     /// </summary>
@@ -34,7 +102,7 @@ public void ShouldOnlyConsiderTagsMatchingOfCurrentBranch()
     public void CanTakeVersionFromReleaseBranch()
     {
         var configuration = GitFlowConfigurationBuilder.New
-            .WithBranch("release", _ => _.WithLabel("{BranchName}").WithRegularExpression("(?<BranchName>.*)"))
+            .WithBranch("release", _ => _.WithLabel("{BranchName}").WithRegularExpression("(?<BranchName>.+)"))
             .Build();
 
         using var fixture = new EmptyRepositoryFixture();
@@ -52,7 +120,7 @@ public void CanTakeVersionFromReleaseBranch()
     public void CanTakeVersionFromHotfixBranch()
     {
         var configuration = GitFlowConfigurationBuilder.New
-            .WithBranch("hotfix", _ => _.WithLabel("{BranchName}").WithRegularExpression("(?<BranchName>.*)"))
+            .WithBranch("hotfix", _ => _.WithLabel("{BranchName}").WithRegularExpression("(?<BranchName>.+)"))
             .Build();
 
         using var fixture = new EmptyRepositoryFixture();
@@ -112,7 +180,7 @@ public void LabelIsBranchNameForBranchesWithoutPrefixedBranchName(string label,
         var configuration = GitFlowConfigurationBuilder.New
             .WithBranch("other", builder => builder
                 .WithIncrement(IncrementStrategy.Patch)
-                .WithRegularExpression("(?<BranchName>.*)")
+                .WithRegularExpression("(?<BranchName>.+)")
                 .WithSourceBranches()
                 .WithLabel(label))
             .Build();

src/GitVersion.Core/Core/ITaggedSemanticVersionRepository.cs

@@ -16,7 +16,7 @@ ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMergeTarget(
         string? tagPrefix,
         SemanticVersionFormat format);
 
-    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMainlineBranches(
+    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMainBranches(
         string? tagPrefix,
         SemanticVersionFormat format,
         params IBranch[] excludeBranches);
@@ -25,4 +25,6 @@ ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfReleaseBranc
         string? tagPrefix,
         SemanticVersionFormat format,
         params IBranch[] excludeBranches);
+
+    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersions(string? tagPrefix, SemanticVersionFormat format);
 }

src/GitVersion.Core/Core/TaggedSemanticVersionRepository.cs

@@ -87,7 +87,7 @@ public ILookup<ICommit, SemanticVersionWithTag> GetAllTaggedSemanticVersions(IBr
 
             if (!configuration.IsMainBranch && !configuration.IsReleaseBranch)
             {
-                var semanticVersionsOfMainlineBranches = GetTaggedSemanticVersionsOfMainlineBranches(
+                var semanticVersionsOfMainlineBranches = GetTaggedSemanticVersionsOfMainBranches(
                     tagPrefix: configuration.TagPrefix,
                     format: configuration.SemanticVersionFormat,
                     excludeBranches: branch
@@ -188,7 +188,7 @@ public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMerge
         return result;
     }
 
-    public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMainlineBranches(
+    public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMainBranches(
         string? tagPrefix, SemanticVersionFormat format, params IBranch[] excludeBranches)
     {
         tagPrefix ??= string.Empty;
@@ -236,7 +236,7 @@ IEnumerable<SemanticVersionWithTag> GetElements()
         return GetElements().Distinct().ToLookup(element => element.Tag.Commit, element => element);
     }
 
-    private ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersions(string? tagPrefix, SemanticVersionFormat format)
+    public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersions(string? tagPrefix, SemanticVersionFormat format)
     {
         tagPrefix ??= string.Empty;
 

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -693,7 +693,7 @@ GitVersion.VersionCalculation.DeploymentMode.ManualDeployment = 0 -> GitVersion.
 GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder
 GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder.GetConfigurations(GitVersion.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.Configuration.EffectiveBranchConfiguration!>!
 GitVersion.VersionCalculation.IIncrementStrategyFinder
-GitVersion.VersionCalculation.IIncrementStrategyFinder.DetermineIncrementedField(GitVersion.ICommit! currentCommit, GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.Configuration.EffectiveConfiguration! configuration) -> GitVersion.VersionField
+GitVersion.VersionCalculation.IIncrementStrategyFinder.DetermineIncrementedField(GitVersion.ICommit! currentCommit, GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.Configuration.EffectiveConfiguration! configuration, string? label) -> GitVersion.VersionField
 GitVersion.VersionCalculation.IIncrementStrategyFinder.GetIncrementForcedByCommit(GitVersion.ICommit! commit, GitVersion.Configuration.EffectiveConfiguration! configuration) -> GitVersion.VersionField
 GitVersion.VersionCalculation.IIncrementStrategyFinder.GetIncrementForCommits(string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.ICommit![]! commits) -> GitVersion.VersionField?
 GitVersion.VersionCalculation.IIncrementStrategyFinder.GetMergedCommits(GitVersion.ICommit! mergeCommit, int index) -> System.Collections.Generic.IEnumerable<GitVersion.ICommit!>!

src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs

@@ -4,7 +4,8 @@ namespace GitVersion.VersionCalculation;
 
 public interface IIncrementStrategyFinder
 {
-    VersionField DetermineIncrementedField(ICommit currentCommit, BaseVersion baseVersion, EffectiveConfiguration configuration);
+    VersionField DetermineIncrementedField(
+        ICommit currentCommit, BaseVersion baseVersion, EffectiveConfiguration configuration, string? label);
 
     VersionField? GetIncrementForCommits(
         string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage,