From 287e62910ff82a289e22e554efd85b9377323f87 Mon Sep 17 00:00:00 2001
From: Craig Treasure <craigktreasure@outlook.com>
Date: Fri, 17 Nov 2023 13:44:15 -0800
Subject: [PATCH] Add support for .NET 8

This change adds support for .NET 8. Unlike similar PRs in my other repos, it does not enable artifacts support yet due to an issue with [benchmarkdotnet](https://github.com/dotnet/BenchmarkDotNet/issues/2466).
---
 .editorconfig                                               | 3 +++
 .github/actions/install-tools/action.yml                    | 1 +
 eng/DotNetAnalyzers.props                                   | 2 +-
 eng/DotNetDefaults.props                                    | 2 +-
 global.json                                                 | 2 +-
 src/Treasure.Utils.Argument/Argument.cs                     | 4 ++++
 src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj  | 2 +-
 test/Treasure.Utils.Argument.Benchmarks/Combine.ps1         | 6 +++++-
 test/Treasure.Utils.Argument.Benchmarks/Program.cs          | 2 +-
 test/Treasure.Utils.Argument.Benchmarks/Run.ps1             | 2 +-
 .../Treasure.Utils.Argument.Benchmarks.csproj               | 4 ++--
 test/Treasure.Utils.Argument.Tests/ArgumentTests.cs         | 2 +-
 .../Treasure.Utils.Argument.Tests.csproj                    | 2 +-
 13 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 8f8b291..96a2023 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -178,6 +178,9 @@ csharp_style_expression_bodied_constructors = when_on_single_line
 #prefer expression-bodied members for properties
 csharp_style_expression_bodied_properties = when_on_single_line
 
+#IDE0290: Use Primary Constructors
+csharp_style_prefer_primary_constructors = false
+
 #Style - expression level options
 
 #prefer out variables to be declared before the method call
diff --git a/.github/actions/install-tools/action.yml b/.github/actions/install-tools/action.yml
index cbacc76..3d56292 100644
--- a/.github/actions/install-tools/action.yml
+++ b/.github/actions/install-tools/action.yml
@@ -9,6 +9,7 @@ runs:
         dotnet-version: |
             6.x
             7.x
+            8.x
 
     - name: Install .NET tools
       shell: pwsh
diff --git a/eng/DotNetAnalyzers.props b/eng/DotNetAnalyzers.props
index 8495bd2..10191c6 100644
--- a/eng/DotNetAnalyzers.props
+++ b/eng/DotNetAnalyzers.props
@@ -7,7 +7,7 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <AnalysisLevel>7.0</AnalysisLevel>
+    <AnalysisLevel>8.0</AnalysisLevel>
   </PropertyGroup>
 
 </Project>
diff --git a/eng/DotNetDefaults.props b/eng/DotNetDefaults.props
index 96330a4..6bf86fd 100644
--- a/eng/DotNetDefaults.props
+++ b/eng/DotNetDefaults.props
@@ -10,7 +10,7 @@
     <!-- Sets the C# language version:
       https://docs.microsoft.com/dotnet/csharp/language-reference/configure-language-version#c-language-version-reference
     -->
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
 
     <!-- Enable implicit usings:
       https://docs.microsoft.com/dotnet/core/project-sdk/overview#implicit-using-directives
diff --git a/global.json b/global.json
index 1d2535c..33e3be6 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   },
diff --git a/src/Treasure.Utils.Argument/Argument.cs b/src/Treasure.Utils.Argument/Argument.cs
index 4b1ce70..b0dcc2f 100644
--- a/src/Treasure.Utils.Argument/Argument.cs
+++ b/src/Treasure.Utils.Argument/Argument.cs
@@ -75,6 +75,9 @@ public static string NotNullOrEmpty([NotNull] string? value, [CallerArgumentExpr
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static string NotNullOrWhiteSpace([NotNull] string? value, [CallerArgumentExpression(nameof(value))] string name = "")
     {
+#if NET8_0_OR_GREATER
+        ArgumentException.ThrowIfNullOrWhiteSpace(value, name);
+#else
         if (value is null)
         {
             throw new ArgumentNullException(name);
@@ -84,6 +87,7 @@ public static string NotNullOrWhiteSpace([NotNull] string? value, [CallerArgumen
         {
             throw new ArgumentException("The value cannot be null, empty, or white-space.", name);
         }
+#endif
 
         return value;
     }
diff --git a/src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj b/src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj
index e86a5b8..a39fc75 100644
--- a/src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj
+++ b/src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>Treasure.Utils</RootNamespace>
 
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/test/Treasure.Utils.Argument.Benchmarks/Combine.ps1 b/test/Treasure.Utils.Argument.Benchmarks/Combine.ps1
index 84cb885..66f20c2 100644
--- a/test/Treasure.Utils.Argument.Benchmarks/Combine.ps1
+++ b/test/Treasure.Utils.Argument.Benchmarks/Combine.ps1
@@ -2,7 +2,7 @@
 
 [CmdletBinding()]
 Param (
-    [string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net7.0', 'net7.0-windows'),
+    [string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net7.0', 'net7.0-windows', 'net8.0', 'net8.0-windows'),
     [string[]] $Columns = @( 'Runtime', 'TFM', 'LibraryTfm', 'Method', 'Mean', 'Error', 'StdDev', 'Code Size'),
     [string] $ArtifactInputRoot = (Join-Path $PSScriptRoot '..' '..' '__benchmarks'),
     [string] $ResultOutputPath = (Join-Path $PSScriptRoot '..' '..' '__benchmarks' 'results.md'),
@@ -44,6 +44,10 @@ function GetLibraryTfmName ($tfm) {
         return 'net7.0'
     }
 
+    if ($tfm -eq 'net8.0') {
+        return 'net8.0'
+    }
+
     if ($tfm.Contains('-')) {
         return 'netstandard2.1'
     }
diff --git a/test/Treasure.Utils.Argument.Benchmarks/Program.cs b/test/Treasure.Utils.Argument.Benchmarks/Program.cs
index 1890891..b98c908 100644
--- a/test/Treasure.Utils.Argument.Benchmarks/Program.cs
+++ b/test/Treasure.Utils.Argument.Benchmarks/Program.cs
@@ -1,6 +1,6 @@
 // .\Run.ps1
 // or
-// dotnet run -c Release -f [net6.0 net7.0] --filter "*"
+// dotnet run -c Release -f [net6.0 net7.0 net8.0] --filter "*"
 
 #pragma warning disable CA1050
 #pragma warning disable CA1812
diff --git a/test/Treasure.Utils.Argument.Benchmarks/Run.ps1 b/test/Treasure.Utils.Argument.Benchmarks/Run.ps1
index 71bb3b0..07fc9fd 100644
--- a/test/Treasure.Utils.Argument.Benchmarks/Run.ps1
+++ b/test/Treasure.Utils.Argument.Benchmarks/Run.ps1
@@ -2,7 +2,7 @@
 
 [CmdletBinding()]
 Param (
-    [string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net7.0', 'net7.0-windows'),
+    [string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net7.0', 'net7.0-windows', 'net8.0', 'net8.0-windows'),
     [string] $ArtifactOutputRoot = (Join-Path $PSScriptRoot '..' '..' '__benchmarks'),
     [string] $ResultOutputPath = (Join-Path $PSScriptRoot '..' '..' '__benchmarks' 'results.md')
 )
diff --git a/test/Treasure.Utils.Argument.Benchmarks/Treasure.Utils.Argument.Benchmarks.csproj b/test/Treasure.Utils.Argument.Benchmarks/Treasure.Utils.Argument.Benchmarks.csproj
index b5dd885..5591daa 100644
--- a/test/Treasure.Utils.Argument.Benchmarks/Treasure.Utils.Argument.Benchmarks.csproj
+++ b/test/Treasure.Utils.Argument.Benchmarks/Treasure.Utils.Argument.Benchmarks.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net7.0$(PlatformTFMSuffix);net6.0$(PlatformTFMSuffix)</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net8.0$(PlatformTFMSuffix);net7.0$(PlatformTFMSuffix);net6.0$(PlatformTFMSuffix)</TargetFrameworks>
     <RootNamespace>Treasure.Utils.Benchmarks</RootNamespace>
     <IsTestProject>false</IsTestProject>
 
diff --git a/test/Treasure.Utils.Argument.Tests/ArgumentTests.cs b/test/Treasure.Utils.Argument.Tests/ArgumentTests.cs
index 1d7eb1e..b4dfbad 100644
--- a/test/Treasure.Utils.Argument.Tests/ArgumentTests.cs
+++ b/test/Treasure.Utils.Argument.Tests/ArgumentTests.cs
@@ -20,7 +20,7 @@ static void Method(string? useMe)
     public void NotNull()
     {
         // Arrange
-        int[] objectValue = Array.Empty<int>();
+        int[] objectValue = [];
 
         // Act and assert
         Argument.NotNull(objectValue);
diff --git a/test/Treasure.Utils.Argument.Tests/Treasure.Utils.Argument.Tests.csproj b/test/Treasure.Utils.Argument.Tests/Treasure.Utils.Argument.Tests.csproj
index 46f1da9..5622e5c 100644
--- a/test/Treasure.Utils.Argument.Tests/Treasure.Utils.Argument.Tests.csproj
+++ b/test/Treasure.Utils.Argument.Tests/Treasure.Utils.Argument.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);$(DefaultNetStandardTestTFM)</TargetFrameworks>
     <RootNamespace>Treasure.Utils.Tests</RootNamespace>
   </PropertyGroup>