ConfigInitSteps, made constructor with the same parameters

src/GitVersionCore/Configuration/Init/BuildServer/AppVeyorSetup.cs

@@ -15,11 +15,16 @@ internal enum ProjectVisibility
 
     internal class AppVeyorSetup : ConfigInitWizardStep
     {
-        private readonly ProjectVisibility _projectVisibility;
+        private ProjectVisibility _projectVisibility;
 
-        public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log, ProjectVisibility visibility) : base(console, fileSystem, log)
+        public AppVeyorSetup(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
+        {
+        }
+
+        public AppVeyorSetup WithData(ProjectVisibility visibility)
         {
             _projectVisibility = visibility;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)

src/GitVersionCore/Configuration/Init/BuildServer/AppveyorPublicPrivate.cs

@@ -18,10 +18,10 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     steps.Enqueue(new EditConfigStep(Console, FileSystem, Log));
                     return StepResult.Ok();
                 case "1":
-                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log, ProjectVisibility.Public));
+                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log).WithData(ProjectVisibility.Public));
                     return StepResult.Ok();
                 case "2":
-                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log, ProjectVisibility.Private));
+                    steps.Enqueue(new AppVeyorSetup(Console, FileSystem, Log).WithData(ProjectVisibility.Private));
                     return StepResult.Ok();
             }
             return StepResult.Ok();

src/GitVersionCore/Configuration/Init/EditConfigStep.cs

@@ -33,7 +33,8 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     steps.Enqueue(new ConfigureBranches(Console, FileSystem, Log));
                     return StepResult.Ok();
                 case "5":
-                    steps.Enqueue(new GlobalModeSetting(new EditConfigStep(Console, FileSystem, Log), false, Console, FileSystem, Log));
+                    var editConfigStep = new EditConfigStep(Console, FileSystem, Log);
+                    steps.Enqueue(new GlobalModeSetting(Console, FileSystem, Log).WithData(editConfigStep, false));
                     return StepResult.Ok();
                 case "6":
                     steps.Enqueue(new AssemblyVersioningSchemeSetting(Console, FileSystem, Log));

src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs

