Create TaggedSemanticVersionService class

Author: HHobeck

src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs

@@ -61,7 +61,6 @@ public static GitVersionVariables GetVersion(this RepositoryFixtureBase fixture,
     {
         repository ??= fixture.Repository;
         configuration ??= GitFlowConfigurationBuilder.New.Build();
-        Console.WriteLine("---------");
 
         var overrideConfiguration = new Dictionary<object, object?>();
         var options = Options.Create(new GitVersionOptions

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

@@ -202,7 +202,7 @@ public void GitFlowMajorRelease()
         fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
 
         fixture.Checkout(MainBranch);
-        fixture.AssertFullSemver("2.0.0-0");
+        fixture.AssertFullSemver("2.0.0-4");
         fixture.ApplyTag("2.0.0");
         fixture.AssertFullSemver("2.0.0");
 
@@ -291,7 +291,7 @@ public void GitFlowSupportMinorRelease()
         fixture.MergeNoFF("release/1.4.0");
         fixture.SequenceDiagram.Destroy("release/1.4.0");
         fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.4.0");
-        fixture.AssertFullSemver("1.4.0-0");
+        fixture.AssertFullSemver("1.4.0-4");
         fixture.ApplyTag("1.4.0");
         fixture.AssertFullSemver("1.4.0");
         Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
@@ -392,7 +392,7 @@ public void GitHubFlowMajorRelease()
         fixture.SequenceDiagram.Destroy("release/2.0.0");
         fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
 
-        fixture.AssertFullSemver("2.0.0-0");
+        fixture.AssertFullSemver("2.0.0-4");
         fixture.ApplyTag("2.0.0");
         fixture.AssertFullSemver("2.0.0");
         fixture.MakeACommit();

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

@@ -93,33 +93,4 @@ public void TakeTheLatestCommitAsBaseVersion(bool mode)
         // ✅ succeeds as expected
         fixture.AssertFullSemver("1.0.0-1+1", configuration);
     }
-
-    [Test]
-    public void TakeTheCommitBranchedFromAsBaseVersion()
-    {
-        var configuration = ConfigurationBuilder
-            .WithBranch("main", _ => _
-                .WithIncrement(IncrementStrategy.Major)
-                .WithTrackMergeTarget(false)
-                .WithTracksReleaseBranches(true)
-            ).Build();
-
-        using EmptyRepositoryFixture fixture = new("main");
-
-        fixture.MakeACommit("A");
-        fixture.MakeACommit("B");
-        fixture.BranchTo("release/foo");
-        fixture.Checkout("main");
-        fixture.MakeACommit("C");
-        fixture.Checkout("release/foo");
-        fixture.MakeACommit("D");
-        fixture.ApplyTag("0.0.0");
-        fixture.Checkout("main");
-        fixture.MakeACommit("D");
-
-        // ✅ succeeds as expected
-        fixture.AssertFullSemver("1.0.0-1+2", configuration);
-
-        fixture.Repository.DumpGraph();
-    }
 }

src/GitVersion.Core/Core/EffectiveConfigurationExtensions.cs

@@ -0,0 +1,30 @@
+using GitVersion.Configuration;
+using GitVersion.Extensions;
+
+namespace GitVersion.Core;
+
+internal static class EffectiveConfigurationExtensions
+{
+    public static TaggedSemanticVersions GetTaggedSemanticVersion(this EffectiveConfiguration effectiveConfiguration)
+    {
+        effectiveConfiguration.NotNull();
+
+        TaggedSemanticVersions taggedSemanticVersion = TaggedSemanticVersions.OfBranch;
+
+        if (effectiveConfiguration.TrackMergeTarget)
+        {
+            taggedSemanticVersion |= TaggedSemanticVersions.OfMergeTargets;
+        }
+
+        if (effectiveConfiguration.TrackMergeTarget)
+        {
+            taggedSemanticVersion |= TaggedSemanticVersions.OfReleaseBranches;
+        }
+
+        if (!effectiveConfiguration.IsMainBranch && !effectiveConfiguration.IsReleaseBranch)
+        {
+            taggedSemanticVersion |= TaggedSemanticVersions.OfMainBranches;
+        }
+        return taggedSemanticVersion;
+    }
+}

src/GitVersion.Core/Core/ITaggedSemanticVersionRepository.cs

@@ -5,13 +5,6 @@ namespace GitVersion.Core;
 
 internal interface ITaggedSemanticVersionRepository
 {
-    ILookup<ICommit, SemanticVersionWithTag> GetAllTaggedSemanticVersions(
-        IGitVersionConfiguration configuration,
-        EffectiveConfiguration effectiveConfiguration,
-        IBranch branch,
-        string? label,
-        DateTimeOffset? notOlderThan);
-
     ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfBranch(
         IBranch branch,
         string? tagPrefix,
@@ -24,18 +17,6 @@ ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMergeTarget(
         SemanticVersionFormat format,
         IIgnoreConfiguration ignore);
 
-    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMainBranches(
-        IGitVersionConfiguration configuration,
-        string? tagPrefix,
-        SemanticVersionFormat format,
-        params IBranch[] excludeBranches);
-
-    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfReleaseBranches(
-        IGitVersionConfiguration configuration,
-        string? tagPrefix,
-        SemanticVersionFormat format,
-        params IBranch[] excludeBranches);
-
     ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersions(
         string? tagPrefix, SemanticVersionFormat format, IIgnoreConfiguration ignore);
 }

src/GitVersion.Core/Core/ITaggedSemanticVersionService.cs

@@ -0,0 +1,42 @@
+using GitVersion.Configuration;
+using GitVersion.Git;
+
+namespace GitVersion.Core;
+
+internal interface ITaggedSemanticVersionService
+{
+    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersions(
+        IBranch branch,
+        IGitVersionConfiguration configuration,
+        string? label,
+        DateTimeOffset? notOlderThan,
+        TaggedSemanticVersions taggedSemanticVersion);
+
+    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfBranch(
+        IBranch branch,
+        string? tagPrefix,
+        SemanticVersionFormat format,
+        IIgnoreConfiguration ignore,
+        string? label = null,
+        DateTimeOffset? notOlderThan = null);
+
+    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMergeTarget(
+        IBranch branch,
+        string? tagPrefix,
+        SemanticVersionFormat format,
+        IIgnoreConfiguration ignore,
+        string? label = null,
+        DateTimeOffset? notOlderThan = null);
+
+    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMainBranches(
+        IGitVersionConfiguration configuration,
+        DateTimeOffset? notOlderThan = null,
+        string? label = null,
+        params IBranch[] excludeBranches);
+
+    ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfReleaseBranches(
+        IGitVersionConfiguration configuration,
+        DateTimeOffset? notOlderThan = null,
+        string? label = null,
+        params IBranch[] excludeBranches);
+}