feat: Replace Argument.ThrowIfNull with ArgumentNullException.ThrowIf… (#401)

samtrion · web-flow · commit 9daaf8ade8ac · 2026-03-23T22:02:11.000+01:00
* feat: Replace Argument.ThrowIfNull with ArgumentNullException.ThrowIfNull for built-in null checking

- Remove NetEvolve.Arguments using directives where no longer needed
- Remove coverlet.collector from Directory.Packages.props and test project
- Clean up unused using directives in several files

* fix: Add permissions section to CI workflow for enhanced access control
diff --git a/.csharpierignore b/.csharpierignore
@@ -1,3 +1,3 @@
-**/nuget.config
-**/_snapshots/
-**/_snapshot/
+**/[Nn]u[Gg]et.config
+**/*.verified.*
+**/*.received.*
diff --git a/.editorconfig b/.editorconfig
@@ -44,18 +44,22 @@ generated_code = true
 # XML project files
 [*.{slnx,csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,nativeproj,locproj}]
 indent_size = 2
+max_line_length = 200
 
 # Xml build files
 [*.builds]
 indent_size = 2
+max_line_length = 200
 
 # Xml files
 [*.{xml,stylecop,resx,ruleset}]
 indent_size = 2
+max_line_length = 200
 
 # XML config files
 [*.{props,targets,ruleset,config,nuspec,vsixmanifest,vsct}]
 indent_size = 2
+max_line_length = 200
 
 # JSON files
 [*.json]
@@ -86,10 +90,6 @@ insert_final_newline = false
 [*.sln]
 indent_style = tab
 
-[*.{received,verified}.txt]
-insert_final_newline = false
-trim_trailing_whitespace = false
-
 [*.{cs,csx,vb,vbx}]
 # .NET Code Style Settings
 # See https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
@@ -266,19 +266,18 @@ dotnet_diagnostic.IDE0290.severity                                      = sugges
 # [CSharpier] Incompatible rules deactivated
 # https://csharpier.com/docs/IntegratingWithLinters#code-analysis-rules
 dotnet_diagnostic.IDE0055.severity                                      = none
-dotnet_diagnostic.SA1000.severity                                       = none
-dotnet_diagnostic.SA1009.severity                                       = none
-dotnet_diagnostic.SA1111.severity                                       = none
-dotnet_diagnostic.SA1118.severity                                       = none
-dotnet_diagnostic.SA1137.severity                                       = none
-dotnet_diagnostic.SA1413.severity                                       = none
-dotnet_diagnostic.SA1500.severity                                       = none
-dotnet_diagnostic.SA1501.severity                                       = none
-dotnet_diagnostic.SA1502.severity                                       = none
-dotnet_diagnostic.SA1504.severity                                       = none
-dotnet_diagnostic.SA1515.severity                                       = none
-dotnet_diagnostic.SA1516.severity                                       = none
 
 # Support for NetEvolve.Arguments Methods
 # https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1062#null-check-validation-methods
 dotnet_code_quality.CA1062.null_check_validation_methods                = M:NetEvolve.Arguments.Argument.ThrowIfNull(System.Object,System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNull(System.Void*,System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNullOrEmpty(System.String,System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNullOrEmpty``1(System.Collections.Generic.IEnumerable{``0},System.String)|M:NetEvolve.Arguments.Argument.ThrowIfNullOrWhiteSpace(System.String,System.String)
+
+# Disable all style rules for generated code
+[*.{received,verified}.*]
+generated_code = true
+# Disable all style rules for migrations
+dotnet_analyzer_diagnostic.severity = none
+
+[**/Migrations/*.{cs,csx,vb,vbx}]
+generated_code = true
+# Disable all style rules for migrations
+dotnet_analyzer_diagnostic.severity = none
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -18,6 +18,12 @@ on:
           - detailed
           - diagnostic
 
+permissions:
+  actions: read
+  contents: write
+  pull-requests: write
+  security-events: write
+
 jobs:
   all:
     if: github.run_id != 1
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -13,7 +13,6 @@
     <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.21.0.135717" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2" />
     <PackageVersion Include="NetEvolve.Arguments" Version="3.2.84" />
diff --git a/src/NetEvolve.FluentValue/Constraints/ConstraintBase.cs b/src/NetEvolve.FluentValue/Constraints/ConstraintBase.cs
@@ -1,7 +1,6 @@
 ﻿namespace NetEvolve.FluentValue.Constraints;
 
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/NetEvolve.FluentValue/Constraints/DefaultConstraint.cs b/src/NetEvolve.FluentValue/Constraints/DefaultConstraint.cs
@@ -1,6 +1,5 @@
 ﻿namespace NetEvolve.FluentValue.Constraints;
 
-using System;
 using System.Text;
 using NetEvolve.FluentValue;
 
diff --git a/src/NetEvolve.FluentValue/Constraints/ParenthesisConstraint.cs b/src/NetEvolve.FluentValue/Constraints/ParenthesisConstraint.cs
@@ -1,7 +1,6 @@
 ﻿namespace NetEvolve.FluentValue.Constraints;
 
 using System.Text;
-using NetEvolve.Arguments;
 using NetEvolve.FluentValue;
 
 internal sealed class ParenthesisConstraint : ConstraintBase
@@ -10,14 +9,14 @@ internal sealed class ParenthesisConstraint : ConstraintBase
 
     internal ParenthesisConstraint(IConstraint constraint)
     {
-        Argument.ThrowIfNull(constraint);
+        ArgumentNullException.ThrowIfNull(constraint);
 
         _constraint = (ConstraintBase)constraint;
     }
 
     public override bool IsSatisfiedBy(object? value)
     {
-        Argument.ThrowIfNull(_constraint);
+        ArgumentNullException.ThrowIfNull(_constraint);
 
         return _constraint.IsSatisfiedBy(value);
     }
diff --git a/src/NetEvolve.FluentValue/Operators/AndOperator.cs b/src/NetEvolve.FluentValue/Operators/AndOperator.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Text;
-using NetEvolve.Arguments;
 using NetEvolve.FluentValue;
 using NetEvolve.FluentValue.Constraints;
 
@@ -13,7 +12,7 @@ internal sealed class AndOperator : ConstraintBase, IOperator
 
     internal AndOperator(IConstraint left)
     {
-        Argument.ThrowIfNull(left);
+        ArgumentNullException.ThrowIfNull(left);
 
         _left = left;
     }
@@ -30,7 +29,7 @@ public override bool IsSatisfiedBy(object? value)
 
     public IConstraint SetConstraint(IConstraint constraint)
     {
-        Argument.ThrowIfNull(constraint);
+        ArgumentNullException.ThrowIfNull(constraint);
 
         if (_right is NotOperator notOperator)
         {
diff --git a/src/NetEvolve.FluentValue/Operators/NotOperator.cs b/src/NetEvolve.FluentValue/Operators/NotOperator.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Text;
-using NetEvolve.Arguments;
 using NetEvolve.FluentValue;
 using NetEvolve.FluentValue.Constraints;
 
@@ -24,7 +23,7 @@ public override bool IsSatisfiedBy(object? value)
 
     public IConstraint SetConstraint(IConstraint constraint)
     {
-        Argument.ThrowIfNull(constraint);
+        ArgumentNullException.ThrowIfNull(constraint);
 
         _constraint = constraint;
 
diff --git a/src/NetEvolve.FluentValue/Operators/OrOperator.cs b/src/NetEvolve.FluentValue/Operators/OrOperator.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Text;
-using NetEvolve.Arguments;
 using NetEvolve.FluentValue;
 using NetEvolve.FluentValue.Constraints;
 
@@ -13,7 +12,7 @@ internal sealed class OrOperator : ConstraintBase, IOperator
 
     internal OrOperator(IConstraint left)
     {
-        Argument.ThrowIfNull(left);
+        ArgumentNullException.ThrowIfNull(left);
 
         _left = left;
     }
@@ -30,7 +29,7 @@ public override bool IsSatisfiedBy(object? value)
 
     public IConstraint SetConstraint(IConstraint constraint)
     {
-        Argument.ThrowIfNull(constraint);
+        ArgumentNullException.ThrowIfNull(constraint);
 
         if (_right is NotOperator notOperator)
         {
diff --git a/src/NetEvolve.FluentValue/Operators/XorOperator.cs b/src/NetEvolve.FluentValue/Operators/XorOperator.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Text;
-using NetEvolve.Arguments;
 using NetEvolve.FluentValue;
 using NetEvolve.FluentValue.Constraints;
 
@@ -13,7 +12,7 @@ internal sealed class XorOperator : ConstraintBase, IOperator
 
     internal XorOperator(IConstraint left)
     {
-        Argument.ThrowIfNull(left);
+        ArgumentNullException.ThrowIfNull(left);
 
         _left = left;
     }
@@ -30,7 +29,7 @@ public override bool IsSatisfiedBy(object? value)
 
     public IConstraint SetConstraint(IConstraint constraint)
     {
-        Argument.ThrowIfNull(constraint);
+        ArgumentNullException.ThrowIfNull(constraint);
 
         if (_right is NotOperator notOperator)
         {
diff --git a/tests/NetEvolve.FluentValue.Tests.Unit/NetEvolve.FluentValue.Tests.Unit.csproj b/tests/NetEvolve.FluentValue.Tests.Unit/NetEvolve.FluentValue.Tests.Unit.csproj
@@ -4,10 +4,6 @@
     <TargetFrameworks>$(NetEvolve_TestTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <PackageReference Include="NetEvolve.Extensions.TUnit" />
     <PackageReference Include="TUnit" />
diff --git a/tests/NetEvolve.FluentValue.Tests.Unit/TypeExtensionsTests.cs b/tests/NetEvolve.FluentValue.Tests.Unit/TypeExtensionsTests.cs
@@ -1,9 +1,6 @@
 ﻿namespace NetEvolve.FluentValue.Tests.Unit;
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 public class TypeExtensionsTests

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`namespace NetEvolve.FluentValue.Constraints;`
`2`	`2`
`3`	`3`	`using System.Text;`
`4`		`-using NetEvolve.Arguments;`
`5`	`4`	`using NetEvolve.FluentValue;`
`6`	`5`
`7`	`6`	`internal sealed class ParenthesisConstraint : ConstraintBase`
`@@ -10,14 +9,14 @@ internal sealed class ParenthesisConstraint : ConstraintBase`
`10`	`9`
`11`	`10`	`internal ParenthesisConstraint(IConstraint constraint)`
`12`	`11`	`{`
`13`		`- Argument.ThrowIfNull(constraint);`
	`12`	`+ ArgumentNullException.ThrowIfNull(constraint);`
`14`	`13`
`15`	`14`	`_constraint = (ConstraintBase)constraint;`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`public override bool IsSatisfiedBy(object? value)`
`19`	`18`	`{`
`20`		`- Argument.ThrowIfNull(_constraint);`
	`19`	`+ ArgumentNullException.ThrowIfNull(_constraint);`
`21`	`20`
`22`	`21`	`return _constraint.IsSatisfiedBy(value);`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`	`using System.Text;`
`5`		`-using NetEvolve.Arguments;`
`6`	`5`	`using NetEvolve.FluentValue;`
`7`	`6`	`using NetEvolve.FluentValue.Constraints;`
`8`	`7`
`@@ -13,7 +12,7 @@ internal sealed class AndOperator : ConstraintBase, IOperator`
`13`	`12`
`14`	`13`	`internal AndOperator(IConstraint left)`
`15`	`14`	`{`
`16`		`- Argument.ThrowIfNull(left);`
	`15`	`+ ArgumentNullException.ThrowIfNull(left);`
`17`	`16`
`18`	`17`	`_left = left;`
`19`	`18`	`}`
`@@ -30,7 +29,7 @@ public override bool IsSatisfiedBy(object? value)`
`30`	`29`
`31`	`30`	`public IConstraint SetConstraint(IConstraint constraint)`
`32`	`31`	`{`
`33`		`- Argument.ThrowIfNull(constraint);`
	`32`	`+ ArgumentNullException.ThrowIfNull(constraint);`
`34`	`33`
`35`	`34`	`if (_right is NotOperator notOperator)`
`36`	`35`	`{`