Fix unit tests

Author: HHobeck

src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -39,7 +39,7 @@ branches:
     is-mainline: true
     pre-release-weight: 55000
   release:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: beta
     increment: None
     prevent-increment-of-merged-branch-version: true
@@ -56,7 +56,7 @@ branches:
     is-mainline: false
     pre-release-weight: 30000
   feature:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
     regex: ^features?[/-](?<BranchName>.+)
@@ -70,7 +70,7 @@ branches:
     is-source-branch-for: []
     pre-release-weight: 30000
   pull-request:
-    mode: ContinuousDeployment
+    mode: ContinuousDelivery
     label: PullRequest
     increment: Inherit
     label-number-pattern: '[/-](?<number>\d+)'
@@ -85,7 +85,7 @@ branches:
     is-source-branch-for: []
     pre-release-weight: 30000
   hotfix:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: beta
     increment: Inherit
     regex: ^hotfix(es)?[/-]
@@ -111,7 +111,7 @@ branches:
     is-mainline: true
     pre-release-weight: 55000
   unknown:
-    mode: ContinuousDelivery
+    mode: ManualDeployment
     label: '{BranchName}'
     increment: Inherit
     regex: (?<BranchName>.+)
@@ -126,7 +126,7 @@ branches:
     is-source-branch-for: []
 ignore:
   sha: []
-mode: ContinuousDeployment
+mode: ContinuousDelivery
 label: '{BranchName}'
 increment: Inherit
 prevent-increment-of-merged-branch-version: false

src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunk.cs

@@ -11,7 +11,7 @@ internal sealed class CommitOnNonTrunk : ITrunkBasedIncrementer
     // A  58 minutes ago
 
     public bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => commit.ChildIteration is null && !commit.Configuration.IsMainline && context.SemanticVersion is null;
+        => !commit.HasChildIteration && !commit.Configuration.IsMainline && context.SemanticVersion is null;
 
     public IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
     {

src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithPreReleaseTagBase.cs

@@ -6,7 +6,7 @@ namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
 internal abstract class CommitOnNonTrunkWithPreReleaseTagBase : ITrunkBasedIncrementer
 {
     public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => commit.ChildIteration is null && !commit.Configuration.IsMainline
+        => !commit.HasChildIteration && !commit.Configuration.IsMainline
             && context.SemanticVersion?.IsPreRelease == true;
 
     public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)

src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/CommitOnNonTrunkWithStableTagBase.cs

@@ -6,7 +6,7 @@ namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
 internal abstract class CommitOnNonTrunkWithStableTagBase : ITrunkBasedIncrementer
 {
     public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => !commit.Configuration.IsMainline && commit.ChildIteration is null
+        => !commit.Configuration.IsMainline && !commit.HasChildIteration
             && context.SemanticVersion?.IsPreRelease == false;
 
     public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)

src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunkBase.cs

@@ -5,7 +5,7 @@ namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
 internal abstract class MergeCommitOnNonTrunkBase : ITrunkBasedIncrementer
 {
     public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => commit.ChildIteration is not null && !commit.Configuration.IsMainline && context.SemanticVersion is null;
+        => commit.HasChildIteration && !commit.Configuration.IsMainline && context.SemanticVersion is null;
 
     public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
     {

src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunk.cs

@@ -11,7 +11,7 @@ internal sealed class CommitOnTrunk : ITrunkBasedIncrementer
     // A  58 minutes ago <<--
 
     public bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => commit.ChildIteration is null && commit.Configuration.IsMainline && context.SemanticVersion is null;
+        => !commit.HasChildIteration && commit.Configuration.IsMainline && context.SemanticVersion is null;
 
     public IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
     {

src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithPreReleaseTagBase.cs

@@ -5,7 +5,7 @@ namespace GitVersion.VersionCalculation.TrunkBased.Trunk;
 internal abstract class CommitOnTrunkWithPreReleaseTagBase : ITrunkBasedIncrementer
 {
     public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => commit.Configuration.IsMainline && commit.ChildIteration is null
+        => commit.Configuration.IsMainline && !commit.HasChildIteration
             && context.SemanticVersion?.IsPreRelease == true;
 
     public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)

src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/CommitOnTrunkWithStableTagBase.cs

@@ -6,7 +6,7 @@ namespace GitVersion.VersionCalculation.TrunkBased.Trunk;
 internal abstract class CommitOnTrunkWithStableTagBase : ITrunkBasedIncrementer
 {
     public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => commit.Configuration.IsMainline && commit.ChildIteration is null
+        => commit.Configuration.IsMainline && !commit.HasChildIteration
             && context.SemanticVersion?.IsPreRelease == false;
 
     public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)

src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunkBase.cs

@@ -5,7 +5,7 @@ namespace GitVersion.VersionCalculation.TrunkBased.Trunk;
 internal abstract class MergeCommitOnTrunkBase : ITrunkBasedIncrementer
 {
     public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
-        => commit.ChildIteration is not null && commit.Configuration.IsMainline && context.SemanticVersion is null;
+        => commit.HasChildIteration && commit.Configuration.IsMainline && context.SemanticVersion is null;
 
     public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
     {

src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedCommit.cs

@@ -33,7 +33,7 @@ public bool IsPredecessorTheLastCommitOnTrunk
 
     public TrunkBasedIteration? ChildIteration { get; private set; }
 
-    public bool HasChildIteration => ChildIteration is not null;
+    public bool HasChildIteration => ChildIteration?.Commits.Any() == true;
 
     public IReadOnlyCollection<SemanticVersion> SemanticVersions => semanticVersions;