fixed build.... freaking code anylsis

gentledepp · Dec 7, 2023 · 3534396 · 3534396
1 parent 1f1254c
commit 3534396
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/Castle.Core.AsyncInterceptor/Castle.Core.AsyncInterceptor.csproj b/src/Castle.Core.AsyncInterceptor/Castle.Core.AsyncInterceptor.csproj
@@ -24,6 +24,11 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)SharedKey.snk</AssemblyOriginatorKeyFile>
     <!-- Explanation for the condition https://github.com/dotnet/cli/issues/6911#issuecomment-309647478 and https://github.com/dotnet/cli/issues/6911#issuecomment-310099022 -->
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
+    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>True</EnableNETAnalyzers>
+    <AnalysisLevel>6.0-minimum</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Castle.Core.AsyncInterceptor/NoCoverage/RethrowHelper.cs b/src/Castle.Core.AsyncInterceptor/NoCoverage/RethrowHelper.cs
@@ -18,9 +18,12 @@ internal static class RethrowHelper
     /// <param name="exception">The exception.</param>
     public static void Rethrow(this Exception? exception)
     {
+#if NET6_0_OR_GREATER
+        ArgumentNullException.ThrowIfNull(exception, nameof(exception));
+#else
         if (exception == null)
             throw new ArgumentNullException(nameof(exception));
-
+#endif
         ExceptionDispatchInfo.Capture(exception).Throw();
     }
 
@@ -32,9 +35,12 @@ public static void Rethrow(this Exception? exception)
     /// <param name="exception">The exception.</param>
     public static void RethrowInnerIfAggregate(this Exception? exception)
     {
+#if NET6_0_OR_GREATER
+        ArgumentNullException.ThrowIfNull(exception, nameof(exception));
+#else
         if (exception == null)
             throw new ArgumentNullException(nameof(exception));
-
+#endif
         switch (exception)
         {
             case AggregateException aggregate:
@@ -53,9 +59,12 @@ public static void RethrowInnerIfAggregate(this Exception? exception)
     /// <param name="task">The task.</param>
     public static void RethrowIfFaulted(this Task task)
     {
+#if NET6_0_OR_GREATER
+        ArgumentNullException.ThrowIfNull(task, nameof(task));
+#else
         if (task == null)
             throw new ArgumentNullException(nameof(task));
-
+#endif
         if (task.IsFaulted)
             RethrowInnerIfAggregate(task.Exception);
     }

diff --git a/test/Castle.Core.AsyncInterceptor.Tests/Castle.Core.AsyncInterceptor.Tests.csproj b/test/Castle.Core.AsyncInterceptor.Tests/Castle.Core.AsyncInterceptor.Tests.csproj
@@ -5,6 +5,11 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
+    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>True</EnableNETAnalyzers>
+    <AnalysisLevel>6.0-minimum</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup>