Organised init classes a bit

JakeGinnivan · JakeGinnivan · commit 1299578e165c · 2015-06-21T11:23:34.000+01:00
diff --git a/GitVersionCore/Configuration/ConfigurationProvider.cs b/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -2,6 +2,7 @@ namespace GitVersion
 {
     using System.IO;
     using System.Text;
+    using GitVersion.Configuration.Init.Wizard;
     using GitVersion.Helpers;
 
     public class ConfigurationProvider
diff --git a/GitVersionCore/Configuration/Init/EditConfigStep.cs b/GitVersionCore/Configuration/Init/EditConfigStep.cs
@@ -1,7 +1,8 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init
 {
     using System.Collections.Generic;
-    using GitVersion.Configuration.Wizard.SetConfig;
+    using GitVersion.Configuration.Init.SetConfig;
+    using GitVersion.Configuration.Init.Wizard;
 
     public class EditConfigStep : ConfigInitWizardStep
     {
diff --git a/GitVersionCore/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs b/GitVersionCore/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
@@ -1,6 +1,7 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.SetConfig
 {
     using System.Collections.Generic;
+    using GitVersion.Configuration.Init.Wizard;
 
     public class AssemblyVersioningSchemeSetting : ConfigInitWizardStep
     {
diff --git a/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs b/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs
@@ -1,6 +1,7 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.SetConfig
 {
     using System.Collections.Generic;
+    using GitVersion.Configuration.Init.Wizard;
 
     public class ConfigureBranch : ConfigInitWizardStep
     {
diff --git a/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranches.cs b/GitVersionCore/Configuration/Init/SetConfig/ConfigureBranches.cs
@@ -1,8 +1,9 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.SetConfig
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using GitVersion.Configuration.Init.Wizard;
 
     public class ConfigureBranches : ConfigInitWizardStep
     {
diff --git a/GitVersionCore/Configuration/Init/SetConfig/GlobalModeSetting.cs b/GitVersionCore/Configuration/Init/SetConfig/GlobalModeSetting.cs
@@ -1,6 +1,7 @@
-﻿namespace GitVersion.Configuration.Wizard.SetConfig
+﻿namespace GitVersion.Configuration.Init.SetConfig
 {
     using System.Collections.Generic;
+    using GitVersion.Configuration.Init.Wizard;
 
     public class GlobalModeSetting : ConfigInitWizardStep
     {
diff --git a/GitVersionCore/Configuration/Init/SetConfig/SetBranchIncrementMode.cs b/GitVersionCore/Configuration/Init/SetConfig/SetBranchIncrementMode.cs
@@ -1,6 +1,7 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.SetConfig
 {
     using System.Collections.Generic;
+    using GitVersion.Configuration.Init.Wizard;
 
     public class SetBranchIncrementMode : ConfigInitWizardStep
     {
diff --git a/GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs b/GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs
@@ -1,6 +1,7 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.SetConfig
 {
     using System.Collections.Generic;
+    using GitVersion.Configuration.Init.Wizard;
 
     public class SetBranchTag : ConfigInitWizardStep
     {
diff --git a/GitVersionCore/Configuration/Init/StepResult.cs b/GitVersionCore/Configuration/Init/StepResult.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init
 {
     public class StepResult
     {
diff --git a/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizard.cs b/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizard.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     using System;
     using System.Collections.Generic;
diff --git a/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizardStep.cs b/GitVersionCore/Configuration/Init/Wizard/ConfigInitWizardStep.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     using System;
     using System.Collections.Generic;
diff --git a/GitVersionCore/Configuration/Init/Wizard/FinishedSetupStep.cs b/GitVersionCore/Configuration/Init/Wizard/FinishedSetupStep.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     public class FinishedSetupStep : EditConfigStep
     {
diff --git a/GitVersionCore/Configuration/Init/Wizard/GitFlowSetupStep.cs b/GitVersionCore/Configuration/Init/Wizard/GitFlowSetupStep.cs
@@ -1,6 +1,6 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
-    using Configuration.Wizard.SetConfig;
+    using GitVersion.Configuration.Init.SetConfig;
 
     public class GitFlowSetupStep : GlobalModeSetting
     {
diff --git a/GitVersionCore/Configuration/Init/Wizard/GitHubFlowStep.cs b/GitVersionCore/Configuration/Init/Wizard/GitHubFlowStep.cs
@@ -1,6 +1,6 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
-    using Configuration.Wizard.SetConfig;
+    using GitVersion.Configuration.Init.SetConfig;
 
     public class GitHubFlowStep : GlobalModeSetting
     {
diff --git a/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs b/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     using System;
     using System.Collections.Generic;
diff --git a/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs b/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     using System;
     using System.Collections.Generic;
diff --git a/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs b/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     using System;
     using System.Collections.Generic;
diff --git a/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategyStep.cs b/GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategyStep.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     using System.Collections.Generic;
 
diff --git a/GitVersionCore/Configuration/Init/Wizard/SimpleOrTutorialStep.cs b/GitVersionCore/Configuration/Init/Wizard/SimpleOrTutorialStep.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion.Configuration.Init.Wizard
 {
     using System.Collections.Generic;
 
diff --git a/GitVersionCore/GitVersionCore.csproj b/GitVersionCore/GitVersionCore.csproj
@@ -74,30 +74,30 @@
     <Compile Include="BuildServers\TeamCity.cs" />
     <Compile Include="Configuration\BranchConfig.cs" />
     <Compile Include="Configuration\Config.cs" />
-    <Compile Include="Configuration\Wizard\AssemblyVersioningSchemeSetting.cs" />
-    <Compile Include="Configuration\Wizard\ConfigInitWizard.cs" />
+    <Compile Include="Configuration\Init\SetConfig\AssemblyVersioningSchemeSetting.cs" />
+    <Compile Include="Configuration\Init\Wizard\ConfigInitWizard.cs" />
     <Compile Include="Configuration\ConfigSerialiser.cs" />
     <Compile Include="Configuration\ConfigurationProvider.cs" />
     <Compile Include="Configuration\IncrementStrategy.cs" />
     <Compile Include="Configuration\LegacyConfig.cs" />
     <Compile Include="Configuration\LegacyConfigNotifier.cs" />
     <Compile Include="Configuration\OldConfigurationException.cs" />
-    <Compile Include="Configuration\Wizard\ConfigInitWizardStep.cs" />
-    <Compile Include="Configuration\Wizard\ConfigureBranch.cs" />
-    <Compile Include="Configuration\Wizard\ConfigureBranches.cs" />
-    <Compile Include="Configuration\Wizard\EditConfigStep.cs" />
-    <Compile Include="Configuration\Wizard\FinishedSetupStep.cs" />
-    <Compile Include="Configuration\Wizard\GitFlowSetupStep.cs" />
-    <Compile Include="Configuration\Wizard\GitHubFlowStep.cs" />
-    <Compile Include="Configuration\Wizard\PickBranchingStrategy2Step.cs" />
-    <Compile Include="Configuration\Wizard\PickBranchingStrategy3Step.cs" />
-    <Compile Include="Configuration\Wizard\PickBranchingStrategy1Step.cs" />
-    <Compile Include="Configuration\Wizard\SetBranchIncrementMode.cs" />
-    <Compile Include="Configuration\Wizard\SetBranchTag.cs" />
-    <Compile Include="Configuration\Wizard\SetConfig\GlobalModeSetting.cs" />
-    <Compile Include="Configuration\Wizard\SimpleOrTutorialStep.cs" />
-    <Compile Include="Configuration\Wizard\PickBranchingStrategyStep.cs" />
-    <Compile Include="Configuration\Wizard\StepResult.cs" />
+    <Compile Include="Configuration\Init\Wizard\ConfigInitWizardStep.cs" />
+    <Compile Include="Configuration\Init\SetConfig\ConfigureBranch.cs" />
+    <Compile Include="Configuration\Init\SetConfig\ConfigureBranches.cs" />
+    <Compile Include="Configuration\Init\EditConfigStep.cs" />
+    <Compile Include="Configuration\Init\Wizard\FinishedSetupStep.cs" />
+    <Compile Include="Configuration\Init\Wizard\GitFlowSetupStep.cs" />
+    <Compile Include="Configuration\Init\Wizard\GitHubFlowStep.cs" />
+    <Compile Include="Configuration\Init\Wizard\PickBranchingStrategy2Step.cs" />
+    <Compile Include="Configuration\Init\Wizard\PickBranchingStrategy3Step.cs" />
+    <Compile Include="Configuration\Init\Wizard\PickBranchingStrategy1Step.cs" />
+    <Compile Include="Configuration\Init\SetConfig\SetBranchIncrementMode.cs" />
+    <Compile Include="Configuration\Init\SetConfig\SetBranchTag.cs" />
+    <Compile Include="Configuration\Init\SetConfig\GlobalModeSetting.cs" />
+    <Compile Include="Configuration\Init\Wizard\SimpleOrTutorialStep.cs" />
+    <Compile Include="Configuration\Init\Wizard\PickBranchingStrategyStep.cs" />
+    <Compile Include="Configuration\Init\StepResult.cs" />
     <Compile Include="EffectiveConfiguration.cs" />
     <Compile Include="ExecuteCore.cs" />
     <Compile Include="GitPreparer.cs" />
@@ -159,7 +159,9 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Configuration\Init\BuildServer\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ namespace GitVersion`
`2`	`2`	`{`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Text;`
	`5`	`+ using GitVersion.Configuration.Init.Wizard;`
`5`	`6`	`using GitVersion.Helpers;`
`6`	`7`
`7`	`8`	`public class ConfigurationProvider`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`		`-namespace GitVersion`
	`1`	`+namespace GitVersion.Configuration.Init`
`2`	`2`	`{`
`3`	`3`	`using System.Collections.Generic;`
`4`		`- using GitVersion.Configuration.Wizard.SetConfig;`
	`4`	`+ using GitVersion.Configuration.Init.SetConfig;`
	`5`	`+ using GitVersion.Configuration.Init.Wizard;`
`5`	`6`
`6`	`7`	`public class EditConfigStep : ConfigInitWizardStep`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-namespace GitVersion`
	`1`	`+namespace GitVersion.Configuration.Init.SetConfig`
`2`	`2`	`{`
`3`	`3`	`using System.Collections.Generic;`
	`4`	`+ using GitVersion.Configuration.Init.Wizard;`
`4`	`5`
`5`	`6`	`public class AssemblyVersioningSchemeSetting : ConfigInitWizardStep`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`		`-namespace GitVersion`
	`1`	`+namespace GitVersion.Configuration.Init.SetConfig`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Linq;`
	`6`	`+ using GitVersion.Configuration.Init.Wizard;`
`6`	`7`
`7`	`8`	`public class ConfigureBranches : ConfigInitWizardStep`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-namespace GitVersion.Configuration.Wizard.SetConfig`
	`1`	`+namespace GitVersion.Configuration.Init.SetConfig`
`2`	`2`	`{`
`3`	`3`	`using System.Collections.Generic;`
	`4`	`+ using GitVersion.Configuration.Init.Wizard;`
`4`	`5`
`5`	`6`	`public class GlobalModeSetting : ConfigInitWizardStep`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace GitVersion`
	`1`	`+namespace GitVersion.Configuration.Init`
`2`	`2`	`{`
`3`	`3`	`public class StepResult`
`4`	`4`	`{`