Get it building again

JamieMagee · JamieMagee · commit 91fcb182825f · 2025-06-30T11:58:13.000-07:00
diff --git a/.editorconfig b/.editorconfig
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,15 +2,17 @@
   <PropertyGroup Label="Build">
     <LangVersion>latest</LangVersion>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AnalysisLevel>latest</AnalysisLevel>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <ImplicitUsings>enable</ImplicitUsings>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <Nullable>enable</Nullable>
     <NoWarn>CA1305;VSTHRD111;IDE0065;CA1707;IDE0010;IDE0033;SA1615;SA1300;SA1200;SA1202;SA1204;RZ10012;CA1001;VSTHRD110;CA1716</NoWarn>
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all" Version="17.2.32"/>
-    <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Version="1.2.0-beta.435"/>
+    <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Version="1.2.0-beta.556"/>
   </ItemGroup>
 </Project>
diff --git a/src/2015/AdventOfCode.2015.Puzzles.Test/AdventOfCode.2015.Puzzles.Test.csproj b/src/2015/AdventOfCode.2015.Puzzles.Test/AdventOfCode.2015.Puzzles.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>AdventOfCode._2015.Puzzles.Test</RootNamespace>
 
     <IsPackable>false</IsPackable>
diff --git a/src/2015/AdventOfCode.2015.Puzzles/AdventOfCode.2015.Puzzles.csproj b/src/2015/AdventOfCode.2015.Puzzles/AdventOfCode.2015.Puzzles.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>AdventOfCode._2015.Puzzles</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/2015/AdventOfCode.2015.Puzzles/Solutions/Day01.cs b/src/2015/AdventOfCode.2015.Puzzles/Solutions/Day01.cs
@@ -5,8 +5,7 @@
 [Puzzle("Not Quite Lisp")]
 public sealed class Day01 : SolutionBase
 {
-    protected override string Part1(string input) => input.Select(c => c == '(' ? 1 : -1)
-        .Sum()
+    protected override string Part1(string input) => input.Sum(c => c == '(' ? 1 : -1)
         .ToString(CultureInfo.InvariantCulture);
 
     protected override string Part2(string input)
diff --git a/src/2020/AdventOfCode.2020.Puzzles.Test/AdventOfCode.2020.Puzzles.Test.csproj b/src/2020/AdventOfCode.2020.Puzzles.Test/AdventOfCode.2020.Puzzles.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>AdventOfCode._2020.Puzzles.Test</RootNamespace>
   </PropertyGroup>
diff --git a/src/2020/AdventOfCode.2020.Puzzles/AdventOfCode.2020.Puzzles.csproj b/src/2020/AdventOfCode.2020.Puzzles/AdventOfCode.2020.Puzzles.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>AdventOfCode._2020.Puzzles</RootNamespace>
   </PropertyGroup>
 
diff --git a/src/2020/AdventOfCode.2020.Puzzles/Solutions/Day19.cs b/src/2020/AdventOfCode.2020.Puzzles/Solutions/Day19.cs
@@ -65,7 +65,7 @@ private static Dictionary<int, IEnumerable<IEnumerable<Rule>>> ParseRules(string
                         part.StartsWith(@"""", StringComparison.Ordinal) ? new CharRule(part[1]) : new PointerRule(int.Parse(part)))));
             return entry;
         })
-        .ToDictionary();
+        .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
 
     private static IEnumerable<int> RuleMatch(
         IReadOnlyDictionary<int, IEnumerable<IEnumerable<Rule>>> rules,
diff --git a/src/AdventOfCode.Console/AdventOfCode.Console.csproj b/src/AdventOfCode.Console/AdventOfCode.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup Label="Build">
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>5adb2560-81a5-4a32-aa5b-9daa67ab0874</UserSecretsId>
     <RootNamespace>AdventOfCode.Console</RootNamespace>
   </PropertyGroup>
diff --git a/src/AdventOfCode.Core.Test/AdventOfCode.Core.Test.csproj b/src/AdventOfCode.Core.Test/AdventOfCode.Core.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AdventOfCode.Core/AdventOfCode.Core.csproj b/src/AdventOfCode.Core/AdventOfCode.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/AdventOfCode.Core/AssemblyLoader.cs b/src/AdventOfCode.Core/AssemblyLoader.cs
@@ -15,9 +15,17 @@ public static void LoadAssemblies() => Enumerable.Range(Start, Current - Start +
                     $"AdventOfCode.{year}.Puzzles",
                     $"AdventOfCode._{year}.Puzzles.Solutions.Day01");
             }
-            catch (Exception)
+            catch (FileNotFoundException)
             {
-                // ignored
+                // Assembly not found - ignore
+            }
+            catch (TypeLoadException)
+            {
+                // Type not found - ignore
+            }
+            catch (MissingMethodException)
+            {
+                // Constructor not found - ignore
             }
         });
 }
diff --git a/src/AdventOfCode.Core/Extensions/ListExtensions.cs b/src/AdventOfCode.Core/Extensions/ListExtensions.cs
@@ -4,14 +4,27 @@ public static class ListExtensions
 {
     public static void Deconstruct<T>(this IList<T> list, out T first, out IList<T> rest)
     {
-        first = list.Count > 0 ? list[0] : default;
-        rest = list.Skip(1).ToList();
+        ArgumentNullException.ThrowIfNull(list);
+
+        if (list.Count < 1)
+        {
+            throw new ArgumentException("List must contain at least one element.", nameof(list));
+        }
+
+        first = list[0];
+        rest = [.. list.Skip(1)];
     }
 
     public static void Deconstruct<T>(this IList<T> list, out T first, out T second, out IList<T> rest)
     {
-        first = list.Count > 0 ? list[0] : default;
-        second = list.Count > 1 ? list[1] : default;
-        rest = list.Skip(2).ToList();
+        ArgumentNullException.ThrowIfNull(list);
+        if (list.Count < 2)
+        {
+            throw new ArgumentException("List must contain at least two elements.", nameof(list));
+        }
+
+        first = list[0];
+        second = list[1];
+        rest = [.. list.Skip(2)];
     }
 }
diff --git a/src/AdventOfCode.Core/Extensions/StringExtensions.cs b/src/AdventOfCode.Core/Extensions/StringExtensions.cs
@@ -4,15 +4,22 @@ namespace AdventOfCode.Core.Extensions;
 
 public static class StringExtensions
 {
-    public static IEnumerable<T> GetLines<T>(this string input) => input.Replace("\r", string.Empty)
-        .Split('\n')
-        .Reverse()
-        .SkipWhile(string.IsNullOrEmpty)
-        .Reverse()
-        .Select(s => (T)Convert.ChangeType(s, typeof(T), CultureInfo.InvariantCulture));
+    public static IEnumerable<T> GetLines<T>(this string input)
+    {
+        ArgumentNullException.ThrowIfNull(input);
+
+        return input.Replace("\r", string.Empty, StringComparison.Ordinal)
+            .Split('\n')
+            .Reverse()
+            .SkipWhile(string.IsNullOrEmpty)
+            .Reverse()
+            .Select(s => (T)Convert.ChangeType(s, typeof(T), CultureInfo.InvariantCulture));
+    }
 
     public static char? TryGetCharAt(this string input, int index)
     {
+        ArgumentNullException.ThrowIfNull(input);
+
         if (index < 0 || index >= input.Length)
         {
             return null;
@@ -23,6 +30,8 @@ public static IEnumerable<T> GetLines<T>(this string input) => input.Replace("\r
 
     public static char? Get(this string[] map, (int R, int C) pos)
     {
+        ArgumentNullException.ThrowIfNull(map);
+
         var (r, c) = pos;
         if (r < 0 || c < 0 || r >= map.Length || c >= map[r].Length)
         {
diff --git a/src/AdventOfCode.Core/IProgressPublisher.cs b/src/AdventOfCode.Core/IProgressPublisher.cs
@@ -2,7 +2,7 @@ namespace AdventOfCode.Core;
 
 public interface IProgressPublisher
 {
-    bool IsUpdateProgressNeeded();
+    public bool IsUpdateProgressNeeded();
 
-    Task UpdateProgressAsync(double current, double total);
+    public Task UpdateProgressAsync(double current, double total);
 }
diff --git a/src/AdventOfCode.Core/ISolution.cs b/src/AdventOfCode.Core/ISolution.cs
@@ -2,13 +2,13 @@ namespace AdventOfCode.Core;
 
 public interface ISolution
 {
-    event EventHandler<SolutionProgressEventArgs> ProgressUpdated;
+    public event EventHandler<SolutionProgressEventArgs> ProgressUpdated;
 
-    CancellationToken CancellationToken { get; set; }
+    public CancellationToken CancellationToken { get; set; }
 
-    int MillisecondsBetweenProgressUpdates { get; set; }
+    public int MillisecondsBetweenProgressUpdates { get; set; }
 
-    Task<string> Part1Async(string input);
+    public Task<string> Part1Async(string input);
 
-    Task<string> Part2Async(string input);
+    public Task<string> Part2Async(string input);
 }
diff --git a/src/AdventOfCode.Core/ISolutionHandler.cs b/src/AdventOfCode.Core/ISolutionHandler.cs
@@ -1,6 +1,9 @@
 namespace AdventOfCode.Core;
 
+/// <summary>
+/// Interface for handling solutions to Advent of Code puzzles.
+/// </summary>
 public interface ISolutionHandler
 {
-    IDictionary<int, IDictionary<int, SolutionMetadata>> Solutions { get; }
+    public IDictionary<int, IDictionary<int, SolutionMetadata>> Solutions { get; }
 }
diff --git a/src/AdventOfCode.Core/PuzzleAttribute.cs b/src/AdventOfCode.Core/PuzzleAttribute.cs
@@ -1,15 +1,9 @@
 namespace AdventOfCode.Core;
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-public sealed class PuzzleAttribute : Attribute
+public sealed class PuzzleAttribute(string title, int day = -1) : Attribute
 {
-    public PuzzleAttribute(string title = null, int day = -1)
-    {
-        this.Day = day < 0 ? null : day;
-        this.Title = title;
-    }
+    public int? Day { get; } = day < 0 ? null : day;
 
-    public int? Day { get; }
-
-    public string Title { get; }
+    public string Title { get; } = title;
 }
diff --git a/src/AdventOfCode.Core/SolutionBase.cs b/src/AdventOfCode.Core/SolutionBase.cs
@@ -9,7 +9,7 @@ public abstract class SolutionBase : ISolution, IProgressPublisher
     /// </summary>
     private int myUpdateTick = Environment.TickCount;
 
-    public event EventHandler<SolutionProgressEventArgs> ProgressUpdated;
+    public event EventHandler<SolutionProgressEventArgs>? ProgressUpdated;
 
     public int MillisecondsBetweenProgressUpdates { get; set; } = 200;
 
@@ -28,19 +28,24 @@ public abstract class SolutionBase : ISolution, IProgressPublisher
     /// <summary>
     ///     Breaks the input into lines and removes empty lines at the end.
     /// </summary>
-    protected static IEnumerable<string> GetLines(string input) => input.Replace("\r", string.Empty)
-        .Split('\n')
-        .Reverse()
-        .SkipWhile(string.IsNullOrEmpty)
-        .Reverse()
-        .ToList();
+    /// <param name="input">The input string to process.</param>
+    protected static IEnumerable<string> GetLines(string input)
+    {
+        ArgumentNullException.ThrowIfNull(input);
+
+        return [..input.Replace("\r", string.Empty, StringComparison.Ordinal)
+            .Split('\n')
+            .Reverse()
+            .SkipWhile(string.IsNullOrEmpty)
+            .Reverse()];
+    }
 
     protected virtual string Part1(string input) => throw new NotImplementedException();
 
     protected virtual string Part2(string input) => throw new NotImplementedException();
 
     /// <summary>
-    ///     Returns true if <see cref="UpdateProgressAsync" /> should be called to update the UI of the solution runner. This
+    ///     Returns true if <see cref="UpdateProgressAsync(double, double)" /> should be called to update the UI of the solution runner. This
     ///     happens every couple of milliseconds.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -50,6 +55,9 @@ protected static IEnumerable<string> GetLines(string input) => input.Replace("\r
     ///     Updates the UI of the solution runner with the current progress, and schedules the next update a couple of
     ///     milliseconds in the future.
     /// </summary>
+    /// <param name="current">The current progress value.</param>
+    /// <param name="total">The total value to calculate the percentage from.</param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected Task UpdateProgressAsync(double current, double total)
     {
         this.Progress.Percentage = current / Math.Max(total, double.Epsilon) * 100;
diff --git a/src/AdventOfCode.Core/SolutionHandler.cs b/src/AdventOfCode.Core/SolutionHandler.cs
@@ -3,30 +3,32 @@ namespace AdventOfCode.Core;
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-public class SolutionHandler : ISolutionHandler
+/// <inheritdoc/>
+public partial class SolutionHandler : ISolutionHandler
 {
     public SolutionHandler() => this.Solutions = GatherPuzzleSolutions();
 
     public IDictionary<int, IDictionary<int, SolutionMetadata>> Solutions { get; }
 
-    private static IDictionary<int, IDictionary<int, SolutionMetadata>> GatherPuzzleSolutions()
+    private static Dictionary<int, IDictionary<int, SolutionMetadata>> GatherPuzzleSolutions()
     {
         var solutionsByYear = new Dictionary<int, IDictionary<int, SolutionMetadata>>();
 
         AssemblyLoader.LoadAssemblies();
         var solutionTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypes())
-            .Where(x => typeof(ISolution).IsAssignableFrom(x) && !x.IsAbstract);
-        var years = solutionTypes.Select(t => Convert.ToInt32(new Regex(@"20[0-9]+").Match(t.FullName).Value, CultureInfo.InvariantCulture))
+            .Where(x => typeof(ISolution).IsAssignableFrom(x) && !x.IsAbstract)
+            .ToList();
+        var years = solutionTypes.Select(t => Convert.ToInt32(YearRegex().Match(t.FullName!).Value, CultureInfo.InvariantCulture))
             .Distinct();
 
         foreach (var year in years)
         {
             var solutionsByDay = new Dictionary<int, SolutionMetadata>();
-            foreach (var solutionType in solutionTypes.Where(t => t.FullName.Contains(year.ToString(CultureInfo.InvariantCulture))))
+            foreach (var solutionType in solutionTypes.Where(t => t.FullName!.Contains(year.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal)))
             {
                 var puzzleAttribute = solutionType.GetCustomAttributes(typeof(PuzzleAttribute), false)
                     .OfType<PuzzleAttribute>().FirstOrDefault();
-                var day = puzzleAttribute?.Day ?? Convert.ToInt32(new Regex(@"[0-9]+").Match(solutionType.Name).Value, CultureInfo.InvariantCulture);
+                var day = puzzleAttribute?.Day ?? Convert.ToInt32(NumberRegex().Match(solutionType.Name).Value, CultureInfo.InvariantCulture);
                 var title = puzzleAttribute?.Title ?? $"Puzzle #{day}";
                 solutionsByDay.Add(day, new SolutionMetadata(solutionType, year, day, title));
             }
@@ -36,4 +38,10 @@ private static IDictionary<int, IDictionary<int, SolutionMetadata>> GatherPuzzle
 
         return solutionsByYear;
     }
+
+    [GeneratedRegex(@"20[0-9]+")]
+    private static partial Regex YearRegex();
+
+    [GeneratedRegex(@"[0-9]+")]
+    private static partial Regex NumberRegex();
 }
diff --git a/src/AdventOfCode.Core/SolutionMetadata.cs b/src/AdventOfCode.Core/SolutionMetadata.cs
@@ -1,22 +1,14 @@
 namespace AdventOfCode.Core;
 
-public sealed class SolutionMetadata
+public sealed class SolutionMetadata(Type type, int year, int day, string name)
 {
-    public SolutionMetadata(Type type, int year, int day, string name)
-    {
-        this.Type = type;
-        this.Year = year;
-        this.Day = day;
-        this.Title = name;
-    }
+    public int Year { get; } = year;
 
-    public int Year { get; }
+    public int Day { get; } = day;
 
-    public int Day { get; }
+    public Type Type { get; } = type;
 
-    public Type Type { get; }
+    public string Title { get; } = name;
 
-    public string Title { get; }
-
-    public ISolution CreateInstance() => (ISolution)Activator.CreateInstance(this.Type);
+    public ISolution CreateInstance() => (ISolution)Activator.CreateInstance(this.Type)!;
 }
diff --git a/src/AdventOfCode.Core/SolutionProgressEventArgs.cs b/src/AdventOfCode.Core/SolutionProgressEventArgs.cs
@@ -1,8 +1,6 @@
 namespace AdventOfCode.Core;
 
-public sealed class SolutionProgressEventArgs : EventArgs
+public sealed class SolutionProgressEventArgs(SolutionProgress solutionProgress) : EventArgs
 {
-    public SolutionProgressEventArgs(SolutionProgress solutionProgress) => this.Progress = solutionProgress;
-
-    public SolutionProgress Progress { get; }
+    public SolutionProgress Progress { get; } = solutionProgress;
 }
diff --git a/src/AdventOfCode.Web/AdventOfCode.Web.csproj b/src/AdventOfCode.Web/AdventOfCode.Web.csproj

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`[Puzzle("Not Quite Lisp")]`
`6`	`6`	`public sealed class Day01 : SolutionBase`
`7`	`7`	`{`
`8`		`- protected override string Part1(string input) => input.Select(c => c == '(' ? 1 : -1)`
`9`		`- .Sum()`
	`8`	`+ protected override string Part1(string input) => input.Sum(c => c == '(' ? 1 : -1)`
`10`	`9`	`.ToString(CultureInfo.InvariantCulture);`
`11`	`10`
`12`	`11`	`protected override string Part2(string input)`