use primary constructors - GitVersion.App

Author: arturcic

src/GitVersion.App/ArgumentParser.cs

@@ -6,23 +6,17 @@
 
 namespace GitVersion;
 
-internal class ArgumentParser : IArgumentParser
+internal class ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
+    : IArgumentParser
 {
-    private readonly IEnvironment environment;
-    private readonly ICurrentBuildAgent buildAgent;
-    private readonly IConsole console;
-    private readonly IGlobbingResolver globbingResolver;
+    private readonly IEnvironment environment = environment.NotNull();
+    private readonly ICurrentBuildAgent buildAgent = buildAgent.NotNull();
+    private readonly IConsole console = console.NotNull();
+    private readonly IGlobbingResolver globbingResolver = globbingResolver.NotNull();
+
     private const string defaultOutputFileName = "GitVersion.json";
     private static readonly IEnumerable<string> availableVariables = GitVersionVariables.AvailableVariables;
 
-    public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
-    {
-        this.environment = environment.NotNull();
-        this.console = console.NotNull();
-        this.globbingResolver = globbingResolver.NotNull();
-        this.buildAgent = buildAgent.NotNull();
-    }
-
     public Arguments ParseArguments(string commandLineArguments)
     {
         var arguments = QuotedStringHelpers.SplitUnquoted(commandLineArguments, ' ');

src/GitVersion.App/GitVersionApp.cs

@@ -5,20 +5,14 @@
 
 namespace GitVersion;
 
-internal class GitVersionApp : IHostedService
+internal class GitVersionApp(ILog log, IHostApplicationLifetime applicationLifetime, IGitVersionExecutor gitVersionExecutor, IOptions<GitVersionOptions> options)
+    : IHostedService
 {
-    private readonly IHostApplicationLifetime applicationLifetime;
-    private readonly IGitVersionExecutor gitVersionExecutor;
-    private readonly ILog log;
-    private readonly IOptions<GitVersionOptions> options;
+    private readonly ILog log = log.NotNull();
+    private readonly IHostApplicationLifetime applicationLifetime = applicationLifetime.NotNull();
+    private readonly IGitVersionExecutor gitVersionExecutor = gitVersionExecutor.NotNull();
+    private readonly IOptions<GitVersionOptions> options = options.NotNull();
 
-    public GitVersionApp(IHostApplicationLifetime applicationLifetime, IGitVersionExecutor gitVersionExecutor, ILog log, IOptions<GitVersionOptions> options)
-    {
-        this.options = options.NotNull();
-        this.applicationLifetime = applicationLifetime.NotNull();
-        this.gitVersionExecutor = gitVersionExecutor.NotNull();
-        this.log = log.NotNull();
-    }
     public Task StartAsync(CancellationToken cancellationToken)
     {
         try

src/GitVersion.App/GitVersionExecutor.cs

@@ -5,35 +5,27 @@
 
 namespace GitVersion;
 
-internal class GitVersionExecutor : IGitVersionExecutor
+internal class GitVersionExecutor(
+    ILog log,
+    IConsole console,
+    IConfigurationFileLocator configurationFileLocator,
+    IConfigurationProvider configurationProvider,
+    IGitVersionCalculateTool gitVersionCalculateTool,
+    IGitVersionOutputTool gitVersionOutputTool,
+    IVersionWriter versionWriter,
+    IHelpWriter helpWriter,
+    IGitRepositoryInfo repositoryInfo)
+    : IGitVersionExecutor
 {
-    private readonly ILog log;
-    private readonly IConsole console;
-    private readonly IConfigurationFileLocator configurationFileLocator;
-    private readonly IConfigurationProvider configurationProvider;
-    private readonly IGitVersionCalculateTool gitVersionCalculateTool;
-    private readonly IGitVersionOutputTool gitVersionOutputTool;
-    private readonly IVersionWriter versionWriter;
-    private readonly IHelpWriter helpWriter;
-    private readonly IGitRepositoryInfo repositoryInfo;
-
-    public GitVersionExecutor(ILog log, IConsole console,
-        IConfigurationFileLocator configurationFileLocator, IConfigurationProvider configurationProvider,
-        IGitVersionCalculateTool gitVersionCalculateTool, IGitVersionOutputTool gitVersionOutputTool,
-        IVersionWriter versionWriter, IHelpWriter helpWriter, IGitRepositoryInfo repositoryInfo)
-    {
-        this.log = log.NotNull();
-        this.console = console.NotNull();
-        this.configurationFileLocator = configurationFileLocator.NotNull();
-        this.configurationProvider = configurationProvider.NotNull();
-
-        this.gitVersionCalculateTool = gitVersionCalculateTool.NotNull();
-        this.gitVersionOutputTool = gitVersionOutputTool.NotNull();
-
-        this.versionWriter = versionWriter.NotNull();
-        this.helpWriter = helpWriter.NotNull();
-        this.repositoryInfo = repositoryInfo.NotNull();
-    }
+    private readonly ILog log = log.NotNull();
+    private readonly IConsole console = console.NotNull();
+    private readonly IConfigurationFileLocator configurationFileLocator = configurationFileLocator.NotNull();
+    private readonly IConfigurationProvider configurationProvider = configurationProvider.NotNull();
+    private readonly IGitVersionCalculateTool gitVersionCalculateTool = gitVersionCalculateTool.NotNull();
+    private readonly IGitVersionOutputTool gitVersionOutputTool = gitVersionOutputTool.NotNull();
+    private readonly IVersionWriter versionWriter = versionWriter.NotNull();
+    private readonly IHelpWriter helpWriter = helpWriter.NotNull();
+    private readonly IGitRepositoryInfo repositoryInfo = repositoryInfo.NotNull();
 
     public int Execute(GitVersionOptions gitVersionOptions)
     {

src/GitVersion.App/HelpWriter.cs

@@ -4,16 +4,10 @@
 
 namespace GitVersion;
 
-internal class HelpWriter : IHelpWriter
+internal class HelpWriter(IVersionWriter versionWriter, IConsole console) : IHelpWriter
 {
-    private readonly IVersionWriter versionWriter;
-    private readonly IConsole console;
-
-    public HelpWriter(IVersionWriter versionWriter, IConsole console)
-    {
-        this.versionWriter = versionWriter.NotNull();
-        this.console = console.NotNull();
-    }
+    private readonly IVersionWriter versionWriter = versionWriter.NotNull();
+    private readonly IConsole console = console.NotNull();
 
     public void Write() => WriteTo(this.console.WriteLine);
 

src/GitVersion.App/VersionWriter.cs

@@ -3,11 +3,10 @@
 
 namespace GitVersion;
 
-internal class VersionWriter : IVersionWriter
+internal class VersionWriter(IConsole console) : IVersionWriter
 {
-    private readonly IConsole console;
+    private readonly IConsole console = console.NotNull();
 
-    public VersionWriter(IConsole console) => this.console = console.NotNull();
     public void Write(Assembly assembly) => WriteTo(assembly, this.console.WriteLine);
 
     public void WriteTo(Assembly assembly, Action<string?> writeAction)