cleanup

GitTools · Nov 20, 2023 · 3f9fc42 · 3f9fc42
1 parent d762e0f
commit 3f9fc42
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/src/GitVersion.BuildAgents/Agents/GitHubActions.cs b/src/GitVersion.BuildAgents/Agents/GitHubActions.cs
@@ -50,7 +50,6 @@ public override void WriteIntegration(Action<string?> writer, GitVersionVariable
         }
     }
 
-
     public override string? GetCurrentBranch(bool usingDynamicRepos)
     {
         // https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables

diff --git a/src/GitVersion.Core/Configuration/EffectiveBranchConfiguration.cs b/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(incrementedVersion, baseVersion, this);
-    }
 }
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -99,7 +99,6 @@ GitVersion.Configuration.ConfigurationModule.ConfigurationModule() -> void
 GitVersion.Configuration.ConfigurationModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
 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

diff --git a/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/VersionCalculators/NextVersionCalculator.cs
@@ -43,8 +43,7 @@ public virtual NextVersion FindVersion()
         var nextVersion = CalculateNextVersion(Context.CurrentBranch, Context.Configuration);
         var incrementedVersion = CalculateIncrementedVersion(nextVersion.Configuration.VersioningMode, nextVersion);
 
-        var effectiveBranchConfiguration = nextVersion.BranchConfiguration;
-        return effectiveBranchConfiguration.CreateNextVersion(nextVersion.BaseVersion, incrementedVersion);
+        return CreateNextVersion(nextVersion.BaseVersion, incrementedVersion, nextVersion.BranchConfiguration);
     }
 
     private SemanticVersion CalculateIncrementedVersion(VersioningMode versioningMode, NextVersion nextVersion)
@@ -114,8 +113,15 @@ private NextVersion CalculateNextVersion(IBranch branch, IGitVersionConfiguratio
 
         log.Info($"Base version used: {calculatedBase}");
         log.Separator();
-        var effectiveBranchConfiguration = maxVersion.BranchConfiguration;
-        return effectiveBranchConfiguration.CreateNextVersion(calculatedBase, maxVersion.IncrementedVersion);
+        return CreateNextVersion(calculatedBase, maxVersion.IncrementedVersion, maxVersion.BranchConfiguration);
+    }
+
+    private static NextVersion CreateNextVersion(BaseVersion baseVersion, SemanticVersion incrementedVersion, EffectiveBranchConfiguration effectiveBranchConfiguration)
+    {
+        incrementedVersion.NotNull();
+        baseVersion.NotNull();
+
+        return new(incrementedVersion, baseVersion, effectiveBranchConfiguration);
     }
 
     private static NextVersion CompareVersions(NextVersion versions1, NextVersion version2)
@@ -179,7 +185,7 @@ IEnumerable<NextVersion> GetNextVersionsInternal()
     }
 
     private bool TryGetNextVersion([NotNullWhen(true)] out NextVersion? result,
-        EffectiveBranchConfiguration effectiveConfiguration, BaseVersion baseVersion)
+                                   EffectiveBranchConfiguration effectiveConfiguration, BaseVersion baseVersion)
     {
         result = null;
 
@@ -194,8 +200,9 @@ private bool TryGetNextVersion([NotNullWhen(true)] out NextVersion? result,
         var incrementedVersion = GetIncrementedVersion(effectiveConfiguration, baseVersion, label);
         if (incrementedVersion.IsMatchForBranchSpecificLabel(label))
         {
-            result = effectiveConfiguration.CreateNextVersion(baseVersion, incrementedVersion);
+            result = CreateNextVersion(baseVersion, incrementedVersion, effectiveConfiguration);
         }
+
         return result is not null;
     }
 
@@ -219,9 +226,11 @@ private bool IncludeVersion(BaseVersion baseVersion, IIgnoreConfiguration ignore
                 {
                     log.Info(reason);
                 }
+
                 return false;
             }
         }
+
         return true;
     }
 }