Refactor semantic version handling with dedicated tuple type

Replaced `KeyValuePair` with a more descriptive `CommitSemanticVersion` tuple across semantic versioning logic to simplify and standardize code. Adjusted related method implementations and ordering logic accordingly for improved readability and maintainability. Removed redundant code paths and streamlined syntax in mainline version strategy.

Author: arturcic

src/GitVersion.Core/Core/TaggedSemanticVersionService.cs

@@ -2,6 +2,8 @@
 using GitVersion.Extensions;
 using GitVersion.Git;
 
+using CommitSemanticVersion = (GitVersion.Git.ICommit Commit, GitVersion.SemanticVersionWithTag SemanticVersion);
+
 namespace GitVersion.Core;
 
 internal sealed class TaggedSemanticVersionService(
@@ -19,7 +21,7 @@ public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersions(
          DateTimeOffset? notOlderThan,
          TaggedSemanticVersions taggedSemanticVersion)
     {
-        IEnumerable<IEnumerable<KeyValuePair<ICommit, SemanticVersionWithTag>>> GetElements()
+        IEnumerable<IEnumerable<CommitSemanticVersion>> GetElements()
         {
             if (taggedSemanticVersion.HasFlag(TaggedSemanticVersions.OfBranch))
             {
@@ -67,8 +69,8 @@ IEnumerable<IEnumerable<KeyValuePair<ICommit, SemanticVersionWithTag>>> GetEleme
         }
 
         return GetElements().SelectMany(elements => elements).Distinct()
-            .OrderByDescending(element => element.Key.When)
-            .ToLookup(element => element.Key, element => element.Value);
+            .OrderByDescending(element => element.Commit.When)
+            .ToLookup(element => element.Commit, element => element.SemanticVersion);
     }
 
     public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfBranch(
@@ -87,11 +89,11 @@ public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfBranc
             label: label,
             notOlderThan: notOlderThan);
 
-        return result.Distinct().OrderByDescending(element => element.Key.When)
-            .ToLookup(element => element.Key, element => element.Value);
+        return result.Distinct().OrderByDescending(element => element.Commit.When)
+            .ToLookup(element => element.Commit, element => element.SemanticVersion);
     }
 
-    private IEnumerable<KeyValuePair<ICommit, SemanticVersionWithTag>> GetTaggedSemanticVersionsOfBranchInternal(
+    private IEnumerable<CommitSemanticVersion> GetTaggedSemanticVersionsOfBranchInternal(
         IBranch branch,
         string? tagPrefix,
         SemanticVersionFormat format,
@@ -110,7 +112,7 @@ private IEnumerable<KeyValuePair<ICommit, SemanticVersionWithTag>> GetTaggedSema
             {
                 if (semanticVersion.Value.IsMatchForBranchSpecificLabel(label))
                 {
-                    yield return new(grouping.Key, semanticVersion);
+                    yield return (grouping.Key, semanticVersion);
                 }
             }
         }
@@ -133,11 +135,11 @@ public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMerge
             notOlderThan: notOlderThan);
 
         return result.Distinct()
-            .OrderByDescending(element => element.Key.When)
-            .ToLookup(element => element.Key, element => element.Value);
+            .OrderByDescending(element => element.Commit.When)
+            .ToLookup(element => element.Commit, element => element.SemanticVersion);
     }
 
-    private IEnumerable<KeyValuePair<ICommit, SemanticVersionWithTag>> GetTaggedSemanticVersionsOfMergeTargetInternal(
+    private IEnumerable<CommitSemanticVersion> GetTaggedSemanticVersionsOfMergeTargetInternal(
          IBranch branch,
          string? tagPrefix,
          SemanticVersionFormat format,
@@ -178,11 +180,11 @@ public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfMainB
             excludeBranches: excludeBranches);
 
         return result.Distinct()
-            .OrderByDescending(element => element.Key.When)
-            .ToLookup(element => element.Key, element => element.Value);
+            .OrderByDescending(element => element.Commit.When)
+            .ToLookup(element => element.Commit, element => element.SemanticVersion);
     }
 
-    private IEnumerable<KeyValuePair<ICommit, SemanticVersionWithTag>> GetTaggedSemanticVersionsOfMainBranchesInternal(
+    private IEnumerable<CommitSemanticVersion> GetTaggedSemanticVersionsOfMainBranchesInternal(
         IGitVersionConfiguration configuration,
         DateTimeOffset? notOlderThan,
         string? label,
@@ -218,11 +220,11 @@ public ILookup<ICommit, SemanticVersionWithTag> GetTaggedSemanticVersionsOfRelea
             excludeBranches: excludeBranches);
 
         return result.Distinct()
-            .OrderByDescending(element => element.Key.When)
-            .ToLookup(element => element.Key, element => element.Value);
+            .OrderByDescending(element => element.Commit.When)
+            .ToLookup(element => element.Commit, element => element.SemanticVersion);
     }
 
-    private IEnumerable<KeyValuePair<ICommit, SemanticVersionWithTag>> GetTaggedSemanticVersionsOfReleaseBranchesInternal(
+    private IEnumerable<CommitSemanticVersion> GetTaggedSemanticVersionsOfReleaseBranchesInternal(
         IGitVersionConfiguration configuration,
         DateTimeOffset? notOlderThan,
         string? label,

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

@@ -211,10 +211,8 @@ private bool IterateOverCommitsRecursive(
                     {
                         return true;
                     }
-                    else
-                    {
-                        returnTrueWhenTheIncrementIsKnown = true;
-                    }
+
+                    returnTrueWhenTheIncrementIsKnown = true;
                 }
             }
 
@@ -242,7 +240,7 @@ private bool IterateOverCommitsRecursive(
                             if (configuration.IsMainBranch == true) throw new NotImplementedException();
 
                             mergedCommitsInReverseOrderLazy = new(
-                                () => incrementStrategyFinder.GetMergedCommits(item, 0, Context.Configuration.Ignore).Reverse().ToList()
+                                () => [.. incrementStrategyFinder.GetMergedCommits(item, 0, Context.Configuration.Ignore).Reverse()]
                             );
                             childConfiguration = configuration;
                             childBranchName = iteration.BranchName;
@@ -260,9 +258,8 @@ private bool IterateOverCommitsRecursive(
                             iteration: childIteration,
                             targetBranch: targetBranch,
                             targetLabel: targetLabel,
-                            traversedCommits: traversedCommits,
-                            taggedSemanticVersions: taggedSemanticVersions
-                        );
+                            taggedSemanticVersions: taggedSemanticVersions,
+                            traversedCommits: traversedCommits);
 
                         commit.AddChildIteration(childIteration);
                         if (done) return true;
@@ -316,9 +313,7 @@ private bool IterateOverCommitsRecursive(
         // If a main branch existing we need to ensure that it will be present at the first position in the list.
         foreach (var item in result)
         {
-            result[item.Key] = item.Value
-                .OrderByDescending(element => (element.Configuration.IsMainBranch ?? Context.Configuration.IsMainBranch) == true)
-                .ToList();
+            result[item.Key] = [.. item.Value.OrderByDescending(element => (element.Configuration.IsMainBranch ?? Context.Configuration.IsMainBranch) == true)];
         }
         return result;
     }