cleanup

Author: arturcic

src/GitVersion.Configuration/ConfigurationSerializer.cs

@@ -34,7 +34,7 @@ public override IEnumerable<IPropertyDescriptor> GetProperties(Type type, object
                 {
                     var descriptor = new PropertyDescriptor(p);
                     var member = p.GetCustomAttribute<JsonPropertyNameAttribute>();
-                    if (member is { Name: not null })
+                    if (member is not null)
                     {
                         descriptor.Name = member.Name;
                     }

src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs

@@ -227,7 +227,7 @@ public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlyS
         branch.ShouldNotBeNull();
 
         var configuration = GitFlowConfigurationBuilder.New.Build();
-        var branchedCommit = gitRepoMetadataProvider.FindCommitBranchBranchedFrom(branch, configuration, []);
+        var branchedCommit = gitRepoMetadataProvider.FindCommitBranchBranchedFrom(branch, configuration);
         branchedCommit.ShouldBe(BranchCommit.Empty);
 
         var branchedCommits = gitRepoMetadataProvider.FindCommitBranchesBranchedFrom(branch, configuration).ToArray();

src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/BaseVersionOperator.cs

@@ -21,17 +21,14 @@ public override string ToString()
         StringBuilder stringBuilder = new();
 
         stringBuilder.Append($"{Source}: ");
-        if (ForceIncrement)
-            stringBuilder.Append("Force version increment ");
-        else
-        {
-            stringBuilder.Append("Version increment ");
-        }
+        stringBuilder.Append(ForceIncrement ? "Force version increment " : "Version increment ");
 
         stringBuilder.Append($"+semver '{Increment}'");
 
         if (Label is null)
+        {
             stringBuilder.Append(" with no label");
+        }
         else
         {
             stringBuilder.Append($" with label '{Label}'");

src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs

@@ -44,7 +44,7 @@ public void ShouldCreateFile(string fileExtension)
         var variables = variableProvider.GetVariablesFor(semanticVersion, EmptyConfigurationBuilder.New.Build(), 0);
         using var generator = sp.GetRequiredService<IGitVersionInfoGenerator>();
 
-        generator.Execute(variables, new(directory, fileName, fileExtension));
+        generator.Execute(variables, new(directory, fileName));
 
         fileSystem.File.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension)));
 
@@ -85,7 +85,7 @@ public void ShouldProperlyOutputNamespaceDeclaration(string fileExtension)
         var variables = variableProvider.GetVariablesFor(semanticVersion, EmptyConfigurationBuilder.New.Build(), 0);
         using var generator = sp.GetRequiredService<IGitVersionInfoGenerator>();
 
-        generator.Execute(variables, new(directory, fileName, fileExtension, targetNamespace));
+        generator.Execute(variables, new(directory, fileName, targetNamespace));
 
         fileSystem.File.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(FileSystemHelper.Path.Combine("Approved", fileExtension)));
 

src/GitVersion.Output/GitVersionInfo/GitVersionInfoContext.cs

@@ -3,12 +3,5 @@ namespace GitVersion.Output.GitVersionInfo;
 internal readonly record struct GitVersionInfoContext(
     string WorkingDirectory,
     string FileName,
-    string FileExtension,
     string? TargetNamespace = null)
-    : IConverterContext
-{
-    public GitVersionInfoContext(string workingDirectory, string fileName, string fileExtension)
-        : this(workingDirectory, fileName, fileExtension, null)
-    {
-    }
-}
+    : IConverterContext;

src/GitVersion.Output/GitVersionOutputTool.cs

@@ -67,7 +67,7 @@ public void GenerateGitVersionInformation(GitVersionVariables variables, FileWri
     {
         using (this.gitVersionInfoGenerator)
         {
-            this.gitVersionInfoGenerator.Execute(variables, new GitVersionInfoContext(gitVersionOptions.WorkingDirectory, fileWriteInfo.FileName, fileWriteInfo.FileExtension, targetNamespace));
+            this.gitVersionInfoGenerator.Execute(variables, new GitVersionInfoContext(gitVersionOptions.WorkingDirectory, fileWriteInfo.FileName, targetNamespace));
         }
     }
 }

src/GitVersion.Output/TemplateManager.cs

@@ -16,7 +16,7 @@ internal class TemplateManager(TemplateType templateType)
 
     public string? GetTemplateFor(string? fileExtension)
     {
-        ArgumentNullException.ThrowIfNull(fileExtension);
+        ArgumentNullException.ThrowIfNull(fileExtension, nameof(fileExtension));
 
         string? result = null;
 
@@ -30,7 +30,7 @@ internal class TemplateManager(TemplateType templateType)
 
     public string? GetAddFormatFor(string? fileExtension)
     {
-        ArgumentNullException.ThrowIfNull(fileExtension);
+        ArgumentNullException.ThrowIfNull(fileExtension, nameof(fileExtension));
 
         string? result = null;