Skip to content

Commit 52e9155

Browse files
authored
Merge pull request #3899 from HHobeck/feature/Revamp-init-wizard-for-v6
[Improvement] Revamp init wizard for v6
2 parents 5a1a920 + daaa01e commit 52e9155

40 files changed

+4
-1043
lines changed

BREAKING_CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
* TrackReleaseBranches
4646
* VersionInBranchName
4747
* TrunkBased
48+
* The initialization wizard has been removed.
4849
4950
## v5.0.0
5051

src/GitVersion.App.Tests/HelpWriterTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public void AllArgsAreInHelp()
2020
var lookup = new Dictionary<string, string>
2121
{
2222
{ nameof(Arguments.TargetUrl), "/url" },
23-
{ nameof(Arguments.Init), "init" },
2423
{ nameof(Arguments.TargetBranch), "/b" },
2524
{ nameof(Arguments.LogFilePath) , "/l" },
2625
{ nameof(Arguments.OutputFile) , "/outputfile" },

src/GitVersion.App/ArgumentParser.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@ public Arguments ParseArguments(string[] commandLineArguments)
4444

4545
var firstArgument = commandLineArguments[0];
4646

47-
if (firstArgument.IsInit())
48-
{
49-
return new Arguments
50-
{
51-
TargetPath = SysEnv.CurrentDirectory,
52-
Init = true
53-
};
54-
}
55-
5647
if (firstArgument.IsHelp())
5748
{
5849
return new Arguments

src/GitVersion.App/Arguments.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ internal class Arguments
1919
public string? CommitId;
2020
public string? ClonePath;
2121

22-
public bool Init;
2322
public bool Diag;
2423
public bool IsVersion;
2524
public bool IsHelp;
@@ -86,7 +85,6 @@ public GitVersionOptions ToOptions()
8685
UpdateWixVersionFile = UpdateWixVersionFile
8786
},
8887

89-
Init = Init,
9088
Diag = Diag,
9189
IsVersion = IsVersion,
9290
IsHelp = IsHelp,

src/GitVersion.App/GitVersionExecutor.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,6 @@ private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int e
136136
this.log.Info("Working directory: " + workingDirectory);
137137
}
138138

139-
if (gitVersionOptions.Init)
140-
{
141-
this.configurationProvider.Init(workingDirectory);
142-
exitCode = 0;
143-
return true;
144-
}
145-
146139
if (gitVersionOptions.ConfigurationInfo.ShowConfiguration)
147140
{
148141
if (gitVersionOptions.RepositoryInfo.TargetUrl.IsNullOrWhiteSpace())
@@ -161,7 +154,7 @@ private bool HandleNonMainCommand(GitVersionOptions gitVersionOptions, out int e
161154

162155
private static void ConfigureLogging(GitVersionOptions gitVersionOptions, ILog log)
163156
{
164-
if (gitVersionOptions.Output.Contains(OutputType.BuildServer) || gitVersionOptions.LogFilePath == "console" || gitVersionOptions.Init)
157+
if (gitVersionOptions.Output.Contains(OutputType.BuildServer) || gitVersionOptions.LogFilePath == "console")
165158
{
166159
log.AddLogAppender(new ConsoleAppender());
167160
}

src/GitVersion.Configuration.Tests/Configuration/Init/InitScenarios.CanSetNextVersion.approved.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/GitVersion.Configuration.Tests/Configuration/Init/InitScenarios.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/GitVersion.Configuration/ConfigurationProvider.cs

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using GitVersion.Configuration.Init.Wizard;
21
using GitVersion.Configuration.SupportedWorkflows;
32
using GitVersion.Extensions;
4-
using GitVersion.Helpers;
53
using GitVersion.Logging;
64
using Microsoft.Extensions.Options;
75
using YamlDotNet.Core;
@@ -12,15 +10,13 @@ internal class ConfigurationProvider(
1210
IFileSystem fileSystem,
1311
ILog log,
1412
IConfigurationFileLocator configFileLocator,
15-
IOptions<GitVersionOptions> options,
16-
IConfigInitWizard configInitWizard)
13+
IOptions<GitVersionOptions> options)
1714
: IConfigurationProvider
1815
{
1916
private readonly IFileSystem fileSystem = fileSystem.NotNull();
2017
private readonly ILog log = log.NotNull();
2118
private readonly IConfigurationFileLocator configFileLocator = configFileLocator.NotNull();
2219
private readonly IOptions<GitVersionOptions> options = options.NotNull();
23-
private readonly IConfigInitWizard configInitWizard = configInitWizard.NotNull();
2420

2521
public IGitVersionConfiguration Provide(IReadOnlyDictionary<object, object?>? overrideConfiguration)
2622
{
@@ -33,23 +29,6 @@ public IGitVersionConfiguration Provide(IReadOnlyDictionary<object, object?>? ov
3329
: ProvideForDirectory(null, overrideConfiguration);
3430
}
3531

36-
public void Init(string workingDirectory)
37-
{
38-
var gitVersionOptions = this.options.Value;
39-
var fileName = gitVersionOptions.ConfigurationInfo.ConfigurationFile ?? ConfigurationFileLocator.DefaultFileName;
40-
var configFilePath = PathHelper.Combine(workingDirectory, fileName);
41-
var currentConfiguration = this.configFileLocator.ReadConfiguration(configFilePath);
42-
43-
var configuration = this.configInitWizard.Run(currentConfiguration, workingDirectory);
44-
if (configuration == null) return;
45-
46-
using var stream = this.fileSystem.OpenWrite(configFilePath);
47-
using var writer = new StreamWriter(stream);
48-
this.log.Info("Saving configuration file");
49-
ConfigurationSerializer.Write(configuration, writer);
50-
stream.Flush();
51-
}
52-
5332
internal IGitVersionConfiguration ProvideForDirectory(string? workingDirectory,
5433
IReadOnlyDictionary<object, object?>? overrideConfiguration = null)
5534
{

src/GitVersion.Configuration/GitVersionConfigurationModule.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using GitVersion.Configuration.Init;
2-
using GitVersion.Extensions;
31
using GitVersion.VersionCalculation.Caching;
42
using Microsoft.Extensions.DependencyInjection;
53

@@ -9,8 +7,6 @@ public class GitVersionConfigurationModule : IGitVersionModule
97
{
108
public void RegisterTypes(IServiceCollection services)
119
{
12-
services.AddModule(new GitVersionInitModule());
13-
1410
services.AddSingleton<IGitVersionCacheKeyFactory, GitVersionCacheKeyFactory>();
1511
services.AddSingleton<IConfigurationProvider, ConfigurationProvider>();
1612
services.AddSingleton<IConfigurationFileLocator, ConfigurationFileLocator>();

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

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)