Integrate code review comments of reviewer asbjornu and arturcic.

Author: HHobeck

src/GitVersion.Core.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -24,12 +24,12 @@ public void ChoosesHighestVersionReturnedFromStrategies()
                 services.AddSingleton<IVersionStrategy>(new V2Strategy(dateTimeOffset));
             }));
 
-        var baseVersion = versionCalculator.GetBaseVersion();
+        var (baseVersion, _) = versionCalculator.GetBaseVersion();
 
-        baseVersion.Item1.SemanticVersion.ToString().ShouldBe("2.0.0");
-        baseVersion.Item1.ShouldIncrement.ShouldBe(true);
-        baseVersion.Item1.BaseVersionSource.ShouldNotBeNull();
-        baseVersion.Item1.BaseVersionSource.When.ShouldBe(dateTimeOffset);
+        baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
+        baseVersion.ShouldIncrement.ShouldBe(true);
+        baseVersion.BaseVersionSource.ShouldNotBeNull();
+        baseVersion.BaseVersionSource.When.ShouldBe(dateTimeOffset);
     }
 
     [Test]
@@ -45,12 +45,12 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhen()
                 services.AddSingleton<IVersionStrategy>(new V2Strategy(null));
             }));
 
-        var baseVersion = versionCalculator.GetBaseVersion();
+        var (baseVersion, _) = versionCalculator.GetBaseVersion();
 
-        baseVersion.Item1.SemanticVersion.ToString().ShouldBe("2.0.0");
-        baseVersion.Item1.ShouldIncrement.ShouldBe(true);
-        baseVersion.Item1.BaseVersionSource.ShouldNotBeNull();
-        baseVersion.Item1.BaseVersionSource.When.ShouldBe(when);
+        baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
+        baseVersion.ShouldIncrement.ShouldBe(true);
+        baseVersion.BaseVersionSource.ShouldNotBeNull();
+        baseVersion.BaseVersionSource.When.ShouldBe(when);
     }
 
     [Test]
@@ -66,12 +66,12 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhenReversedOrder()
                 services.AddSingleton<IVersionStrategy>(new V2Strategy(when));
             }));
 
-        var baseVersion = versionCalculator.GetBaseVersion();
+        var (baseVersion, _) = versionCalculator.GetBaseVersion();
 
-        baseVersion.Item1.SemanticVersion.ToString().ShouldBe("2.0.0");
-        baseVersion.Item1.ShouldIncrement.ShouldBe(true);
-        baseVersion.Item1.BaseVersionSource.ShouldNotBeNull();
-        baseVersion.Item1.BaseVersionSource.When.ShouldBe(when);
+        baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
+        baseVersion.ShouldIncrement.ShouldBe(true);
+        baseVersion.BaseVersionSource.ShouldNotBeNull();
+        baseVersion.BaseVersionSource.When.ShouldBe(when);
     }
 
     [Test]
@@ -88,11 +88,11 @@ public void ShouldNotFilterVersion()
                 services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(version));
             }));
 
-        var baseVersion = versionCalculator.GetBaseVersion();
+        var (baseVersion, _) = versionCalculator.GetBaseVersion();
 
-        baseVersion.Item1.Source.ShouldBe(version.Source);
-        baseVersion.Item1.ShouldIncrement.ShouldBe(version.ShouldIncrement);
-        baseVersion.Item1.SemanticVersion.ShouldBe(version.SemanticVersion);
+        baseVersion.Source.ShouldBe(version.Source);
+        baseVersion.ShouldIncrement.ShouldBe(version.ShouldIncrement);
+        baseVersion.SemanticVersion.ShouldBe(version.SemanticVersion);
     }
 
     [Test]
@@ -110,12 +110,12 @@ public void ShouldFilterVersion()
                 services.RemoveAll<IVersionStrategy>();
                 services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(higherVersion, lowerVersion));
             }));
-        var baseVersion = versionCalculator.GetBaseVersion();
+        var (baseVersion, _) = versionCalculator.GetBaseVersion();
 
