Fix findings, found while investigating the build error

Author: HHobeck

GitVersion.yml

@@ -1,6 +1,8 @@
+workflow: GitFlow/v1
 assembly-versioning-scheme: MajorMinorPatch
+label:
 branches:
   main:
-    label: beta
+    label:
   support:
-    label: beta
+    label:

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

@@ -1364,4 +1364,42 @@ public void UnversionedHotfix()
 
         fixture.AssertFullSemver("1.2.1-3", configuration);
     }
+
+    [Test]
+    public void AlternativeSemanticVersionsShouldBeConsidered()
+    {
+        var configuration = GitFlowConfigurationBuilder.New.Build();
+
+        using EmptyRepositoryFixture fixture = new("main");
+
+        fixture.MakeACommit("A");
+        fixture.MakeATaggedCommit("4.0.0-beta.14");
+        fixture.MakeACommit("B");
+
+        fixture.AssertFullSemver("4.0.0-3", configuration);
+    }
+
+    [TestCase(null, "6.0.0-beta.6")]
+    [TestCase("beta", "6.0.0-beta.21")]
+    public void AlternativeSemanticVersionsShouldBeConsidered(string? labelOnMain, string version)
+    {
+        var configuration = GitFlowConfigurationBuilder.New
+            .WithLabel(null)
+            .WithBranch("main", _ => _.WithLabel(labelOnMain))
+            .Build();
+
+        using EmptyRepositoryFixture fixture = new("main");
+
+        fixture.MakeATaggedCommit("1.0.0");
+        fixture.MakeATaggedCommit("4.0.0-beta.14");
+        fixture.MakeACommit("A");
+        fixture.MakeATaggedCommit("6.0.0-alpha.1");
+        fixture.MakeATaggedCommit("6.0.0-alpha.2");
+        fixture.MakeATaggedCommit("6.0.0-alpha.3");
+        fixture.MakeACommit("B");
+        fixture.MakeATaggedCommit("6.0.0-beta.5");
+        fixture.MakeACommit("C");
+
+        fixture.AssertFullSemver(version, configuration);
+    }
 }

src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs

@@ -162,19 +162,22 @@ private NextVersion CalculateNextVersion(IBranch branch, IGitVersionConfiguratio
 
         var maxVersion = nextVersions.Max()
             ?? throw new GitVersionException("No base versions determined on the current branch.");
-        var matchingVersionsOnceIncremented = nextVersions
-            .Where(v => v.BaseVersion.BaseVersionSource != null && v.IncrementedVersion == maxVersion.IncrementedVersion)
-            .ToList();
+
         ICommit? latestBaseVersionSource;
 
-        if (matchingVersionsOnceIncremented.Count != 0)
+        var matchingVersionsOnceIncremented = nextVersions
+            .Where(
+                element => element.BaseVersion.BaseVersionSource != null
+                    && element.IncrementedVersion == maxVersion.IncrementedVersion
+            ).ToArray();
+        if (matchingVersionsOnceIncremented.Length > 1)
         {
             var latestVersion = matchingVersionsOnceIncremented.Aggregate(CompareVersions);
             latestBaseVersionSource = latestVersion.BaseVersion.BaseVersionSource;
             maxVersion = latestVersion;
             log.Info(
                 $"Found multiple base versions which will produce the same SemVer ({maxVersion.IncrementedVersion}), " +
-                $"taking oldest source for commit counting ({latestVersion.BaseVersion.Source})");
+                $"taking latest source for commit counting ({latestVersion.BaseVersion.Source})");
         }
         else
         {

src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TaggedCommitVersionStrategy.cs

@@ -40,13 +40,16 @@ private IEnumerable<BaseVersion> GetBaseVersionsInternal(EffectiveBranchConfigur
         ).SelectMany(elements => elements).Distinct().ToArray();
 
         var label = configuration.Value.GetBranchSpecificLabel(Context.CurrentBranch.Name, null);
-        var maxTaggedSemanticVersion = taggedSemanticVersions
-            .Where(element => !element.Value.IsMatchForBranchSpecificLabel(label))
-            .Max();
 
-        var semanticVersionsWithTag = taggedSemanticVersions.Where(element => element.Value.IsMatchForBranchSpecificLabel(label));
-        foreach (var semanticVersionWithTag in semanticVersionsWithTag)
+        List<SemanticVersionWithTag> alternativeSemanticVersionsWithTag = new();
+        foreach (var semanticVersionWithTag in taggedSemanticVersions)
         {
+            if (!semanticVersionWithTag.Value.IsMatchForBranchSpecificLabel(label))
+            {
+                alternativeSemanticVersionsWithTag.Add(semanticVersionWithTag);
+                continue;
+            }
+
             var baseVersionSource = semanticVersionWithTag.Tag.Commit;
             var increment = incrementStrategyFinder.DetermineIncrementedField(
                 currentCommit: Context.CurrentCommit,
@@ -55,6 +58,7 @@ private IEnumerable<BaseVersion> GetBaseVersionsInternal(EffectiveBranchConfigur
                 configuration: configuration.Value,
                 label: label
             );
+
             yield return new BaseVersion(
                 $"Git tag '{semanticVersionWithTag.Tag.Name.Friendly}'", semanticVersionWithTag.Value, baseVersionSource)
             {
@@ -63,9 +67,10 @@ private IEnumerable<BaseVersion> GetBaseVersionsInternal(EffectiveBranchConfigur
                     Increment = increment,
                     ForceIncrement = false,
                     Label = label,
-                    AlternativeSemanticVersion = maxTaggedSemanticVersion?.Value
+                    AlternativeSemanticVersion = alternativeSemanticVersionsWithTag.Max()?.Value
                 }
             };
+            alternativeSemanticVersionsWithTag.Clear();
         }
     }
 }