@@ -6,14 +6,18 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class ConfigureBranch : ConfigInitWizardStep
     {
-        private readonly string name;
-        private readonly BranchConfig branchConfig;
+        private string name;
+        private BranchConfig branchConfig;
 
-        public ConfigureBranch(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log) 
-            : base(console, fileSystem, log)
+        public ConfigureBranch(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.branchConfig = branchConfig;
-            this.name = name;
+        }
+
+        public ConfigureBranch WithData(string _name, BranchConfig _branchConfig)
+        {
+            branchConfig = _branchConfig;
+            name = _name;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
@@ -24,10 +28,10 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     steps.Enqueue(new ConfigureBranches(Console, FileSystem, Log));
                     return StepResult.Ok();
                 case "1":
-                    steps.Enqueue(new SetBranchTag(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new SetBranchTag(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 case "2":
-                    steps.Enqueue(new SetBranchIncrementMode(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new SetBranchIncrementMode(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
             }
 

src/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranches.cs

@@ -31,7 +31,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                         branchConfig = new BranchConfig {Name = foundBranch.Key};
                         config.Branches.Add(foundBranch.Key, branchConfig);
                     }
-                    steps.Enqueue(new ConfigureBranch(foundBranch.Key, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(foundBranch.Key, branchConfig));
                     return StepResult.Ok();
                 }
                 catch (ArgumentOutOfRangeException)

src/GitVersionCore/Configuration/Init/SetConfig/GlobalModeSetting.cs

@@ -7,14 +7,18 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class GlobalModeSetting : ConfigInitWizardStep
     {
-        private readonly ConfigInitWizardStep returnToStep;
-        private readonly bool isPartOfWizard;
+        private ConfigInitWizardStep returnToStep;
+        private bool isPartOfWizard;
 
-        public GlobalModeSetting(ConfigInitWizardStep returnToStep, bool isPartOfWizard, IConsole console, IFileSystem fileSystem, ILog log)
-            : base(console, fileSystem, log)
+        public GlobalModeSetting(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.returnToStep = returnToStep;
-            this.isPartOfWizard = isPartOfWizard;
+        }
+
+        public GlobalModeSetting WithData(ConfigInitWizardStep _returnToStep, bool _isPartOfWizard)
+        {
+            returnToStep = _returnToStep;
+            isPartOfWizard = _isPartOfWizard;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)

src/GitVersionCore/Configuration/Init/SetConfig/SetBranchIncrementMode.cs

@@ -7,30 +7,34 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class SetBranchIncrementMode : ConfigInitWizardStep
     {
-        private readonly string name;
-        private readonly BranchConfig branchConfig;
+        private string name;
+        private BranchConfig branchConfig;
 
-        public SetBranchIncrementMode(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log)
-            : base(console, fileSystem, log)
+        public SetBranchIncrementMode(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.name = name;
-            this.branchConfig = branchConfig;
+        }
+
+        public SetBranchIncrementMode WithData(string _name, BranchConfig _branchConfig)
+        {
+            branchConfig = _branchConfig;
+            name = _name;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
         {
             switch (result)
             {
                 case "0":
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 case "1":
                     branchConfig.VersioningMode = VersioningMode.ContinuousDelivery;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 case "2":
                     branchConfig.VersioningMode = VersioningMode.ContinuousDeployment;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
             }
 

src/GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs

@@ -6,14 +6,18 @@ namespace GitVersion.Configuration.Init.SetConfig
 {
     public class SetBranchTag : ConfigInitWizardStep
     {
-        private readonly string name;
-        private readonly BranchConfig branchConfig;
+        private string name;
+        private BranchConfig branchConfig;
 
-        public SetBranchTag(string name, BranchConfig branchConfig, IConsole console, IFileSystem fileSystem, ILog log)
-            : base(console, fileSystem, log)
+        public SetBranchTag(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
-            this.name = name;
-            this.branchConfig = branchConfig;
+        }
+
+        public SetBranchTag WithData(string _name, BranchConfig _branchConfig)
+        {
+            branchConfig = _branchConfig;
+            name = _name;
+            return this;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
@@ -26,15 +30,15 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
             switch (result)
             {
                 case "0":
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData( name, branchConfig));
                     return StepResult.Ok();
                 case "1":
                     branchConfig.Tag = string.Empty;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
                 default:
                     branchConfig.Tag = result;
-                    steps.Enqueue(new ConfigureBranch(name, branchConfig, Console, FileSystem, Log));
+                    steps.Enqueue(new ConfigureBranch(Console, FileSystem, Log).WithData(name, branchConfig));
                     return StepResult.Ok();
             }
         }

src/GitVersionCore/Configuration/Init/Wizard/GitFlowSetupStep.cs

@@ -5,7 +5,7 @@ namespace GitVersion.Configuration.Init.Wizard
 {
     public class GitFlowSetupStep : GlobalModeSetting
     {
-        public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log) : base(new FinishedSetupStep(console, fileSystem, log), true, console, fileSystem, log)
+        public GitFlowSetupStep(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
         }
 

src/GitVersionCore/Configuration/Init/Wizard/GitHubFlowStep.cs

@@ -5,7 +5,7 @@ namespace GitVersion.Configuration.Init.Wizard
 {
     public class GitHubFlowStep : GlobalModeSetting
     {
-        public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log) : base(new FinishedSetupStep(console, fileSystem, log), true, console, fileSystem, log)
+        public GitHubFlowStep(IConsole console, IFileSystem fileSystem, ILog log) : base(console, fileSystem, log)
         {
         }
 

src/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategyStep.cs

@@ -11,13 +11,14 @@ public PickBranchingStrategyStep(IConsole console, IFileSystem fileSystem, ILog
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config, string workingDirectory)
         {
+            var returnToStep = new FinishedSetupStep(Console, FileSystem, Log);
             switch (result)
             {
                 case "1":
-                    steps.Enqueue(new GitFlowSetupStep(Console, FileSystem, Log));
+                    steps.Enqueue(new GitFlowSetupStep(Console, FileSystem, Log).WithData(returnToStep, true));
                     break;
                 case "2":
-                    steps.Enqueue(new GitHubFlowStep(Console, FileSystem, Log));
+                    steps.Enqueue(new GitHubFlowStep(Console, FileSystem, Log).WithData(returnToStep, true));
                     break;
                 case "3":
                     steps.Enqueue(new PickBranchingStrategy1Step(Console, FileSystem, Log));