Update to net9.0, bump packages, tidy up (#135)

Author: si618

.editorconfig

@@ -13,6 +13,7 @@ indent_size = 4
 # CA1822: Mark members as static
 dotnet_diagnostic.ca1822.severity = silent
 
+csharp_style_expression_bodied_methods = true:suggestion
 csharp_style_namespace_declarations = file_scoped
 
 # Microsoft .NET properties

.github/workflows/workflow.yml

@@ -10,7 +10,7 @@ env:
   DOTNET_NOLOGO: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
-  DOTNET_VERSION: 8.0.x
+  DOTNET_VERSION: 9.0.x
 
 jobs:
   build:
@@ -38,6 +38,7 @@ jobs:
 
   benchmark:
     needs: [ build ]
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.gitignore

@@ -3,3 +3,4 @@ bin
 obj
 *.DotSettings.user
 BenchmarkDotNet.Artifacts
+/.idea/.idea.LeetCode/.idea/material_theme_project_new.xml

Directory.Build.props

@@ -1,14 +1,18 @@
 <Project>
-
   <Import Project="Directory.Build.user.props" Condition="Exists('Directory.Build.user.props')"/>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <Authors>Simon McKenna</Authors>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <TargetFramework>net9.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" />
+  </ItemGroup>
 </Project>

Directory.Packages.props

@@ -8,15 +8,22 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="FsUnit.xUnit" Version="6.0.0" />
-    <PackageVersion Include="FSharp.Core" Version="8.0.400" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
+    <PackageVersion Include="FsUnit.xUnit" Version="6.0.1" />
+    <PackageVersion Include="FSharp.Core" Version="8.0.100" />
     <PackageVersion Include="lolcat" Version="1.1.64" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.143">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
     <PackageVersion Include="Spectre.Console" Version="0.49.1" />
-    <PackageVersion Include="Spectre.Console.Analyzer" Version="1.0.0" />
+    <PackageVersion Include="Spectre.Console.Analyzer" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
     <PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

LeetCode.CSharp/Benchmark.cs

@@ -3,24 +3,24 @@
 [Config(typeof(BenchmarkConfig))]
 public abstract class Benchmark
 {
-    protected char[][] CharArrayMulti { get; set; } = { new[] { char.MinValue } };
+    protected char[][] CharArrayMulti { get; set; } = [[char.MinValue]];
 
     protected int Int1 { get; set; }
     protected int Int2 { get; set; }
 
-    protected int[] IntArray1 { get; set; } = Array.Empty<int>();
-    protected int[] IntArray2 { get; set; } = Array.Empty<int>();
-    protected int[][] IntArrayMulti1 { get; set; } = Array.Empty<int[]>();
-    protected int?[] IntArrayNullable { get; set; } = Array.Empty<int?>();
+    protected int[] IntArray1 { get; set; } = [];
+    protected int[] IntArray2 { get; set; } = [];
+    protected int[][] IntArrayMulti1 { get; set; } = [];
+    protected int?[] IntArrayNullable { get; set; } = [];
 
-    protected List<Interval> Intervals1 { get; } = new();
+    protected List<Interval> Intervals1 { get; } = [];
 
     protected ListNode ListNode1 { get; set; } = new();
     protected ListNode ListNode2 { get; set; } = new();
 
     protected string String1 { get; set; } = string.Empty;
     protected string String2 { get; set; } = string.Empty;
-    protected string[] StringArray1 { get; set; } = Array.Empty<string>();
+    protected string[] StringArray1 { get; set; } = [];
 
     protected TreeNode TreeNode1 { get; set; } = new();
     protected TreeNode TreeNode2 { get; set; } = new();

LeetCode.CSharp/Benchmarks/AddTwoNumbersBenchmark.cs

@@ -19,8 +19,8 @@ public void AddTwoNumbersSetup()
     [GlobalCleanup(Target = nameof(AddTwoNumbers))]
     public void AddTwoNumbersCleanup()
     {
-        IntArray1 = Array.Empty<int>();
-        IntArray2 = Array.Empty<int>();
+        IntArray1 = [];
+        IntArray2 = [];
         ListNode1 = new ListNode(IntArray1);
         ListNode2 = new ListNode(IntArray2);
     }

LeetCode.CSharp/Benchmarks/BinarySearchBenchmark.cs

@@ -9,5 +9,5 @@ public class BinarySearchBenchmark : Benchmark
     public int BinarySearch() => Problem.BinarySearch(IntArray1, 1_000);
 
     [GlobalCleanup(Target = nameof(BinarySearch))]
-    public void BinarySearchCleanup() => IntArray1 = Array.Empty<int>();
+    public void BinarySearchCleanup() => IntArray1 = [];
 }

LeetCode.CSharp/Problems/AddTwoNumbers.cs

@@ -46,26 +46,24 @@ public static ListNode AddTwoNumbers(ListNode l1, ListNode l2)
         return result.next!;
     }
 
