use IBranchConfiguration instead of BranchConfiguration

arturcic · arturcic · commit 458090a69b53 · 2023-03-29T18:37:50.000+02:00
diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigurationExtensionsTests.cs b/src/GitVersion.Core.Tests/Configuration/ConfigurationExtensionsTests.cs
@@ -9,7 +9,7 @@ public class ConfigurationExtensionsTests : TestBase
     [Test]
     public void GetReleaseBranchConfigReturnsAllReleaseBranches()
     {
-        var configuration = new GitVersionConfiguration()
+        var configuration = new GitVersionConfiguration
         {
             Branches = new Dictionary<string, BranchConfiguration>
             {
diff --git a/src/GitVersion.Core/Configuration/BranchConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/BranchConfigurationBuilder.cs
@@ -2,7 +2,7 @@
 
 namespace GitVersion.Configuration;
 
-public class BranchConfigurationBuilder
+internal class BranchConfigurationBuilder
 {
     public static BranchConfigurationBuilder New => new();
 
@@ -148,7 +148,7 @@ public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration
         return this;
     }
 
-    public BranchConfiguration Build() => new()
+    public IBranchConfiguration Build() => new BranchConfiguration
     {
         VersioningMode = versioningMode,
         Label = label,
diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs
@@ -169,7 +169,7 @@ public virtual TConfigurationBuilder WithLabelPreReleaseWeight(int? value)
 
     public virtual TConfigurationBuilder WithIgnoreConfiguration(IIgnoreConfiguration value)
     {
-        this.ignore = (IgnoreConfiguration) value;
+        this.ignore = (IgnoreConfiguration)value;
         return (TConfigurationBuilder)this;
     }
 
@@ -346,7 +346,7 @@ public virtual IGitVersionConfiguration Build()
         Dictionary<string, BranchConfiguration> branches = new();
         foreach (var (name, branchConfigurationBuilder) in this.branchConfigurationBuilders)
         {
-            branches.Add(name, branchConfigurationBuilder.Build());
+            branches.Add(name, (BranchConfiguration)branchConfigurationBuilder.Build());
         }
 
         IGitVersionConfiguration configuration = new GitVersionConfiguration
@@ -411,10 +411,10 @@ private static void FinalizeConfiguration(IGitVersionConfiguration configuration
     private static void FinalizeBranchConfiguration(IGitVersionConfiguration configuration, string branchName,
         IBranchConfiguration branchConfiguration)
     {
-        var branches = configuration.Branches.ToDictionary(x => x.Key, x => (BranchConfiguration)x.Value);
+        var branches = configuration.Branches;
         foreach (var targetBranchName in branchConfiguration.IsSourceBranchFor)
         {
-            var targetBranchConfiguration = branches[targetBranchName];
+            var targetBranchConfiguration = (BranchConfiguration)branches[targetBranchName];
             targetBranchConfiguration.SourceBranches.Add(branchName);
         }
     }
diff --git a/src/GitVersion.Core/Configuration/IgnoreConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/IgnoreConfigurationBuilder.cs
@@ -32,7 +32,7 @@ public IgnoreConfigurationBuilder WithShas(HashSet<string> value)
         return this;
     }
 
-    public IgnoreConfiguration Build() => new()
+    public IIgnoreConfiguration Build() => new IgnoreConfiguration()
     {
         Before = before,
         Shas = shas
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -109,8 +109,6 @@ GitVersion.Configuration.BranchConfiguration.TrackMergeMessage.get -> bool?
 GitVersion.Configuration.BranchConfiguration.TrackMergeTarget.get -> bool?
 GitVersion.Configuration.BranchConfiguration.TracksReleaseBranches.get -> bool?
 GitVersion.Configuration.BranchConfiguration.VersioningMode.get -> GitVersion.VersionCalculation.VersioningMode?
-GitVersion.Configuration.BranchConfigurationBuilder
-GitVersion.Configuration.BranchConfigurationBuilder.Build() -> GitVersion.Configuration.BranchConfiguration!
 GitVersion.Configuration.ConfigurationConstants
 GitVersion.Configuration.ConfigurationException
 GitVersion.Configuration.ConfigurationException.ConfigurationException() -> void
@@ -225,8 +223,6 @@ GitVersion.Configuration.IgnoreConfiguration.Before.init -> void
 GitVersion.Configuration.IgnoreConfiguration.Shas.get -> System.Collections.Generic.HashSet<string!>!
 GitVersion.Configuration.IgnoreConfiguration.Shas.init -> void
 GitVersion.Configuration.IgnoreConfigurationExtensions
-GitVersion.Configuration.Init.EditConfigStep
-GitVersion.Configuration.Init.EditConfigStep.EditConfigStep(GitVersion.Logging.IConsole! console, GitVersion.IFileSystem! fileSystem, GitVersion.Logging.ILog! log, GitVersion.Configuration.Init.Wizard.IConfigInitStepFactory! stepFactory) -> void
 GitVersion.Configuration.Init.GitVersionInitModule
 GitVersion.Configuration.Init.GitVersionInitModule.GitVersionInitModule() -> void
 GitVersion.Configuration.Init.GitVersionInitModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
@@ -939,10 +935,6 @@ GitVersion.WixInfo.WixInfo() -> void
 abstract GitVersion.Agents.BuildAgentBase.EnvironmentVariable.get -> string!
 abstract GitVersion.Agents.BuildAgentBase.GenerateSetParameterMessage(string! name, string? value) -> string![]!
 abstract GitVersion.Agents.BuildAgentBase.GenerateSetVersionMessage(GitVersion.OutputVariables.GitVersionVariables! variables) -> string?
-abstract GitVersion.Configuration.Init.Wizard.ConfigInitWizardStep.DefaultResult.get -> string?
-abstract GitVersion.Configuration.Init.Wizard.ConfigInitWizardStep.GetPrompt(GitVersion.Configuration.GitVersionConfiguration! configuration, string! workingDirectory) -> string!
-abstract GitVersion.Configuration.Init.Wizard.ConfigInitWizardStep.HandleResult(string? result, System.Collections.Generic.Queue<GitVersion.Configuration.Init.Wizard.ConfigInitWizardStep!>! steps, GitVersion.Configuration.GitVersionConfiguration! configuration, string! workingDirectory) -> GitVersion.Configuration.Init.StepResult!
-abstract GitVersion.GitVersionModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
 abstract GitVersion.VersionCalculation.VersionStrategyBase.GetBaseVersions(GitVersion.Configuration.EffectiveBranchConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.BaseVersion!>!
 const GitVersion.Configuration.ConfigurationConstants.BranchNamePlaceholder = "{BranchName}" -> string!
 const GitVersion.Configuration.ConfigurationConstants.DefaultLabelPrefix = "[vV]?" -> string!
@@ -1011,7 +1003,6 @@ override GitVersion.VersionCalculation.VersionInBranchNameVersionStrategy.GetBas
 readonly GitVersion.Agents.BuildAgentBase.Log -> GitVersion.Logging.ILog!
 static GitVersion.BranchCommit.operator !=(GitVersion.BranchCommit left, GitVersion.BranchCommit right) -> bool
 static GitVersion.BranchCommit.operator ==(GitVersion.BranchCommit left, GitVersion.BranchCommit right) -> bool
-static GitVersion.Configuration.BranchConfigurationBuilder.New.get -> GitVersion.Configuration.BranchConfigurationBuilder!
 static GitVersion.Configuration.ConfigurationExtensions.FindGitDir(this string! path) -> (string! GitDirectory, string! WorkingTreeDirectory)?
 static GitVersion.Configuration.ConfigurationExtensions.GetBranchConfiguration(this GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.IBranch! branch) -> GitVersion.Configuration.IBranchConfiguration!
 static GitVersion.Configuration.ConfigurationExtensions.GetBranchConfiguration(this GitVersion.Configuration.IGitVersionConfiguration! configuration, GitVersion.ReferenceName! branchName) -> GitVersion.Configuration.IBranchConfiguration!
@@ -1144,23 +1135,5 @@ virtual GitVersion.Agents.BuildAgentBase.PreventFetch() -> bool
 virtual GitVersion.Agents.BuildAgentBase.ShouldCleanUpRemotes() -> bool
 virtual GitVersion.Agents.BuildAgentBase.WriteIntegration(System.Action<string?>! writer, GitVersion.OutputVariables.GitVersionVariables! variables, bool updateBuildNumber = true) -> void
 virtual GitVersion.Configuration.BranchConfiguration.Inherit(GitVersion.Configuration.IBranchConfiguration! configuration) -> GitVersion.Configuration.IBranchConfiguration!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithCommitMessageIncrementing(GitVersion.VersionCalculation.CommitMessageIncrementMode? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithConfiguration(GitVersion.Configuration.IBranchConfiguration! value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithIncrement(GitVersion.IncrementStrategy value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithIsMainline(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithIsReleaseBranch(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithIsSourceBranchFor(System.Collections.Generic.IEnumerable<string!>! values) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithIsSourceBranchFor(params string![]! values) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithLabel(string? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithLabelNumberPattern(string? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithPreReleaseWeight(int? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithPreventIncrementOfMergedBranchVersion(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithRegularExpression(string? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithSourceBranches(System.Collections.Generic.IEnumerable<string!>! values) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithSourceBranches(params string![]! values) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithTrackMergeMessage(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithTrackMergeTarget(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithTracksReleaseBranches(bool? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
-virtual GitVersion.Configuration.BranchConfigurationBuilder.WithVersioningMode(GitVersion.VersionCalculation.VersioningMode? value) -> GitVersion.Configuration.BranchConfigurationBuilder!
 virtual GitVersion.VersionCalculation.EffectiveBranchConfigurationFinder.GetConfigurations(GitVersion.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.Configuration.EffectiveBranchConfiguration!>!
 virtual GitVersion.VersionCalculation.NextVersionCalculator.FindVersion() -> GitVersion.VersionCalculation.NextVersion!

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class ConfigurationExtensionsTests : TestBase`
`9`	`9`	`[Test]`
`10`	`10`	`public void GetReleaseBranchConfigReturnsAllReleaseBranches()`
`11`	`11`	`{`
`12`		`- var configuration = new GitVersionConfiguration()`
	`12`	`+ var configuration = new GitVersionConfiguration`
`13`	`13`	`{`
`14`	`14`	`Branches = new Dictionary<string, BranchConfiguration>`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace GitVersion.Configuration;`
`4`	`4`
`5`		`-public class BranchConfigurationBuilder`
	`5`	`+internal class BranchConfigurationBuilder`
`6`	`6`	`{`
`7`	`7`	`public static BranchConfigurationBuilder New => new();`
`8`	`8`
`@@ -148,7 +148,7 @@ public virtual BranchConfigurationBuilder WithConfiguration(IBranchConfiguration`
`148`	`148`	`return this;`
`149`	`149`	`}`
`150`	`150`
`151`		`- public BranchConfiguration Build() => new()`
	`151`	`+ public IBranchConfiguration Build() => new BranchConfiguration`
`152`	`152`	`{`
`153`	`153`	`VersioningMode = versioningMode,`
`154`	`154`	`Label = label,`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public virtual TConfigurationBuilder WithLabelPreReleaseWeight(int? value)`
`169`	`169`
`170`	`170`	`public virtual TConfigurationBuilder WithIgnoreConfiguration(IIgnoreConfiguration value)`
`171`	`171`	`{`
`172`		`- this.ignore = (IgnoreConfiguration) value;`
	`172`	`+ this.ignore = (IgnoreConfiguration)value;`
`173`	`173`	`return (TConfigurationBuilder)this;`
`174`	`174`	`}`
`175`	`175`
`@@ -346,7 +346,7 @@ public virtual IGitVersionConfiguration Build()`
`346`	`346`	`Dictionary<string, BranchConfiguration> branches = new();`
`347`	`347`	`foreach (var (name, branchConfigurationBuilder) in this.branchConfigurationBuilders)`
`348`	`348`	`{`
`349`		`- branches.Add(name, branchConfigurationBuilder.Build());`
	`349`	`+ branches.Add(name, (BranchConfiguration)branchConfigurationBuilder.Build());`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`IGitVersionConfiguration configuration = new GitVersionConfiguration`
`@@ -411,10 +411,10 @@ private static void FinalizeConfiguration(IGitVersionConfiguration configuration`
`411`	`411`	`private static void FinalizeBranchConfiguration(IGitVersionConfiguration configuration, string branchName,`
`412`	`412`	`IBranchConfiguration branchConfiguration)`
`413`	`413`	`{`
`414`		`- var branches = configuration.Branches.ToDictionary(x => x.Key, x => (BranchConfiguration)x.Value);`
	`414`	`+ var branches = configuration.Branches;`
`415`	`415`	`foreach (var targetBranchName in branchConfiguration.IsSourceBranchFor)`
`416`	`416`	`{`
`417`		`- var targetBranchConfiguration = branches[targetBranchName];`
	`417`	`+ var targetBranchConfiguration = (BranchConfiguration)branches[targetBranchName];`
`418`	`418`	`targetBranchConfiguration.SourceBranches.Add(branchName);`
`419`	`419`	`}`
`420`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public IgnoreConfigurationBuilder WithShas(HashSet<string> value)`
`32`	`32`	`return this;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public IgnoreConfiguration Build() => new()`
	`35`	`+ public IIgnoreConfiguration Build() => new IgnoreConfiguration()`
`36`	`36`	`{`
`37`	`37`	`Before = before,`
`38`	`38`	`Shas = shas`