code cleanup

arturcic · Jul 15, 2024 · 13ccb8f · 13ccb8f
1 parent cb017de
commit 13ccb8f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/GitVersion.App.Tests/HelpWriterTests.cs b/src/GitVersion.App.Tests/HelpWriterTests.cs
@@ -53,8 +53,8 @@ public void AllArgsAreInHelp()
 
     private static bool IsNotInHelp(IReadOnlyDictionary<string, string> lookup, string propertyName, string helpText)
     {
-        if (lookup.ContainsKey(propertyName))
-            return !helpText.Contains(lookup[propertyName]);
+        if (lookup.TryGetValue(propertyName, out var value))
+            return !helpText.Contains(value);
 
         return !helpText.Contains("/" + propertyName.ToLower());
     }

diff --git a/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs b/src/GitVersion.Core.Tests/IntegrationTests/DocumentationSamplesForGitFlow.cs
@@ -242,7 +242,7 @@ public void FeatureFromDevelopBranchWithMainline(bool withPullRequestIntoDevelop
         var configuration = GitFlowConfigurationBuilder.New
             .WithNextVersion("1.2.0")
             .WithVersionStrategies(VersionStrategies.ConfiguredNextVersion, VersionStrategies.Mainline)
-            .WithBranch("feature", _ => _.WithIncrement(IncrementStrategy.Minor))
+            .WithBranch("feature", builder => builder.WithIncrement(IncrementStrategy.Minor))
             .Build();
 
         using var fixture = new EmptyRepositoryFixture();

diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -116,9 +116,9 @@ private IReadOnlyCollection<ICommit> GetCommitHistory(string? tagPrefix, Semanti
         var targetShas = new Lazy<HashSet<string>>(() =>
             taggedSemanticVersionRepository
                 .GetTaggedSemanticVersions(tagPrefix, semanticVersionFormat, ignore)
-                .SelectMany(_ => _)
-                .Where(_ => _.Value.IsMatchForBranchSpecificLabel(label))
-                .Select(_ => _.Tag.TargetSha)
+                .SelectMany(versionWithTags => versionWithTags)
+                .Where(versionWithTag => versionWithTag.Value.IsMatchForBranchSpecificLabel(label))
+                .Select(versionWithTag => versionWithTag.Tag.TargetSha)
                 .ToHashSet()
         );