From a5bfedd97cd7af5eb593985209c52709fb96f5e1 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Thu, 26 Jul 2018 00:17:34 +0200
Subject: [PATCH] [SL.Core] Make Guard.NotNull() and DebugGuard.NotNull()
 generic

---
 src/SixLabors.Core/Helpers/DebugGuard.cs              | 4 +++-
 src/SixLabors.Core/Helpers/Guard.cs                   | 4 +++-
 src/SixLabors.Core/SixLabors.Core.csproj.DotSettings  | 2 ++
 tests/SixLabors.Core.Tests/Helpers/DebugGuardTests.cs | 2 +-
 tests/SixLabors.Core.Tests/Helpers/GuardTests.cs      | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 src/SixLabors.Core/SixLabors.Core.csproj.DotSettings

diff --git a/src/SixLabors.Core/Helpers/DebugGuard.cs b/src/SixLabors.Core/Helpers/DebugGuard.cs
index c649372ee..f41d7eacf 100644
--- a/src/SixLabors.Core/Helpers/DebugGuard.cs
+++ b/src/SixLabors.Core/Helpers/DebugGuard.cs
@@ -19,8 +19,10 @@ namespace SixLabors
         /// <param name="target">The target object, which cannot be null.</param>
         /// <param name="parameterName">The name of the parameter that is to be checked.</param>
         /// <exception cref="ArgumentNullException"><paramref name="target"/> is null</exception>
+        /// <typeparam name="T">The type of the object to verify</typeparam>
         [Conditional("DEBUG")]
-        public static void NotNull(object target, string parameterName)
+        public static void NotNull<T>(T target, string parameterName)
+            where T : class
         {
             if (target == null)
             {
diff --git a/src/SixLabors.Core/Helpers/Guard.cs b/src/SixLabors.Core/Helpers/Guard.cs
index 3a38551d8..41db42fc1 100644
--- a/src/SixLabors.Core/Helpers/Guard.cs
+++ b/src/SixLabors.Core/Helpers/Guard.cs
@@ -22,7 +22,9 @@ namespace SixLabors
         /// <param name="parameterName">The name of the parameter that is to be checked.</param>
         /// <param name="message">The error message, if any to add to the exception.</param>
         /// <exception cref="ArgumentNullException"><paramref name="target"/> is null</exception>
-        public static void NotNull(object target, string parameterName, string message = "")
+        /// <typeparam name="T">The type of the object to verify</typeparam>
+        public static void NotNull<T>(T target, string parameterName, string message = "")
+            where T : class
         {
             if (target == null)
             {
diff --git a/src/SixLabors.Core/SixLabors.Core.csproj.DotSettings b/src/SixLabors.Core/SixLabors.Core.csproj.DotSettings
new file mode 100644
index 000000000..8b01856ae
--- /dev/null
+++ b/src/SixLabors.Core/SixLabors.Core.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=helpers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/tests/SixLabors.Core.Tests/Helpers/DebugGuardTests.cs b/tests/SixLabors.Core.Tests/Helpers/DebugGuardTests.cs
index 99661dfe0..843b74ded 100644
--- a/tests/SixLabors.Core.Tests/Helpers/DebugGuardTests.cs
+++ b/tests/SixLabors.Core.Tests/Helpers/DebugGuardTests.cs
@@ -39,7 +39,7 @@ namespace SixLabors.Helpers.Tests
         {
             Assert.Throws<ArgumentNullException>(() =>
             {
-                DebugGuard.NotNull(null, "myParamName");
+                DebugGuard.NotNull((object)null, "myParamName");
             });
         }
 
diff --git a/tests/SixLabors.Core.Tests/Helpers/GuardTests.cs b/tests/SixLabors.Core.Tests/Helpers/GuardTests.cs
index 95901c774..ed2e0b5c7 100644
--- a/tests/SixLabors.Core.Tests/Helpers/GuardTests.cs
+++ b/tests/SixLabors.Core.Tests/Helpers/GuardTests.cs
@@ -21,7 +21,7 @@ namespace SixLabors.Helpers.Tests
         {
             Assert.Throws<ArgumentNullException>(() =>
             {
-                Guard.NotNull(null, "myParamName");
+                Guard.NotNull((object)null, "myParamName");
             });
         }
 
@@ -30,7 +30,7 @@ namespace SixLabors.Helpers.Tests
         {
             var exception = Assert.Throws<ArgumentNullException>(() =>
             {
-                Guard.NotNull(null, "myParamName", "myTestMessage");
+                Guard.NotNull((object)null, "myParamName", "myTestMessage");
             });
 
             Assert.Equal("myParamName", exception.ParamName);