Skip to content

Commit 1299578

Browse files
JakeGinnivanJakeGinnivan
committed
Organised init classes a bit
1 parent e5e9abb commit 1299578

20 files changed

+50
-40
lines changed

‎GitVersionCore/Configuration/ConfigurationProvider.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ namespace GitVersion
22
{
33
using System.IO;
44
using System.Text;
5+
using GitVersion.Configuration.Init.Wizard;
56
using GitVersion.Helpers;
67

78
public class ConfigurationProvider

‎GitVersionCore/Configuration/Wizard/EditConfigStep.cs renamed to ‎GitVersionCore/Configuration/Init/EditConfigStep.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init
22
{
33
using System.Collections.Generic;
4-
using GitVersion.Configuration.Wizard.SetConfig;
4+
using GitVersion.Configuration.Init.SetConfig;
5+
using GitVersion.Configuration.Init.Wizard;
56

67
public class EditConfigStep : ConfigInitWizardStep
78
{

‎GitVersionCore/Configuration/Wizard/AssemblyVersioningSchemeSetting.cs renamed to ‎GitVersionCore/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.SetConfig
22
{
33
using System.Collections.Generic;
4+
using GitVersion.Configuration.Init.Wizard;
45

56
public class AssemblyVersioningSchemeSetting : ConfigInitWizardStep
67
{

‎GitVersionCore/Configuration/Wizard/ConfigureBranch.cs renamed to ‎GitVersionCore/Configuration/Init/SetConfig/ConfigureBranch.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.SetConfig
22
{
33
using System.Collections.Generic;
4+
using GitVersion.Configuration.Init.Wizard;
45

56
public class ConfigureBranch : ConfigInitWizardStep
67
{

‎GitVersionCore/Configuration/Wizard/ConfigureBranches.cs renamed to ‎GitVersionCore/Configuration/Init/SetConfig/ConfigureBranches.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.SetConfig
22
{
33
using System;
44
using System.Collections.Generic;
55
using System.Linq;
6+
using GitVersion.Configuration.Init.Wizard;
67

78
public class ConfigureBranches : ConfigInitWizardStep
89
{

‎GitVersionCore/Configuration/Wizard/SetConfig/GlobalModeSetting.cs renamed to ‎GitVersionCore/Configuration/Init/SetConfig/GlobalModeSetting.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
namespace GitVersion.Configuration.Wizard.SetConfig
1+
namespace GitVersion.Configuration.Init.SetConfig
22
{
33
using System.Collections.Generic;
4+
using GitVersion.Configuration.Init.Wizard;
45

56
public class GlobalModeSetting : ConfigInitWizardStep
67
{

‎GitVersionCore/Configuration/Wizard/SetBranchIncrementMode.cs renamed to ‎GitVersionCore/Configuration/Init/SetConfig/SetBranchIncrementMode.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.SetConfig
22
{
33
using System.Collections.Generic;
4+
using GitVersion.Configuration.Init.Wizard;
45

56
public class SetBranchIncrementMode : ConfigInitWizardStep
67
{

‎GitVersionCore/Configuration/Wizard/SetBranchTag.cs renamed to ‎GitVersionCore/Configuration/Init/SetConfig/SetBranchTag.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.SetConfig
22
{
33
using System.Collections.Generic;
4+
using GitVersion.Configuration.Init.Wizard;
45

56
public class SetBranchTag : ConfigInitWizardStep
67
{

‎GitVersionCore/Configuration/Wizard/StepResult.cs renamed to ‎GitVersionCore/Configuration/Init/StepResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init
22
{
33
public class StepResult
44
{

‎GitVersionCore/Configuration/Wizard/ConfigInitWizard.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/ConfigInitWizard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
using System;
44
using System.Collections.Generic;

‎GitVersionCore/Configuration/Wizard/ConfigInitWizardStep.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/ConfigInitWizardStep.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
using System;
44
using System.Collections.Generic;

‎GitVersionCore/Configuration/Wizard/FinishedSetupStep.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/FinishedSetupStep.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
public class FinishedSetupStep : EditConfigStep
44
{

‎GitVersionCore/Configuration/Wizard/GitFlowSetupStep.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/GitFlowSetupStep.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
3-
using Configuration.Wizard.SetConfig;
3+
using GitVersion.Configuration.Init.SetConfig;
44

55
public class GitFlowSetupStep : GlobalModeSetting
66
{

‎GitVersionCore/Configuration/Wizard/GitHubFlowStep.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/GitHubFlowStep.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
3-
using Configuration.Wizard.SetConfig;
3+
using GitVersion.Configuration.Init.SetConfig;
44

55
public class GitHubFlowStep : GlobalModeSetting
66
{

‎GitVersionCore/Configuration/Wizard/PickBranchingStrategy1Step.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy1Step.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
using System;
44
using System.Collections.Generic;

‎GitVersionCore/Configuration/Wizard/PickBranchingStrategy2Step.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy2Step.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
using System;
44
using System.Collections.Generic;

‎GitVersionCore/Configuration/Wizard/PickBranchingStrategy3Step.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategy3Step.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
using System;
44
using System.Collections.Generic;

‎GitVersionCore/Configuration/Wizard/PickBranchingStrategyStep.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/PickBranchingStrategyStep.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
using System.Collections.Generic;
44

‎GitVersionCore/Configuration/Wizard/SimpleOrTutorialStep.cs renamed to ‎GitVersionCore/Configuration/Init/Wizard/SimpleOrTutorialStep.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion.Configuration.Init.Wizard
22
{
33
using System.Collections.Generic;
44

‎GitVersionCore/GitVersionCore.csproj

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,30 +74,30 @@
7474
<Compile Include="BuildServers\TeamCity.cs" />
7575
<Compile Include="Configuration\BranchConfig.cs" />
7676
<Compile Include="Configuration\Config.cs" />
77-
<Compile Include="Configuration\Wizard\AssemblyVersioningSchemeSetting.cs" />
78-
<Compile Include="Configuration\Wizard\ConfigInitWizard.cs" />
77+
<Compile Include="Configuration\Init\SetConfig\AssemblyVersioningSchemeSetting.cs" />
78+
<Compile Include="Configuration\Init\Wizard\ConfigInitWizard.cs" />
7979
<Compile Include="Configuration\ConfigSerialiser.cs" />
8080
<Compile Include="Configuration\ConfigurationProvider.cs" />
8181
<Compile Include="Configuration\IncrementStrategy.cs" />
8282
<Compile Include="Configuration\LegacyConfig.cs" />
8383
<Compile Include="Configuration\LegacyConfigNotifier.cs" />
8484
<Compile Include="Configuration\OldConfigurationException.cs" />
85-
<Compile Include="Configuration\Wizard\ConfigInitWizardStep.cs" />
86-
<Compile Include="Configuration\Wizard\ConfigureBranch.cs" />
87-
<Compile Include="Configuration\Wizard\ConfigureBranches.cs" />
88-
<Compile Include="Configuration\Wizard\EditConfigStep.cs" />
89-
<Compile Include="Configuration\Wizard\FinishedSetupStep.cs" />
90-
<Compile Include="Configuration\Wizard\GitFlowSetupStep.cs" />
91-
<Compile Include="Configuration\Wizard\GitHubFlowStep.cs" />
92-
<Compile Include="Configuration\Wizard\PickBranchingStrategy2Step.cs" />
93-
<Compile Include="Configuration\Wizard\PickBranchingStrategy3Step.cs" />
94-
<Compile Include="Configuration\Wizard\PickBranchingStrategy1Step.cs" />
95-
<Compile Include="Configuration\Wizard\SetBranchIncrementMode.cs" />
96-
<Compile Include="Configuration\Wizard\SetBranchTag.cs" />
97-
<Compile Include="Configuration\Wizard\SetConfig\GlobalModeSetting.cs" />
98-
<Compile Include="Configuration\Wizard\SimpleOrTutorialStep.cs" />
99-
<Compile Include="Configuration\Wizard\PickBranchingStrategyStep.cs" />
100-
<Compile Include="Configuration\Wizard\StepResult.cs" />
85+
<Compile Include="Configuration\Init\Wizard\ConfigInitWizardStep.cs" />
86+
<Compile Include="Configuration\Init\SetConfig\ConfigureBranch.cs" />
87+
<Compile Include="Configuration\Init\SetConfig\ConfigureBranches.cs" />
88+
<Compile Include="Configuration\Init\EditConfigStep.cs" />
89+
<Compile Include="Configuration\Init\Wizard\FinishedSetupStep.cs" />
90+
<Compile Include="Configuration\Init\Wizard\GitFlowSetupStep.cs" />
91+
<Compile Include="Configuration\Init\Wizard\GitHubFlowStep.cs" />
92+
<Compile Include="Configuration\Init\Wizard\PickBranchingStrategy2Step.cs" />
93+
<Compile Include="Configuration\Init\Wizard\PickBranchingStrategy3Step.cs" />
94+
<Compile Include="Configuration\Init\Wizard\PickBranchingStrategy1Step.cs" />
95+
<Compile Include="Configuration\Init\SetConfig\SetBranchIncrementMode.cs" />
96+
<Compile Include="Configuration\Init\SetConfig\SetBranchTag.cs" />
97+
<Compile Include="Configuration\Init\SetConfig\GlobalModeSetting.cs" />
98+
<Compile Include="Configuration\Init\Wizard\SimpleOrTutorialStep.cs" />
99+
<Compile Include="Configuration\Init\Wizard\PickBranchingStrategyStep.cs" />
100+
<Compile Include="Configuration\Init\StepResult.cs" />
101101
<Compile Include="EffectiveConfiguration.cs" />
102102
<Compile Include="ExecuteCore.cs" />
103103
<Compile Include="GitPreparer.cs" />
@@ -159,7 +159,9 @@
159159
</None>
160160
<None Include="packages.config" />
161161
</ItemGroup>
162-
<ItemGroup />
162+
<ItemGroup>
163+
<Folder Include="Configuration\Init\BuildServer\" />
164+
</ItemGroup>
163165
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
164166
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
165167
<PropertyGroup>

0 commit comments

Comments
 (0)