Move CreateNextVersion back to NextVersionCalculator

Author: HHobeck

src/GitVersion.Core/Configuration/EffectiveBranchConfiguration.cs

@@ -1,5 +1,4 @@
 using GitVersion.Extensions;
-using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
 
@@ -8,12 +7,4 @@ public record EffectiveBranchConfiguration(EffectiveConfiguration Value, IBranch
     public IBranch Branch { get; } = Branch.NotNull();
 
     public EffectiveConfiguration Value { get; } = Value.NotNull();
-
-    public NextVersion CreateNextVersion(BaseVersion baseVersion, SemanticVersion incrementedVersion)
-    {
-        incrementedVersion.NotNull();
-        baseVersion.NotNull();
-
-        return new NextVersion(incrementedVersion, baseVersion, this);
-    }
 }

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -91,7 +91,6 @@ GitVersion.Common.IRepositoryStore.IsCommitOnBranch(GitVersion.ICommit? baseVers
 GitVersion.Configuration.ConfigurationExtensions
 GitVersion.Configuration.EffectiveBranchConfiguration
 GitVersion.Configuration.EffectiveBranchConfiguration.Branch.get -> GitVersion.IBranch!
-GitVersion.Configuration.EffectiveBranchConfiguration.CreateNextVersion(GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.SemanticVersion! incrementedVersion) -> GitVersion.VersionCalculation.NextVersion!
 GitVersion.Configuration.EffectiveBranchConfiguration.EffectiveBranchConfiguration(GitVersion.Configuration.EffectiveConfiguration! Value, GitVersion.IBranch! Branch) -> void
 GitVersion.Configuration.EffectiveBranchConfiguration.Value.get -> GitVersion.Configuration.EffectiveConfiguration!
 GitVersion.Configuration.EffectiveConfiguration

src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs

@@ -201,22 +201,12 @@ private bool TryGetNextVersion([NotNullWhen(true)] out NextVersion? result,
         var incrementedVersion = GetIncrementedVersion(effectiveConfiguration, baseVersion, label);
         if (incrementedVersion.IsMatchForBranchSpecificLabel(label))
         {
-            result = effectiveConfiguration.CreateNextVersion(baseVersion, incrementedVersion);
+            result = new NextVersion(incrementedVersion, baseVersion, effectiveConfiguration);
         }
 
         return result is not null;
     }
 
-    //private SemanticVersion GetIncrementedVersion(EffectiveBranchConfiguration configuration, BaseVersion baseVersion, string? label)
-    //{
-    //    var incrementStrategy = incrementStrategyFinder.DetermineIncrementedField(
-    //        currentCommit: Context.CurrentCommit,
-    //        baseVersion: baseVersion,
-    //        configuration: configuration.Value
-    //    );
-    //    return baseVersion.GetSemanticVersion().IncrementVersion(incrementStrategy, label);
-    //}
-
     private SemanticVersion GetIncrementedVersion(EffectiveBranchConfiguration configuration, BaseVersion baseVersion, string? label)
     {
         if (baseVersion is BaseVersionV2 baseVersionV2)