Make .NET Core's InstanceOfType impl match .NET 4.5

Author: mythz

src/ServiceStack.Text/PlatformExtensions.cs

@@ -972,9 +972,11 @@ public static MethodInfo GetMethodInfo(this PropertyInfo pi, bool nonPublic = tr
         public static bool InstanceOfType(this Type type, object instance)
         {
 #if (NETFX_CORE || PCL || NETSTANDARD1_1)
-            return instance.GetType().IsInstanceOf(type);
+            var result = instance != null && type.GetTypeInfo().IsAssignableFrom(instance.GetType().GetTypeInfo()); //https://stackoverflow.com/a/24712250/85785
+            return result;
 #else
-            return type.IsInstanceOfType(instance);
+            var result = type.IsInstanceOfType(instance);
+            return result;
 #endif
         }
 

tests/ServiceStack.Text.Tests.xUnit/UnitTest1.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Reflection;
 using ServiceStack.Web;
 using Xunit;
 
@@ -19,5 +20,11 @@ public void Can_create_DTO_with_Stream()
             var o = typeof(RawRequest).CreateInstance();
             var requestObj = AutoMappingUtils.PopulateWith(o);
         }
+
+        [Fact]
+        public void Nullable_int_and_object_int_are_of_same_Type()
+        {
+            Assert.True(typeof(int?).IsInstanceOfType(1));
+        }
     }
 }

tests/ServiceStack.Text.Tests/AutoMappingObjectDictionaryTests.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Northwind.Common.DataModel;
 using NUnit.Framework;
 
 namespace ServiceStack.Text.Tests
@@ -77,5 +78,34 @@ public void Can_Convert_from_ObjectDictionary_with_Different_Types_with_camelCas
             Assert.That(fromDict.Car.Age, Is.EqualTo(10));
             Assert.That(fromDict.Car.Name, Is.EqualTo("SubCar"));
         }
+
+        public class QueryCustomers : QueryDb<Customer>
+        {
+            public string CustomerId { get; set; }
+            public string[] CountryIn { get; set; }
+            public string[] CityIn { get; set; }
+        }
+
+        [Test]
+        public void Can_convert_from_ObjectDictionary_into_AutoQuery_DTO()
+        {
+            var map = new Dictionary<string, object>
+            {
+                { "CustomerId", "CustomerId"},
+                { "CountryIn", new[]{"UK", "Germany"}},
+                { "CityIn", "London,Berlin"},
+                { "take", 5 },
+                { "Meta", "{foo:bar}" },
+            };
+
+            var request = map.FromObjectDictionary<QueryCustomers>();
+
+            Assert.That(request.CustomerId, Is.EqualTo("CustomerId"));
+            Assert.That(request.CountryIn, Is.EquivalentTo(new[]{"UK", "Germany" }));
+            Assert.That(request.CityIn, Is.EquivalentTo(new[]{ "London", "Berlin" }));
+            Assert.That(request.Take, Is.EqualTo(5));
+            Assert.That(request.Meta, Is.EquivalentTo(new Dictionary<string, object> {{"foo", "bar"}}));
+        }
+
     }
 }

tests/ServiceStack.Text.Tests/Issues/IsInstanceOfTypeIssues.cs

@@ -0,0 +1,14 @@
+using System;
+using NUnit.Framework;
+
+namespace ServiceStack.Text.Tests.Issues
+{    
+    public class IsInstanceOfTypeIssues
+    {
+        [Test]
+        public void Nullable_int_and_object_int_are_of_same_Type()
+        {
+            Assert.That(typeof(int?).IsInstanceOfType(1));
+        }
+    }
+}