use configuration builder in init module

src/GitVersion.Core/Configuration/ConfigurationProvider.cs

@@ -44,7 +44,7 @@ public void Init(string workingDirectory)
         var configFilePath = PathHelper.Combine(workingDirectory, fileName);
         var currentConfiguration = this.configFileLocator.ReadConfiguration(configFilePath);
 
-        var configuration = this.configInitWizard.Run((GitVersionConfiguration) currentConfiguration, workingDirectory);
+        var configuration = this.configInitWizard.Run(currentConfiguration, workingDirectory);
         if (configuration == null) return;
 
         using var stream = this.fileSystem.OpenWrite(configFilePath);

src/GitVersion.Core/Configuration/Init/BuildServer/AppVeyorSetup.cs

@@ -18,7 +18,7 @@ public AppVeyorSetup WithData(ProjectVisibility visibility)
         return this;
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>();
         switch (result)
@@ -80,7 +80,7 @@ private void WriteConfig(string workingDirectory, IFileSystem fileSystem, string
         this.Log.Info($"AppVeyor sample configuration file written to {outputFilename}");
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory)
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         var prompt = new StringBuilder();
         if (AppVeyorConfigExists(workingDirectory, this.FileSystem))

src/GitVersion.Core/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs

@@ -9,7 +9,7 @@ public AppveyorPublicPrivate(IConsole console, IFileSystem fileSystem, ILog log,
     {
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         switch (result)
         {
@@ -26,7 +26,7 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.Ok();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => @"Is your project public or private?
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => @"Is your project public or private?
 
 That is ... does it require authentication to clone/pull?
 

src/GitVersion.Core/Configuration/Init/BuildServer/SetupBuildScripts.cs

@@ -9,7 +9,7 @@ public SetupBuildScripts(IConsole console, IFileSystem fileSystem, ILog log, ICo
     {
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         switch (result)
         {
@@ -23,7 +23,7 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.Ok();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => @"What build server are you using?
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => @"What build server are you using?
 
 Want to see more? Contribute a pull request!
 

src/GitVersion.Core/Configuration/Init/EditConfigStep.cs

@@ -5,13 +5,13 @@
 
 namespace GitVersion.Configuration.Init;
 
-public class EditConfigStep : ConfigInitWizardStep
+internal class EditConfigStep : ConfigInitWizardStep
 {
     public EditConfigStep(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         switch (result)
         {
@@ -45,7 +45,10 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.InvalidResponseSelected();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => $@"Which would you like to change?
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory)
+    {
+        var configuration = configurationBuilder.Build();
+        return $@"Which would you like to change?
 
 0) Save changes and exit
 1) Exit without saving
@@ -57,6 +60,7 @@ protected override string GetPrompt(GitVersionConfiguration configuration, strin
 5) Branch Increment mode (per commit/after tag) (Current: {configuration.VersioningMode ?? VersionCalculation.VersioningMode.ContinuousDeployment})
 6) Assembly versioning scheme (Current: {configuration.AssemblyVersioningScheme})
 7) Setup build scripts";
+    }
 
     protected override string? DefaultResult => null;
 }

src/GitVersion.Core/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs

@@ -4,13 +4,13 @@
 
 namespace GitVersion.Configuration.Init.SetConfig;
 
-public class AssemblyVersioningSchemeSetting : ConfigInitWizardStep
+internal class AssemblyVersioningSchemeSetting : ConfigInitWizardStep
 {
     public AssemblyVersioningSchemeSetting(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>();
         switch (result)
@@ -19,31 +19,31 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
                 steps.Enqueue(editConfigStep);
                 return StepResult.Ok();
             case "1":
-                configuration.AssemblyVersioningScheme = AssemblyVersioningScheme.Major;
+                configurationBuilder.WithAssemblyVersioningScheme(AssemblyVersioningScheme.Major);
                 steps.Enqueue(editConfigStep);
                 return StepResult.Ok();
             case "2":
-                configuration.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinor;
+                configurationBuilder.WithAssemblyVersioningScheme(AssemblyVersioningScheme.MajorMinor);
                 steps.Enqueue(editConfigStep);
                 return StepResult.Ok();
             case "3":
-                configuration.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch;
+                configurationBuilder.WithAssemblyVersioningScheme(AssemblyVersioningScheme.MajorMinorPatch);
                 steps.Enqueue(editConfigStep);
                 return StepResult.Ok();
             case "4":
-                configuration.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag;
+                configurationBuilder.WithAssemblyVersioningScheme(AssemblyVersioningScheme.MajorMinorPatchTag);
                 steps.Enqueue(editConfigStep);
                 return StepResult.Ok();
             case "5":
-                configuration.AssemblyVersioningScheme = AssemblyVersioningScheme.None;
+                configurationBuilder.WithAssemblyVersioningScheme(AssemblyVersioningScheme.None);
                 steps.Enqueue(editConfigStep);
                 return StepResult.Ok();
         }
 
         return StepResult.InvalidResponseSelected();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => @"What assembly versioning scheme do you want to use:
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => @"What assembly versioning scheme do you want to use:
 
 0) Go Back
 1) Major.0.0.0

src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranch.cs

@@ -3,7 +3,7 @@
 
 namespace GitVersion.Configuration.Init.SetConfig;
 
-public class ConfigureBranch : ConfigInitWizardStep
+internal class ConfigureBranch : ConfigInitWizardStep
 {
     private string name;
     private BranchConfiguration branchConfiguration;
@@ -19,7 +19,7 @@ public ConfigureBranch WithData(string configName, BranchConfiguration configura
         return this;
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         switch (result)
         {
@@ -37,7 +37,7 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.InvalidResponseSelected();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => $@"What would you like to change for '{this.name}':
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => $@"What would you like to change for '{this.name}':
 
 0) Go Back
 1) Branch Pr-release tag (Current: {this.branchConfiguration.Label})

src/GitVersion.Core/Configuration/Init/SetConfig/ConfigureBranches.cs

@@ -3,13 +3,13 @@
 
 namespace GitVersion.Configuration.Init.SetConfig;
 
-public class ConfigureBranches : ConfigInitWizardStep
+internal class ConfigureBranches : ConfigInitWizardStep
 {
     public ConfigureBranches(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         if (int.TryParse(result, out var parsed))
         {
@@ -21,12 +21,13 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
 
             try
             {
+                var configuration = configurationBuilder.Build();
                 var foundBranch = OrderedBranches(configuration).ElementAt(parsed - 1);
                 var branchConfiguration = foundBranch.Value;
                 if (branchConfiguration is null)
                 {
                     branchConfiguration = new BranchConfiguration();
-                    configuration.Branches.Add(foundBranch.Key, branchConfiguration);
+                    configurationBuilder.WithBranch(foundBranch.Key, builder => builder.WithConfiguration(branchConfiguration));
                 }
                 steps.Enqueue(this.StepFactory.CreateStep<ConfigureBranch>().WithData(foundBranch.Key, branchConfiguration));
                 return StepResult.Ok();
@@ -38,10 +39,14 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.InvalidResponseSelected();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => @"Which branch would you like to configure:
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory)
+    {
+        var configuration = configurationBuilder.Build();
+        return @"Which branch would you like to configure:
 
 0) Go Back
 " + string.Join(System.Environment.NewLine, OrderedBranches(configuration).Select((c, i) => $"{i + 1}) {c.Key}"));
+    }
 
     private static IOrderedEnumerable<KeyValuePair<string, BranchConfiguration>> OrderedBranches(GitVersionConfiguration configuration)
     {

src/GitVersion.Core/Configuration/Init/SetConfig/GlobalModeSetting.cs

@@ -4,7 +4,7 @@
 
 namespace GitVersion.Configuration.Init.SetConfig;
 
-public class GlobalModeSetting : ConfigInitWizardStep
+internal class GlobalModeSetting : ConfigInitWizardStep
 {
     private ConfigInitWizardStep returnToStep;
     private bool isPartOfWizard;
@@ -20,20 +20,20 @@ public GlobalModeSetting WithData(ConfigInitWizardStep returnStep, bool isPartOf
         return this;
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         switch (result)
         {
             case "1":
-                configuration.VersioningMode = VersioningMode.ContinuousDelivery;
+                configurationBuilder.WithVersioningMode(VersioningMode.ContinuousDelivery);
                 steps.Enqueue(this.returnToStep);
                 return StepResult.Ok();
             case "2":
-                configuration.VersioningMode = VersioningMode.ContinuousDeployment;
+                configurationBuilder.WithVersioningMode(VersioningMode.ContinuousDeployment);
                 steps.Enqueue(this.returnToStep);
                 return StepResult.Ok();
             case "3":
-                configuration.VersioningMode = VersioningMode.Mainline;
+                configurationBuilder.WithVersioningMode(VersioningMode.Mainline);
                 steps.Enqueue(this.returnToStep);
                 return StepResult.Ok();
             case "0":
@@ -45,7 +45,7 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.InvalidResponseSelected();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => $@"What do you want the default increment mode to be (can be override per branch):
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => $@"What do you want the default increment mode to be (can be override per branch):
 {(!this.isPartOfWizard ? "0) Go Back" : string.Empty)}
 1) Follow SemVer and only increment when a release has been tagged (continuous delivery mode)
 2) Increment based on branch configuration every commit (continuous deployment mode)

src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchIncrementMode.cs

@@ -4,7 +4,7 @@
 
 namespace GitVersion.Configuration.Init.SetConfig;
 
-public class SetBranchIncrementMode : ConfigInitWizardStep
+internal class SetBranchIncrementMode : ConfigInitWizardStep
 {
     private string name;
     private BranchConfiguration branchConfiguration;
@@ -20,7 +20,7 @@ public SetBranchIncrementMode WithData(string configName, BranchConfiguration co
         return this;
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         var configureBranchStep = this.StepFactory.CreateStep<ConfigureBranch>();
         switch (result)
@@ -41,7 +41,7 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         return StepResult.InvalidResponseSelected();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => $@"What do you want the increment mode for {this.name} to be?
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => $@"What do you want the increment mode for {this.name} to be?
 
 0) Go Back
 1) Follow SemVer and only increment when a release has been tagged (continuous delivery mode)

src/GitVersion.Core/Configuration/Init/SetConfig/SetBranchTag.cs

@@ -4,7 +4,7 @@
 
 namespace GitVersion.Configuration.Init.SetConfig;
 
-public class SetBranchTag : ConfigInitWizardStep
+internal class SetBranchTag : ConfigInitWizardStep
 {
     private string name;
     private BranchConfiguration branchConfiguration;
@@ -20,7 +20,7 @@ public SetBranchTag WithData(string configName, BranchConfiguration configuratio
         return this;
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         if (result.IsNullOrWhiteSpace())
         {
@@ -44,7 +44,7 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
         }
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => @"This sets the per-release tag which will be used for versions on this branch (beta, rc etc)
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => @"This sets the per-release tag which will be used for versions on this branch (beta, rc etc)
 
 0) Go Back
 1) No tag

src/GitVersion.Core/Configuration/Init/SetNextVersion.cs

@@ -4,13 +4,13 @@
 
 namespace GitVersion.Configuration.Init;
 
-public class SetNextVersion : ConfigInitWizardStep
+internal class SetNextVersion : ConfigInitWizardStep
 {
     public SetNextVersion(IConsole console, IFileSystem fileSystem, ILog log, IConfigInitStepFactory stepFactory) : base(console, fileSystem, log, stepFactory)
     {
     }
 
-    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, GitVersionConfiguration configuration, string workingDirectory)
+    protected override StepResult HandleResult(string? result, Queue<ConfigInitWizardStep> steps, ConfigurationBuilder configurationBuilder, string workingDirectory)
     {
         var editConfigStep = this.StepFactory.CreateStep<EditConfigStep>();
         if (result.IsNullOrEmpty())
@@ -19,15 +19,16 @@ protected override StepResult HandleResult(string? result, Queue<ConfigInitWizar
             return StepResult.Ok();
         }
 
+        var configuration = configurationBuilder.Build();
         if (!SemanticVersion.TryParse(result, string.Empty, out var semVer, configuration.SemanticVersionFormat))
             return StepResult.InvalidResponseSelected();
 
-        configuration.NextVersion = semVer.ToString("t");
+        configurationBuilder.WithNextVersion(semVer.ToString("t"));
         steps.Enqueue(editConfigStep);
         return StepResult.Ok();
     }
 
-    protected override string GetPrompt(GitVersionConfiguration configuration, string workingDirectory) => "What would you like to set the next version to (enter nothing to cancel)?";
+    protected override string GetPrompt(ConfigurationBuilder configurationBuilder, string workingDirectory) => "What would you like to set the next version to (enter nothing to cancel)?";
 
     protected override string? DefaultResult => null;
 }

src/GitVersion.Core/Configuration/Init/Wizard/ConfigInitWizard.cs

@@ -14,21 +14,22 @@ public ConfigInitWizard(IConsole console, IConfigInitStepFactory stepFactory)
         this.stepFactory = stepFactory.NotNull();
     }
 
-    public GitVersionConfiguration? Run(GitVersionConfiguration configuration, string workingDirectory)
+    public IGitVersionConfiguration? Run(IGitVersionConfiguration configuration, string workingDirectory)
     {
         this.console.WriteLine("GitVersion init will guide you through setting GitVersion up to work for you");
         var steps = new Queue<ConfigInitWizardStep>();
         steps.Enqueue(this.stepFactory.CreateStep<EditConfigStep>());
 
+        var configurationBuilder = ConfigurationBuilder.New.WithConfiguration((GitVersionConfiguration)configuration);
         while (steps.Count > 0)
         {
             var currentStep = steps.Dequeue();
-            if (!currentStep.Apply(steps, configuration, workingDirectory))
+            if (!currentStep.Apply(steps, configurationBuilder, workingDirectory))
             {
                 return null;
             }
         }
 
-        return configuration;
+        return configurationBuilder.Build();
     }
 }