-    [Fact]
-    public void AddTwoNumbersTest()
+    [Theory]
+    [InlineData(new[] { 2, 4, 3 }, new[] { 5, 6, 4 }, new[] { 7, 0, 8 })]
+    [InlineData(new int[] { }, new int[] { }, new int[] { })]
+    [InlineData(
+        new[] { 9, 9, 9, 9, 9, 9, 9 },
+        new[] { 9, 9, 9, 9 },
+        new[] { 8, 9, 9, 9, 0, 0, 0, 1 })]
+    public void AddTwoNumbersTest(int[] list1, int[] list2, int[] expectedList)
     {
-        var ex11 = new ListNode(new[] { 2, 4, 3 });
-        var ex12 = new ListNode(new[] { 5, 6, 4 });
-        var ex1Expected = new ListNode(new[] { 7, 0, 8 });
-        var ex21 = new ListNode();
-        var ex22 = new ListNode();
-        var ex2Expected = new ListNode();
-        var ex31 = new ListNode(new[] { 9, 9, 9, 9, 9, 9, 9 });
-        var ex32 = new ListNode(new[] { 9, 9, 9, 9 });
-        var ex3Expected = new ListNode(new[] { 8, 9, 9, 9, 0, 0, 0, 1 });
+        var listNode1 = new ListNode(list1);
+        var listNode2 = new ListNode(list2);
+        var expectedNode = new ListNode(expectedList);
+        var result = AddTwoNumbers(listNode1, listNode2);
+        result.Should().NotBeNull();
+        AssertEqual(result, expectedNode);
 
-        var ex1Result = AddTwoNumbers(ex11, ex12);
-        var ex2Result = AddTwoNumbers(ex21, ex22);
-        var ex3Result = AddTwoNumbers(ex31, ex32);
+        return;
 
-        ex1Result.Should().NotBeNull();
-        ex2Result.Should().NotBeNull();
-        ex3Result.Should().NotBeNull();
         static void AssertEqual(ListNode? l1, ListNode? l2)
         {
             while (true)
@@ -84,8 +82,5 @@ static void AssertEqual(ListNode? l1, ListNode? l2)
                 l2 = l2.next;
             }
         }
-        AssertEqual(ex1Result, ex1Expected);
-        AssertEqual(ex2Result, ex2Expected);
-        AssertEqual(ex3Result, ex3Expected);
     }
 }

LeetCode.CSharp/Problems/BinarySearch.cs

@@ -35,13 +35,10 @@ public static int BinarySearch(int[] nums, int target)
         return -1;
     }
 
-    [Fact]
-    public void BinarySearchTest()
-    {
-        var nums = new[] { -1, 0, 3, 5, 9, 12 };
-
-        BinarySearch(nums, 9).Should().Be(4);
-        BinarySearch(nums, 2).Should().Be(-1);
-        BinarySearch(Array.Empty<int>(), 0).Should().Be(-1);
-    }
+    [Theory]
+    [InlineData(new[] { -1, 0, 3, 5, 9, 12 }, 9, 4)]
+    [InlineData(new[] { -1, 0, 3, 5, 9, 12 }, 2, -1)]
+    [InlineData(new int[] { }, 0, -1)]
+    public void BinarySearchTest(int[] nums, int target, int expected) =>
+        BinarySearch(nums, target).Should().Be(expected);
 }

LeetCode.CSharp/Problems/ClimbStairs.cs

@@ -24,10 +24,8 @@ public static int ClimbStairs(int n)
         return oneStep;
     }
 
-    [Fact]
-    public void ClimbStairsTest()
-    {
-        ClimbStairs(2).Should().Be(2);
-        ClimbStairs(3).Should().Be(3);
-    }
+    [Theory]
+    [InlineData(2, 2)]
+    [InlineData(3, 3)]
+    public void ClimbStairsTest(int n, int expected) => ClimbStairs(n).Should().Be(expected);
 }

LeetCode.CSharp/Problems/ContainsDuplicate.cs

@@ -11,28 +11,13 @@ public static bool ContainsDuplicate(int[] nums)
     {
         var set = new HashSet<int>();
 
-        foreach (var num in nums)
-        {
-            if (set.Contains(num))
-            {
-                return true;
-            }
-
-            set.Add(num);
-        }
-
-        return false;
+        return nums.Any(num => !set.Add(num));
     }
 
