Fixed nullability warnings for benchmark project

stbychkov · stbychkov · commit 12617b23751d · 2025-01-29T09:27:21.000+08:00
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/BenchmarkFiles/CustomNullLogger.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/BenchmarkFiles/CustomNullLogger.cs
@@ -1,12 +1,11 @@
-using System;
 using Microsoft.Extensions.Logging;
 
 public class CustomNullLogger<T> : ILogger
 {
     private int _counter = 0;
     public static readonly CustomNullLogger<T> Instance = new();
 
-    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception, string> formatter)
     {
         _counter++;
     }
@@ -15,7 +14,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 
     public IDisposable BeginScope<TState>(TState state) where TState : notnull =>
         NullScope.Instance;
-    
+
     private sealed class NullScope : IDisposable
     {
         public static NullScope Instance { get; } = new();
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/BenchmarkFiles/ExecutionTimeBenchmark.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/BenchmarkFiles/ExecutionTimeBenchmark.cs
@@ -8,7 +8,7 @@
 public partial class ExecutionTimeBenchmark
 {
     private ILogger _logger = null!;
-    private ConfigurationExample _configuration;
+    private ConfigurationExample _configuration = null!;
 
     [GlobalSetup]
     public void Setup()
@@ -126,5 +126,5 @@ [LogProperties] ConfigurationExample arg6
 
 #endif
 
-    public record ConfigurationExample(int Id, string Name, ConfigurationExample NestedConfiguration);
+    public record ConfigurationExample(int Id, string Name, ConfigurationExample? NestedConfiguration);
 }
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/CommandRunner.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/CommandRunner.cs
@@ -1,17 +1,14 @@
-using System;
 using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace AutoLoggerMessageGenerator.Benchmarks;
 
 internal class CommandRunner(ProcessPriorityClass priorityClass)
 {
-    public async Task RunAsync(string command, string args = null, CancellationToken cancellationToken = default)
+    public async Task RunAsync(string command, string? args = null, CancellationToken cancellationToken = default)
     {
         var process = new Process();
 
-        process.StartInfo = new ProcessStartInfo(command, args)
+        process.StartInfo = new ProcessStartInfo(command, args ?? string.Empty)
         {
             UseShellExecute = false,
             CreateNoWindow = true,
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/MultiBenchmarkRunner.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/MultiBenchmarkRunner.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Exporters;
@@ -12,15 +7,15 @@
 
 namespace AutoLoggerMessageGenerator.Benchmarks;
 
-internal class MultiBenchmarkRunner(ProjectConfiguration[] projectConfigurations, string[] args = null)
+internal class MultiBenchmarkRunner(ProjectConfiguration[] projectConfigurations, string[]? args = null)
 {
     private static readonly ManualConfig RunConfiguration = ManualConfig.CreateMinimumViable()
         .WithOptions(ConfigOptions.JoinSummary)
         .WithOptions(ConfigOptions.DisableLogFile)
         .AddColumn(new ProjectConfigurationColumn())
         .WithOrderer(new DefaultOrderer(SummaryOrderPolicy.Declared))
         .AddExporter(MarkdownExporter.GitHub);
-    
+
     public async Task Run()
     {
         var buildResults = await BuildProjects();
@@ -30,7 +25,7 @@ public async Task Run()
 
         CleanupGeneratedProjects(buildResults);
     }
-   
+
     private async Task<LinkedList<ProjectBuilder.BuildResult>> BuildProjects()
     {
         if (!projectConfigurations.Any())
@@ -45,7 +40,7 @@ public async Task Run()
 
         return buildResults;
     }
-    
+
     private static TypeInfo[] FindAllBenchmarks(LinkedList<ProjectBuilder.BuildResult> buildResults)
     {
         var types = buildResults.Select(b => Assembly.LoadFrom(b.ExecutablePath))
@@ -54,7 +49,7 @@ private static TypeInfo[] FindAllBenchmarks(LinkedList<ProjectBuilder.BuildResul
             .ToArray();
         return types;
     }
-    
+
     private static void CleanupGeneratedProjects(LinkedList<ProjectBuilder.BuildResult> buildResults)
     {
         foreach (var buildResult in buildResults)
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/Program.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/Program.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using AutoLoggerMessageGenerator.Benchmarks;
 
 ProjectConfiguration[] projectConfigurations =
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/ProjectBuilder.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/ProjectBuilder.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Diagnostics;
-using System.IO;
-using System.Threading.Tasks;
 
 namespace AutoLoggerMessageGenerator.Benchmarks;
 
@@ -12,7 +9,7 @@ public async Task<BuildResult> BuildAsync()
         var baseDirectory = AppContext.BaseDirectory;
 
         var workingDirectory = Path.Join(baseDirectory, projectConfiguration.Name);
-        
+
         CreateWorkingDirectory(workingDirectory);
         await GenerateEntryPoint(workingDirectory);
         CopyBenchmarkFiles(workingDirectory);
@@ -28,15 +25,15 @@ public async Task<BuildResult> BuildAsync()
             ExecutablePath = Path.Join(workingDirectory, outputFolder, $"{projectConfiguration.Name}.dll"),
         };
     }
-    
+
     private static void CreateWorkingDirectory(string workingDirectory)
     {
         if (Directory.Exists(workingDirectory))
             Directory.Delete(workingDirectory, recursive: true);
 
         Directory.CreateDirectory(workingDirectory);
     }
-    
+
     private static Task GenerateEntryPoint(string workingDirectory)
     {
         const string mainEntryPoint = """
@@ -48,25 +45,25 @@ public static void Main() {}
 
         return File.WriteAllTextAsync(Path.Join(workingDirectory, "Program.cs"), mainEntryPoint);
     }
-    
+
     private static void CopyBenchmarkFiles(string workingDirectory)
     {
         var benchmarkFiles = $"{AppContext.BaseDirectory}/BenchmarkFiles";
         foreach (string newPath in Directory.GetFiles(benchmarkFiles, "*.*",SearchOption.AllDirectories))
             File.Copy(newPath, newPath.Replace(benchmarkFiles, workingDirectory), true);
     }
-    
+
     private async Task<(string OutputFolder, string projFilePath)> GenerateProjectFile(string projectName, string workingDirectory)
     {
         var telemetryConstant = projectConfiguration.References.Contains(PackagesProvider.MicrosoftExtensionsTelemetryPackage)
             ? "TELEMETRY"
             : string.Empty;
 
         var targetFramework = TargetFrameworkMonikerDetector.Detect();
-        
+
         string outputFolder = Path.Join("bin", "output");
         const string interceptorNamespace = Constants.GeneratorNamespace;
-        
+
         string projFileContent = $"""
                                   <Project Sdk="Microsoft.NET.Sdk">
                                     <PropertyGroup>
@@ -79,7 +76,7 @@ private static void CopyBenchmarkFiles(string workingDirectory)
                                       <RootNamespace>{projectName}</RootNamespace>
                                       <DefineConstants>$(DefineConstants);{telemetryConstant}</DefineConstants>
                                     </PropertyGroup>
-                                    
+
                                     <PropertyGroup>
                                          <PlatformTarget>AnyCPU</PlatformTarget>
                                          <DebugType>pdbonly</DebugType>
@@ -89,7 +86,7 @@ private static void CopyBenchmarkFiles(string workingDirectory)
                                          <Configuration>Release</Configuration>
                                          <IsPackable>false</IsPackable>
                                      </PropertyGroup>
-                                    
+
                                     <ItemGroup>
                                       {string.Join(Environment.NewLine, projectConfiguration.References)}
                                     </ItemGroup>
@@ -104,7 +101,7 @@ private static void CopyBenchmarkFiles(string workingDirectory)
 
     internal class BuildResult
     {
-        public string ProjectDirectory { get; init; }
-        public string ExecutablePath { get; init; }
+        public required string ProjectDirectory { get; init; }
+        public required string ExecutablePath { get; init; }
     }
 }
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/ProjectConfiguration.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/ProjectConfiguration.cs
@@ -1,5 +1,4 @@
 using System.Collections.Frozen;
-using System.Collections.Generic;
 
 namespace AutoLoggerMessageGenerator.Benchmarks;
 
diff --git a/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/TargetFrameworkMonikerDetector.cs b/src/Benchmarks/AutoLoggerMessageGenerator.Benchmarks/TargetFrameworkMonikerDetector.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 using System.Runtime.Versioning;
 
@@ -12,6 +11,9 @@ public static string Detect()
             .GetCustomAttribute<TargetFrameworkAttribute>()?
             .FrameworkName;
 
+        if (string.IsNullOrEmpty(frameworkName))
+            throw new InvalidOperationException("Failed to detect target framework moniker");
+
         return frameworkName switch
         {
             ".NETFramework,Version=v4.6.1" => "net461",
@@ -31,8 +33,10 @@ public static string Detect()
             ".NETCoreApp,Version=v7.0" => "net7.0",
             ".NETCoreApp,Version=v8.0" => "net8.0",
             ".NETCoreApp,Version=v9.0" => "net9.0",
-            _ when frameworkName.StartsWith(".NETFramework") => frameworkName.Replace(".NETFramework,Version=v", string.Empty).Replace(".", string.Empty),
-            _ when frameworkName.StartsWith(".NETCoreApp") => frameworkName.Replace(".NETCoreApp,Version=v", string.Empty),
+            _ when frameworkName.StartsWith(".NETFramework") =>
+                frameworkName.Replace(".NETFramework,Version=v", string.Empty).Replace(".", string.Empty),
+            _ when frameworkName.StartsWith(".NETCoreApp") =>
+                frameworkName.Replace(".NETCoreApp,Version=v", string.Empty),
             _ => throw new NotSupportedException($"Unsupported framework: {frameworkName}")
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`		`-using System;`
`2`	`1`	`using Microsoft.Extensions.Logging;`
`3`	`2`
`4`	`3`	`public class CustomNullLogger<T> : ILogger`
`5`	`4`	`{`
`6`	`5`	`private int _counter = 0;`
`7`	`6`	`public static readonly CustomNullLogger<T> Instance = new();`
`8`	`7`
`9`		`- public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)`
	`8`	`+ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception, string> formatter)`
`10`	`9`	`{`
`11`	`10`	`_counter++;`
`12`	`11`	`}`
`@@ -15,7 +14,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except`
`15`	`14`
`16`	`15`	`public IDisposable BeginScope<TState>(TState state) where TState : notnull =>`
`17`	`16`	`NullScope.Instance;`
`18`		`-`
	`17`	`+`
`19`	`18`	`private sealed class NullScope : IDisposable`
`20`	`19`	`{`
`21`	`20`	`public static NullScope Instance { get; } = new();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`public partial class ExecutionTimeBenchmark`
`9`	`9`	`{`
`10`	`10`	`private ILogger _logger = null!;`
`11`		`- private ConfigurationExample _configuration;`
	`11`	`+ private ConfigurationExample _configuration = null!;`
`12`	`12`
`13`	`13`	`[GlobalSetup]`
`14`	`14`	`public void Setup()`
`@@ -126,5 +126,5 @@ [LogProperties] ConfigurationExample arg6`
`126`	`126`
`127`	`127`	`#endif`
`128`	`128`
`129`		`- public record ConfigurationExample(int Id, string Name, ConfigurationExample NestedConfiguration);`
	`129`	`+ public record ConfigurationExample(int Id, string Name, ConfigurationExample? NestedConfiguration);`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,14 @@`
`1`		`-using System;`
`2`	`1`	`using System.Diagnostics;`
`3`		`-using System.Threading;`
`4`		`-using System.Threading.Tasks;`
`5`	`2`
`6`	`3`	`namespace AutoLoggerMessageGenerator.Benchmarks;`
`7`	`4`
`8`	`5`	`internal class CommandRunner(ProcessPriorityClass priorityClass)`
`9`	`6`	`{`
`10`		`- public async Task RunAsync(string command, string args = null, CancellationToken cancellationToken = default)`
	`7`	`+ public async Task RunAsync(string command, string? args = null, CancellationToken cancellationToken = default)`
`11`	`8`	`{`
`12`	`9`	`var process = new Process();`
`13`	`10`
`14`		`- process.StartInfo = new ProcessStartInfo(command, args)`
	`11`	`+ process.StartInfo = new ProcessStartInfo(command, args ?? string.Empty)`
`15`	`12`	`{`
`16`	`13`	`UseShellExecute = false,`
`17`	`14`	`CreateNoWindow = true,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Collections.Generic;`
`2`	`1`	`using AutoLoggerMessageGenerator.Benchmarks;`
`3`	`2`
`4`	`3`	`ProjectConfiguration[] projectConfigurations =`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Collections.Frozen;`
`2`		`-using System.Collections.Generic;`
`3`	`2`
`4`	`3`	`namespace AutoLoggerMessageGenerator.Benchmarks;`
`5`	`4`