moved GetEffectiveConfiguration from GitVersionContext to ConfigurationExtensions

Author: arturcic

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

@@ -280,7 +280,7 @@ public void ChoosesHighestVersionReturnedFromStrategies()
         var configuration = GitFlowConfigurationBuilder.New.Build();
         var context = new GitVersionContext(branchMock, null, configuration, null, 0);
         var repositoryStoreMock = Substitute.For<IRepositoryStore>();
-        var effectiveConfiguration = context.GetEffectiveConfiguration(branchMock);
+        var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(branchMock);
         var effectiveBranchConfiguration = new EffectiveBranchConfiguration(branchMock, effectiveConfiguration);
         var effectiveBranchConfigurationFinderMock = Substitute.For<IEffectiveBranchConfigurationFinder>();
         effectiveBranchConfigurationFinderMock.GetConfigurations(branchMock, configuration).Returns(new[] { effectiveBranchConfiguration });
@@ -311,7 +311,7 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhen()
         var configuration = GitFlowConfigurationBuilder.New.Build();
         var context = new GitVersionContext(branchMock, null, configuration, null, 0);
         var repositoryStoreMock = Substitute.For<IRepositoryStore>();
-        var effectiveConfiguration = context.GetEffectiveConfiguration(branchMock);
+        var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(branchMock);
         var effectiveBranchConfiguration = new EffectiveBranchConfiguration(branchMock, effectiveConfiguration);
         var effectiveBranchConfigurationFinderMock = Substitute.For<IEffectiveBranchConfigurationFinder>();
         effectiveBranchConfigurationFinderMock.GetConfigurations(branchMock, configuration).Returns(new[] { effectiveBranchConfiguration });
@@ -342,7 +342,7 @@ public void UsesWhenFromNextBestMatchIfHighestDoesntHaveWhenReversedOrder()
         var configuration = GitFlowConfigurationBuilder.New.Build();
         var context = new GitVersionContext(branchMock, null, configuration, null, 0);
         var repositoryStoreMock = Substitute.For<IRepositoryStore>();
-        var effectiveConfiguration = context.GetEffectiveConfiguration(branchMock);
+        var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(branchMock);
         var effectiveBranchConfiguration = new EffectiveBranchConfiguration(branchMock, effectiveConfiguration);
         var effectiveBranchConfigurationFinderMock = Substitute.For<IEffectiveBranchConfigurationFinder>();
         effectiveBranchConfigurationFinderMock.GetConfigurations(branchMock, configuration).Returns(new[] { effectiveBranchConfiguration });
@@ -374,7 +374,7 @@ public void ShouldNotFilterVersion()
         var configuration = GitFlowConfigurationBuilder.New.WithIgnoreConfiguration(fakeIgnoreConfig).Build();
         var context = new GitVersionContext(branchMock, null, configuration, null, 0);
         var repositoryStoreMock = Substitute.For<IRepositoryStore>();
-        var effectiveConfiguration = context.GetEffectiveConfiguration(branchMock);
+        var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(branchMock);
         var effectiveBranchConfiguration = new EffectiveBranchConfiguration(branchMock, effectiveConfiguration);
         var effectiveBranchConfigurationFinderMock = Substitute.For<IEffectiveBranchConfigurationFinder>();
         effectiveBranchConfigurationFinderMock.GetConfigurations(branchMock, configuration).Returns(new[] { effectiveBranchConfiguration });
@@ -405,7 +405,7 @@ public void ShouldFilterVersion()
         var configuration = GitFlowConfigurationBuilder.New.WithIgnoreConfiguration(fakeIgnoreConfig).Build();
         var context = new GitVersionContext(branchMock, null, configuration, null, 0);
         var repositoryStoreMock = Substitute.For<IRepositoryStore>();
-        var effectiveConfiguration = context.GetEffectiveConfiguration(branchMock);
+        var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(branchMock);
         var effectiveBranchConfiguration = new EffectiveBranchConfiguration(branchMock, effectiveConfiguration);
         var effectiveBranchConfigurationFinderMock = Substitute.For<IEffectiveBranchConfigurationFinder>();
         effectiveBranchConfigurationFinderMock.GetConfigurations(branchMock, configuration).Returns(new[] { effectiveBranchConfiguration });
@@ -440,7 +440,7 @@ public void ShouldIgnorePreReleaseVersionInMainlineMode()
             .Build();
         var context = new GitVersionContext(branchMock, null, configuration, null, 0);
         var repositoryStoreMock = Substitute.For<IRepositoryStore>();
-        var effectiveConfiguration = context.GetEffectiveConfiguration(branchMock);
+        var effectiveConfiguration = context.Configuration.GetEffectiveConfiguration(branchMock);
         var effectiveBranchConfiguration = new EffectiveBranchConfiguration(branchMock, effectiveConfiguration);
         var effectiveBranchConfigurationFinderMock = Substitute.For<IEffectiveBranchConfigurationFinder>();
         effectiveBranchConfigurationFinderMock.GetConfigurations(branchMock, configuration).Returns(new[] { effectiveBranchConfiguration });

src/GitVersion.Core/Configuration/ConfigurationExtensions.cs