-    [Fact]
-    public void ContainsDuplicateTest()
-    {
-        var ex1 = new[] { 1, 2, 3, 1 };
-        var ex2 = new[] { 1, 2, 3, 4 };
-        var ex3 = new[] { 1, 1, 1, 3, 3, 4, 3, 2, 4, 2 };
-
-        ContainsDuplicate(ex1).Should().BeTrue();
-        ContainsDuplicate(ex2).Should().BeFalse();
-        ContainsDuplicate(ex3).Should().BeTrue();
-    }
+    [Theory]
+    [InlineData(new[] { 1, 2, 3, 1 }, true)]
+    [InlineData(new[] { 1, 2, 3, 4 }, false)]
+    [InlineData(new[] { 1, 1, 1, 3, 3, 4, 3, 2, 4, 2 }, true)]
+    public void ContainsDuplicateTest(int[] nums, bool expected) =>
+        ContainsDuplicate(nums).Should().Be(expected);
 }

LeetCode.CSharp/Problems/CountBits.cs

@@ -26,13 +26,8 @@ public static int[] CountBits(int n)
         return result;
     }
 
-    [Fact]
-    public void CountBitsTest()
-    {
-        const int ex1 = 2;
-        const int ex2 = 5;
-
-        CountBits(ex1).Should().Equal(0, 1, 1);
-        CountBits(ex2).Should().Equal(0, 1, 1, 2, 1, 2);
-    }
+    [Theory]
+    [InlineData(2, new[] { 0, 1, 1 })]
+    [InlineData(5, new[] { 0, 1, 1, 2, 1, 2 })]
+    public void CountBitsTest(int n, int[] expected) => CountBits(n).Should().Equal(expected);
 }

LeetCode.CSharp/Problems/DiameterOfBinaryTree.cs

@@ -10,6 +10,10 @@ public static int DiameterOfBinaryTree(TreeNode root)
     {
         var maxDiameter = 0;
 
+        DepthFirstSearch(root);
+
+        return maxDiameter;
+
         // Calculates height and stores maximum diameter
         int DepthFirstSearch(TreeNode? node)
         {
@@ -26,10 +30,6 @@ int DepthFirstSearch(TreeNode? node)
             // Add 1 to include current node's height
             return Math.Max(left, right) + 1;
         }
-
-        DepthFirstSearch(root);
-
-        return maxDiameter;
     }
 
     [Fact]

LeetCode.CSharp/Problems/IsBalanced.cs

@@ -8,6 +8,8 @@ public sealed partial class Problem
         "https://www.youtube.com/watch?v=QfJsau0ItOY")]
     public static bool IsBalanced(TreeNode root)
     {
+        return DepthFirstSearch(root).IsBalanced;
+
         static (bool IsBalanced, int Height) DepthFirstSearch(TreeNode? node)
         {
             if (node is null)
@@ -19,24 +21,22 @@ public static bool IsBalanced(TreeNode root)
             var right = DepthFirstSearch(node.right);
 
             var isBalanced = left.IsBalanced && right.IsBalanced
-                && Math.Abs(left.Height - right.Height) <= 1;
+                                             && Math.Abs(left.Height - right.Height) <= 1;
 
             // Add 1 to include current node's height
             var height = Math.Max(left.Height, right.Height) + 1;
 
             return (isBalanced, height);
         }
-
-        return DepthFirstSearch(root).IsBalanced;
     }
 
     [Fact]
     public void IsBalancedTest()
     {
-        var root1 = new TreeNode(new int?[] { 3, 9, 20, null, null, 15, 7 });
-        var root2 = new TreeNode(new int?[] { 1, 2, 2, 3, 3, null, null, 4, 4 });
-        var root3 = new TreeNode(new int?[] { 1, 2, null, 3 });
-        var root4 = new TreeNode(new int?[] { 1, 2, 3, 4, 5, null, 6, 7, null, null, null, null, 8 });
+        var root1 = new TreeNode([3, 9, 20, null, null, 15, 7]);
+        var root2 = new TreeNode([1, 2, 2, 3, 3, null, null, 4, 4]);
+        var root3 = new TreeNode([1, 2, null, 3]);
+        var root4 = new TreeNode([1, 2, 3, 4, 5, null, 6, 7, null, null, null, null, 8]);
         var root5 = new TreeNode();
 
         IsBalanced(root1).Should().BeTrue();

LeetCode.CSharp/Problems/IsHappy.cs

@@ -10,20 +10,6 @@ public static bool IsHappy(int n)
     {
         var visited = new HashSet<int>();
 
-        int SumOfSquares(int i)
-        {
-            var result = 0;
-
-            while (i != 0)
-            {
-                var digit = i % 10;
-                digit *= digit;
-                result += digit;
-                i /= 10;
-            }
-            return result;
-        }
-
         while (!visited.Contains(n))
         {
             visited.Add(n);
@@ -37,6 +23,20 @@ int SumOfSquares(int i)
         }
 
         return false; // :(
+
+        static int SumOfSquares(int i)
+        {
+            var result = 0;
+
+            while (i != 0)
+            {
+                var digit = i % 10;
+                digit *= digit;
+                result += digit;
+                i /= 10;
+            }
+            return result;
+        }
     }
 
     [Fact]