Merge pull request #3878 from arturcic/main

Use C# 12 features in the codebase

Author: arturcic

src/GitVersion.App.Tests/Helpers/ExecutionResults.cs

@@ -4,18 +4,11 @@
 
 namespace GitVersion.App.Tests;
 
-public class ExecutionResults
+public class ExecutionResults(int exitCode, string? output, string? logContents = null)
 {
-    public ExecutionResults(int exitCode, string? output, string? logContents = null)
-    {
-        ExitCode = exitCode;
-        Output = output;
-        Log = logContents;
-    }
-
-    public int ExitCode { get; init; }
-    public string? Output { get; init; }
-    public string? Log { get; init; }
+    public int ExitCode { get; init; } = exitCode;
+    public string? Output { get; init; } = output;
+    public string? Log { get; init; } = logContents;
 
     public GitVersionVariables? OutputVariables
     {

src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs

@@ -71,7 +71,7 @@ private static ExecutionResults ExecuteIn(ArgumentBuilder arguments,
                 executable,
                 args,
                 arguments.WorkingDirectory,
-                environmentalVariables.ToArray());
+                [.. environmentalVariables]);
         }
         catch (Exception exception)
         {

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -22,19 +22,19 @@ public ProgramFixture(string workingDirectory = "")
         ILog log = new Log(logAppender);
 
         var consoleBuilder = new StringBuilder();
-        IConsole consoleAdapter = new TestConsoleAdapter(consoleBuilder);
+        var consoleAdapter = new TestConsoleAdapter(consoleBuilder);
 
         this.environment = new TestEnvironment();
 
         WithOverrides(services =>
         {
             services.AddSingleton(log);
-            services.AddSingleton(consoleAdapter);
+            services.AddSingleton<IConsole>(consoleAdapter);
             services.AddSingleton(this.environment);
         });
 
-        this.logger = new Lazy<string>(() => logBuilder.ToString());
-        this.output = new Lazy<string?>(() => consoleAdapter.ToString());
+        this.logger = new(() => logBuilder.ToString());
+        this.output = new(() => consoleAdapter.ToString());
     }
 
     public void WithEnv(params KeyValuePair<string, string>[] envs)
@@ -60,7 +60,7 @@ public async Task<ExecutionResults> Run(params string[] args)
 
         if (!this.workingDirectory.IsNullOrWhiteSpace())
         {
-            args = new[] { "-targetpath", this.workingDirectory }.Concat(args).ToArray();
+            args = ["-targetpath", this.workingDirectory, .. args];
         }
         await program.RunAsync(args);
 

src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs

@@ -163,7 +163,7 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu
             remoteRepository.Refs.Add(pullRequestRef, new ObjectId(mergeCommitSha));
 
             // Checkout PR commit
-            Commands.Fetch(fixture.Repository, "origin", Array.Empty<string>(), new FetchOptions(), null);
+            Commands.Fetch(fixture.Repository, "origin", [], new FetchOptions(), null);
             Commands.Checkout(fixture.Repository, mergeCommitSha);
         }
 
@@ -173,7 +173,7 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu
             services.AddModule(new GitVersionBuildAgentsModule());
             services.AddModule(new GitVersionOutputModule());
         });
-        programFixture.WithEnv(env.ToArray());
+        programFixture.WithEnv([.. env]);
 
         var result = await programFixture.Run();
 

src/GitVersion.App.Tests/TagCheckoutInBuildAgentTests.cs

@@ -52,12 +52,12 @@ private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionar
             remoteRepository.MergeNoFF("release/0.2.0", Generate.SignatureNow());
             remoteRepository.MakeATaggedCommit("0.2.0");
 
-            Commands.Fetch(fixture.Repository, "origin", Array.Empty<string>(), new FetchOptions(), null);
+            Commands.Fetch(fixture.Repository, "origin", [], new FetchOptions(), null);
             Commands.Checkout(fixture.Repository, "0.2.0");
         }
 
         var programFixture = new ProgramFixture(fixture.RepositoryPath);
-        programFixture.WithEnv(env.ToArray());
+        programFixture.WithEnv([.. env]);
 
         var result = await programFixture.Run();
 

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/QuotedStringHelpers.cs

@@ -23,7 +23,7 @@ internal static class QuotedStringHelpers
     public static string[] SplitUnquoted(string? input, char splitChar)
     {
         if (input == null)
-            return Array.Empty<string>();
+            return [];
 
         var split = new List<string>();
         bool isPreviousCharBackslash = false;
@@ -50,7 +50,7 @@ public static string[] SplitUnquoted(string? input, char splitChar)
             isPreviousCharBackslash = current == '\\';
         }
 
-        split.Add(input.Substring(startIndex, input.Length - startIndex));
+        split.Add(input[startIndex..]);
 
         return split.Where(argument => !argument.IsNullOrEmpty()).ToArray();
     }