Skip to content

Commit cb3d56e

Browse files
committed
Moves CliModule to SystemCommandline namespace
Relocates the CliModule to improve project structure and manage dependencies. It also adds logging at the service registration level.
1 parent c3cee98 commit cb3d56e

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

new-cli/GitVersion.Cli/CliModule.cs

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

new-cli/GitVersion.Cli/Program.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
using GitVersion;
22
using GitVersion.Extensions;
3-
using GitVersion.Generated;
43
using GitVersion.Git;
54
using GitVersion.Infrastructure;
5+
using GitVersion.SystemCommandline;
66

77
var modules = new IGitVersionModule[]
88
{
99
new CoreModule(),
1010
new LibGit2SharpCoreModule(),
11-
new CommandsModule(),
1211
new CliModule()
1312
};
1413

@@ -18,15 +17,15 @@
1817
using var serviceProvider = RegisterModules(modules);
1918
var app = serviceProvider.GetRequiredService<IGitVersionAppRunner>();
2019

21-
var result = 0;
22-
result = await app.RunAsync(args, cts.Token).ConfigureAwait(false);
20+
var result = await app.RunAsync(args, cts.Token).ConfigureAwait(false);
2321
if (!Console.IsInputRedirected) Console.ReadKey();
2422
return result;
2523

2624
static IContainer RegisterModules(IEnumerable<IGitVersionModule> gitVersionModules)
2725
{
2826
var serviceProvider = new ContainerRegistrar()
2927
.RegisterModules(gitVersionModules)
28+
.AddLogging()
3029
.Build();
3130

3231
return serviceProvider;
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using GitVersion.Extensions;
2+
using GitVersion.Generated;
3+
using GitVersion.Infrastructure;
4+
5+
namespace GitVersion.SystemCommandline;
6+
7+
public class CliModule : IGitVersionModule
8+
{
9+
public void RegisterTypes(IContainerRegistrar services)
10+
{
11+
services.RegisterModule(new CommandsModule());
12+
services.AddSingleton<IGitVersionAppRunner, GitVersionAppRunner>();
13+
}
14+
}

0 commit comments

Comments
 (0)