-        baseVersion.Item1.Source.ShouldNotBe(higherVersion.Source);
-        baseVersion.Item1.SemanticVersion.ShouldNotBe(higherVersion.SemanticVersion);
-        baseVersion.Item1.Source.ShouldBe(lowerVersion.Source);
-        baseVersion.Item1.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
+        baseVersion.Source.ShouldNotBe(higherVersion.Source);
+        baseVersion.SemanticVersion.ShouldNotBe(higherVersion.SemanticVersion);
+        baseVersion.Source.ShouldBe(lowerVersion.Source);
+        baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
     }
 
     [Test]
@@ -146,12 +146,12 @@ public void ShouldIgnorePreReleaseVersionInMainlineMode()
                 services.RemoveAll<IVersionStrategy>();
                 services.AddSingleton<IVersionStrategy>(new TestVersionStrategy(preReleaseVersion, lowerVersion));
             }));
-        var baseVersion = versionCalculator.GetBaseVersion();
+        var (baseVersion, _) = versionCalculator.GetBaseVersion();
 
-        baseVersion.Item1.Source.ShouldNotBe(preReleaseVersion.Source);
-        baseVersion.Item1.SemanticVersion.ShouldNotBe(preReleaseVersion.SemanticVersion);
-        baseVersion.Item1.Source.ShouldBe(lowerVersion.Source);
-        baseVersion.Item1.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
+        baseVersion.Source.ShouldNotBe(preReleaseVersion.Source);
+        baseVersion.SemanticVersion.ShouldNotBe(preReleaseVersion.SemanticVersion);
+        baseVersion.Source.ShouldBe(lowerVersion.Source);
+        baseVersion.SemanticVersion.ShouldBe(lowerVersion.SemanticVersion);
     }
 
     private static IBaseVersionCalculator GetBaseVersionCalculator(Action<GitVersionContextBuilder> contextBuilderAction)

src/GitVersion.Core/Configuration/BranchConfigurationCalculator.cs

@@ -34,7 +34,7 @@ private BranchConfig GetBranchConfigurationInternal(int recursions, IBranch targ
             throw new InfiniteLoopProtectionException($"Inherited branch configuration caused {recursions} recursions. Aborting!");
         }
 
-        var matchingBranches = configuration.FindConfigForBranch(targetBranch.Name.WithoutRemote);
+        var matchingBranches = configuration.FindConfigurationForBranch(targetBranch.Name.WithoutRemote);
 
         if (matchingBranches == null)
         {

src/GitVersion.Core/Configuration/ConfigExtensions.cs

@@ -12,7 +12,7 @@ public static BranchConfig GetBranchConfiguration(this Config configuration, IBr
 
     public static BranchConfig GetBranchConfiguration(this Config configuration, string branchName)
     {
-        var branchConfiguration = FindConfigForBranch(configuration, branchName);
+        var branchConfiguration = FindConfigurationForBranch(configuration, branchName);
         if (branchConfiguration is null)
         {
             branchConfiguration = GetUnknownBranchConfiguration(configuration);
@@ -54,7 +54,7 @@ public static BranchConfig GetFallbackBranchConfiguration(this Config configurat
         return result;
     }
 
-    internal static BranchConfig? FindConfigForBranch(this Config config, string branchName)
+    internal static BranchConfig? FindConfigurationForBranch(this Config config, string branchName)
     {
         var matches = config.Branches
             .Where(b => b.Value?.Regex != null && Regex.IsMatch(branchName, b.Value.Regex, RegexOptions.IgnoreCase))

src/GitVersion.Core/Core/RepositoryStore.cs

@@ -155,7 +155,7 @@ public IEnumerable<IBranch> GetBranchesForCommit(ICommit commit)
     public IEnumerable<IBranch> GetExcludedInheritBranches(Config configuration)
         => this.repository.Branches.Where(b =>
         {
-            var branchConfig = configuration.FindConfigForBranch(b.Name.WithoutRemote);
+            var branchConfig = configuration.FindConfigurationForBranch(b.Name.WithoutRemote);
 
             return branchConfig == null || branchConfig.Increment == IncrementStrategy.Inherit;
         }).ToList();