use primary constructors - GitVersion.MsBuild

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

@@ -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

@@ -57,7 +57,7 @@ private static async Task VerifyTagCheckoutVersionIsCalculatedProperly(Dictionar
         }
 
         var programFixture = new ProgramFixture(fixture.RepositoryPath);
-        programFixture.WithEnv(env.ToArray());
+        programFixture.WithEnv([.. env]);
 
         var result = await programFixture.Run();
 

src/GitVersion.App/QuotedStringHelpers.cs

@@ -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();
     }

src/GitVersion.Core.Tests/Helpers/DirectoryHelper.cs

@@ -24,7 +24,7 @@ public static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo targ
         }
     }
 
-    private static string Rename(string name) => ToRename.TryGetValue(name, out var value) ? value : name;
+    private static string Rename(string name) => ToRename.GetValueOrDefault(name, name);
 
     public static void DeleteSubDirectories(string parentPath)
     {

src/GitVersion.Core.Tests/Helpers/TestConsoleAdapter.cs

@@ -2,17 +2,15 @@
 
 namespace GitVersion.Core.Tests.Helpers;
 
-public class TestConsoleAdapter : IConsole
+public class TestConsoleAdapter(StringBuilder sb) : IConsole
 {
-    private readonly StringBuilder sb;
-    public TestConsoleAdapter(StringBuilder sb) => this.sb = sb;
-    public void WriteLine(string? msg) => this.sb.AppendLine(msg);
+    public void WriteLine(string? msg) => sb.AppendLine(msg);
 
-    public void WriteLine() => this.sb.AppendLine();
+    public void WriteLine() => sb.AppendLine();
 
-    public void Write(string? msg) => this.sb.Append(msg);
+    public void Write(string? msg) => sb.Append(msg);
 
-    public override string ToString() => this.sb.ToString();
+    public override string ToString() => sb.ToString();
 
     public string ReadLine() => throw new NotImplementedException();
 

src/GitVersion.Core.Tests/Helpers/TestEnvironment.cs

@@ -2,9 +2,7 @@ namespace GitVersion.Core.Tests.Helpers;
 
 public class TestEnvironment : IEnvironment
 {
-    private readonly IDictionary<string, string?> map;
-
-    public TestEnvironment() => this.map = new Dictionary<string, string?>();
+    private readonly IDictionary<string, string?> map = new Dictionary<string, string?>();
 
     public string? GetEnvironmentVariable(string variableName) => this.map.TryGetValue(variableName, out var val) ? val : null;
 

src/GitVersion.Core.Tests/Helpers/TestLogAppender.cs

@@ -2,10 +2,7 @@
 
 namespace GitVersion.Core.Tests.Helpers;
 
-public class TestLogAppender : ILogAppender
+public class TestLogAppender(Action<string> logAction) : ILogAppender
 {
-    private readonly Action<string> logAction;
-
-    public TestLogAppender(Action<string> logAction) => this.logAction = logAction;
-    public void WriteTo(LogLevel level, string message) => this.logAction(message);
+    public void WriteTo(LogLevel level, string message) => logAction(message);
 }