Merge pull request #316 from xt0rted/dotnet8

Support .net 8

.vscode/settings.json

@@ -2,5 +2,6 @@
     "cSpell.words": [
         "appsettings",
         "tailwindcss"
-    ]
-}
+    ],
+    "dotnet.defaultSolution": "TailwindCssTagHelpers.sln"
+}

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- Dropped support for .NET 6
+- Dropped support for .NET 7
+- Added support for .NET 8
+
 ## [0.5.0](https://github.com/xt0rted/tailwindcss-tag-helpers/compare/v0.4.0...v0.5.0) - 2023-02-24
 
 - Dropped support for .NET Core 3.1

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

global.json

@@ -1,16 +1,15 @@
 {
   "sdk": {
-    "version": "7.0.407"
+    "version": "8.0.203"
   },
   "scripts": {
     "clean": "dotnet rimraf artifacts",
     "clean:bin": "dotnet rimraf **/bin **/obj",
     "build": "dotnet build",
     "test": "dotnet test",
-    "test:31": "dotnet test --framework netcoreapp3.1",
-    "test:6": "dotnet test --framework net6.0",
     "pack": "dotnet pack --output ./artifacts",
     "ci": "dotnet r build test pack",
-    "watch": "dotnet watch [env:DOTNET_WATCH_RESTART_ON_RUDE_EDIT=true] --verbose --project sample"
+    "watch": "dotnet r [env:DOTNET_WATCH_RESTART_ON_RUDE_EDIT=true] watch:sample",
+    "watch:sample": "dotnet watch --verbose --project sample"
   }
 }

sample/Sample.csproj

@@ -1,10 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <TargetFrameworks></TargetFrameworks>
-  </PropertyGroup>
-
   <ItemGroup>
     <Using Include="Microsoft.AspNetCore.Mvc" />
     <Using Include="Microsoft.AspNetCore.Mvc.RazorPages" />

src/LinkAriaCurrentStateTagHelper.cs

@@ -29,8 +29,8 @@ public LinkAriaCurrentStateTagHelper(
 
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
-        if (context is null) throw new ArgumentNullException(nameof(context));
-        if (output is null) throw new ArgumentNullException(nameof(output));
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(output);
 
         if (!context.Items.TryGetValue(typeof(LinkContext), out var ctx) || ctx is not LinkContext linkContext)
         {

src/LinkChildTagHelper.cs

@@ -14,8 +14,8 @@ public LinkChildTagHelper(IOptions<TagOptions> settings)
 
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
-        if (context is null) throw new ArgumentNullException(nameof(context));
-        if (output is null) throw new ArgumentNullException(nameof(output));
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(output);
 
         if (!context.Items.TryGetValue(typeof(LinkContext), out var contextItem) || contextItem is not LinkContext linkContext)
         {

src/LinkTagHelper.cs

@@ -21,8 +21,8 @@ public LinkTagHelper(IOptions<TagOptions> settings)
 
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
-        if (context is null) throw new ArgumentNullException(nameof(context));
-        if (output is null) throw new ArgumentNullException(nameof(output));
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(output);
 
         var currentPath = ViewContext.HttpContext.Request.Path;
         var linkPath = new PathString(output.Attributes.GetValue("href"));

src/LinkTagHelperBase.cs

@@ -37,7 +37,7 @@ protected LinkTagHelperBase(IOptions<TagOptions> settings)
 
     protected void MergeClassLists(TagHelperOutput output, bool isMatch)
     {
-        if (output is null) throw new ArgumentNullException(nameof(output));
+        ArgumentNullException.ThrowIfNull(output);
 
         var classList = isMatch
             ? Utilities.SplitClassList(CurrentClass)

src/ParentContextNotFoundException.cs

@@ -1,8 +1,5 @@
 namespace Tailwind.Css.TagHelpers;
 
-using System.Runtime.Serialization;
-
-[Serializable]
 public class ParentContextNotFoundException : Exception
 {
     public ParentContextNotFoundException()
@@ -19,9 +16,4 @@ public ParentContextNotFoundException(string? message, Exception? innerException
         : base(message, innerException)
     {
     }
-
-    protected ParentContextNotFoundException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
 }

src/TailwindCssExtensions.cs

@@ -8,8 +8,8 @@ public static class TailwindCssExtensions
 {
     public static IServiceCollection AddTailwindCssTagHelpers(this IServiceCollection services, IConfiguration configuration)
     {
-        if (services is null) throw new ArgumentNullException(nameof(services));
-        if (configuration is null) throw new ArgumentNullException(nameof(configuration));
+        ArgumentNullException.ThrowIfNull(services);
+        ArgumentNullException.ThrowIfNull(configuration);
 
         services.Configure<TagOptions>(configuration.GetSection("TailwindCss"));
 
@@ -18,8 +18,8 @@ public static IServiceCollection AddTailwindCssTagHelpers(this IServiceCollectio
 
     public static IServiceCollection AddTailwindCssTagHelpers(this IServiceCollection services, Action<TagOptions> configureOptions)
     {
-        if (services is null) throw new ArgumentNullException(nameof(services));
-        if (configureOptions is null) throw new ArgumentNullException(nameof(configureOptions));
+        ArgumentNullException.ThrowIfNull(services);
+        ArgumentNullException.ThrowIfNull(configureOptions);
 
         services.Configure(configureOptions);
 

src/TailwindCssTagHelpers.csproj

@@ -40,10 +40,6 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
 </Project>

src/ValidationStatusTagHelper.cs

@@ -46,8 +46,8 @@ public ValidationStatusTagHelper(IOptions<TagOptions> settings)
 
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
-        if (context is null) throw new ArgumentNullException(nameof(context));
-        if (output is null) throw new ArgumentNullException(nameof(output));
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(output);
 
         if (For is null)
         {