@@ -6,6 +6,12 @@ namespace GitVersion.Configuration;
 
 public static class ConfigurationExtensions
 {
+    public static EffectiveConfiguration GetEffectiveConfiguration(this GitVersionConfiguration configuration, IBranch branch)
+    {
+        var branchConfiguration = configuration.GetBranchConfiguration(branch);
+        return new EffectiveConfiguration(configuration, branchConfiguration);
+    }
+
     public static BranchConfiguration GetBranchConfiguration(this GitVersionConfiguration configuration, IBranch branch)
         => GetBranchConfiguration(configuration, branch.NotNull().Name.WithoutRemote);
 

src/GitVersion.Core/GitVersionContext.cs

@@ -31,10 +31,4 @@ public GitVersionContext(IBranch currentBranch, ICommit? currentCommit,
         CurrentCommitTaggedVersion = currentCommitTaggedVersion;
         NumberOfUncommittedChanges = numberOfUncommittedChanges;
     }
-
-    public EffectiveConfiguration GetEffectiveConfiguration(IBranch branch)
-    {
-        BranchConfiguration branchConfiguration = Configuration.GetBranchConfiguration(branch);
-        return new EffectiveConfiguration(Configuration, branchConfiguration);
-    }
 }

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -357,7 +357,6 @@ GitVersion.GitVersionContext.Configuration.get -> GitVersion.Configuration.GitVe
 GitVersion.GitVersionContext.CurrentBranch.get -> GitVersion.IBranch!
 GitVersion.GitVersionContext.CurrentCommit.get -> GitVersion.ICommit?
 GitVersion.GitVersionContext.CurrentCommitTaggedVersion.get -> GitVersion.SemanticVersion?
-GitVersion.GitVersionContext.GetEffectiveConfiguration(GitVersion.IBranch! branch) -> GitVersion.Configuration.EffectiveConfiguration!
 GitVersion.GitVersionContext.GitVersionContext(GitVersion.IBranch! currentBranch, GitVersion.ICommit? currentCommit, GitVersion.Configuration.GitVersionConfiguration! configuration, GitVersion.SemanticVersion? currentCommitTaggedVersion, int numberOfUncommittedChanges) -> void
 GitVersion.GitVersionContext.IsCurrentCommitTagged.get -> bool
 GitVersion.GitVersionContext.NumberOfUncommittedChanges.get -> int
@@ -1058,6 +1057,7 @@ static GitVersion.Configuration.BranchConfigurationBuilder.New.get -> GitVersion
 static GitVersion.Configuration.ConfigurationExtensions.GetBranchConfiguration(this GitVersion.Configuration.GitVersionConfiguration! configuration, GitVersion.IBranch! branch) -> GitVersion.Configuration.BranchConfiguration!
 static GitVersion.Configuration.ConfigurationExtensions.GetBranchConfiguration(this GitVersion.Configuration.GitVersionConfiguration! configuration, string! branchName) -> GitVersion.Configuration.BranchConfiguration!
 static GitVersion.Configuration.ConfigurationExtensions.GetBranchSpecificTag(this GitVersion.Configuration.EffectiveConfiguration! configuration, GitVersion.Logging.ILog! log, string? branchFriendlyName, string? branchNameOverride) -> string!
+static GitVersion.Configuration.ConfigurationExtensions.GetEffectiveConfiguration(this GitVersion.Configuration.GitVersionConfiguration! configuration, GitVersion.IBranch! branch) -> GitVersion.Configuration.EffectiveConfiguration!
 static GitVersion.Configuration.ConfigurationExtensions.GetFallbackBranchConfiguration(this GitVersion.Configuration.GitVersionConfiguration! configuration) -> GitVersion.Configuration.BranchConfiguration!
 static GitVersion.Configuration.ConfigurationExtensions.GetReleaseBranchConfiguration(this GitVersion.Configuration.GitVersionConfiguration! configuration) -> System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<string!, GitVersion.Configuration.BranchConfiguration!>>!
 static GitVersion.Configuration.ConfigurationExtensions.IsReleaseBranch(this GitVersion.Configuration.GitVersionConfiguration! configuration, string! branchName) -> bool

src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs

@@ -57,7 +57,7 @@ private IEnumerable<BaseVersion> ReleaseBranchBaseVersions()
         var releaseBranches = this.repositoryStore.GetReleaseBranches(releaseBranchConfig);
 
         return releaseBranches
-            .SelectMany(b => GetReleaseVersion(b))
+            .SelectMany(GetReleaseVersion)
             .Select(baseVersion =>
             {
                 // Need to drop branch overrides and give a bit more context about
@@ -76,7 +76,7 @@ private IEnumerable<BaseVersion> GetReleaseVersion(IBranch releaseBranch)
     {
         // Find the commit where the child branch was created.
         var baseSource = this.repositoryStore.FindMergeBase(releaseBranch, Context.CurrentBranch);
-        var configuration = Context.GetEffectiveConfiguration(releaseBranch);
+        var configuration = Context.Configuration.GetEffectiveConfiguration(releaseBranch);
         return this.releaseVersionStrategy
             .GetBaseVersions(new(releaseBranch, configuration))
             .Select(b => new BaseVersion(b.Source, true, b.SemanticVersion, baseSource, b.BranchNameOverride));

src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs

@@ -214,7 +214,7 @@ private IEnumerable<NextVersion> GetNextVersions(IBranch branch, GitVersionConfi
 
                         if (effectiveBranchConfiguration.Value.VersioningMode == VersioningMode.Mainline)
                         {
-                            if (!(incrementedVersion.PreReleaseTag.HasTag() != true))
+                            if (incrementedVersion.PreReleaseTag.HasTag())
                             {
                                 continue;
                             }