Fixes for .NET core

jacobdufault · May 13, 2017 · c01db30 · c01db30
1 parent cb313ab
commit c01db30
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/Assets/FullSerializer/Source/Converters/Unity/UnityEvent_Converter.cs b/Assets/FullSerializer/Source/Converters/Unity/UnityEvent_Converter.cs
@@ -23,7 +23,7 @@ namespace FullSerializer.Internal.Converters {
     // expected.
     public class UnityEvent_Converter : fsConverter {
         public override bool CanProcess(Type type) {
-            return typeof(UnityEvent).Resolve().IsAssignableFrom(type) && type.IsGenericType == false;
+            return typeof(UnityEvent).Resolve().IsAssignableFrom(type.Resolve()) && type.IsGenericType() == false;
         }
 
         public override bool RequestCycleSupport(Type storageType) {

diff --git a/Assets/FullSerializer/Source/Internal/fsPortableReflection.cs b/Assets/FullSerializer/Source/Internal/fsPortableReflection.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Linq;
 
 #if USE_TYPEINFO
 namespace System {
@@ -25,9 +26,9 @@ public static Type[] GetTypes(this Assembly assembly) {
 
         public static Type GetType(this Assembly assembly, string name, bool throwOnError) {
             var types = assembly.GetTypes();
-            for (int i = 0; i < types.Length; ++i) {
-                if (types[i].Name == name) {
-                    return types[i];
+            foreach (var type in types) {
+                if (type.Name == name) {
+                    return type.GetType();
                 }
             }
 
@@ -109,8 +110,8 @@ public static Attribute GetAttribute(MemberInfo element, Type attributeType, boo
             Attribute attribute;
             if (_cachedAttributeQueries.TryGetValue(query, out attribute) == false) {
                 var attributes = element.GetCustomAttributes(attributeType, /*inherit:*/ true);
-                if (attributes.Length > 0)
-                    attribute = (Attribute)attributes[0];
+                if (attributes.Any())
+                    attribute = (Attribute)attributes.First();
                 if (shouldCache)
                     _cachedAttributeQueries[query] = attribute;
             }

diff --git a/Assets/FullSerializer/Source/Internal/fsTypeExtensions.cs b/Assets/FullSerializer/Source/Internal/fsTypeExtensions.cs
@@ -84,5 +84,32 @@ public static string CSharpName(this Type type, bool includeNamespace) {
 
             return name;
         }
+
+        public static bool IsInterface(this Type type)
+        {
+#if NETFX_CORE
+            return type.GetTypeInfo().IsInterface;
+#else
+            return type.IsInterface;
+#endif
+        }
+
+        public static bool IsAbstract(this Type type)
+        {
+#if NETFX_CORE
+            return type.GetTypeInfo().IsAbstract;
+#else
+            return type.IsAbstract;
+#endif
+        }
+
+        public static bool IsGenericType(this Type type)
+        {
+#if NETFX_CORE
+            return type.GetTypeInfo().IsGenericType;
+#else
+            return type.IsGenericType;
+#endif
+        }
     }
 }
diff --git a/Assets/FullSerializer/Source/Reflection/fsTypeCache.cs b/Assets/FullSerializer/Source/Reflection/fsTypeCache.cs
@@ -115,7 +115,7 @@ private static bool TryIndirectTypeLookup(string typeName, out Type type) {
                 // every type's full name
                 foreach (var foundType in assembly.GetTypes()) {
                     if (foundType.FullName == typeName) {
-                        type = foundType;
+                        type = foundType.GetType();
                         return true;
                     }
                 }

diff --git a/Assets/FullSerializer/Source/fsSerializer.cs b/Assets/FullSerializer/Source/fsSerializer.cs
@@ -285,10 +285,10 @@ public void Clear() {
         private readonly Dictionary<Type, Type> _abstractTypeRemap;
 
         private void RemapAbstractStorageTypeToDefaultType(ref Type storageType) {
-            if ((storageType.IsInterface || storageType.IsAbstract) == false)
+            if ((storageType.IsInterface() || storageType.IsAbstract()) == false)
                 return;
 
-            if (storageType.IsGenericType) {
+            if (storageType.IsGenericType()) {
                 Type remappedGenericType;
                 if (_abstractTypeRemap.TryGetValue(storageType.GetGenericTypeDefinition(), out remappedGenericType)) {
                     Type[] genericArguments = storageType.GetGenericArguments();
@@ -406,7 +406,7 @@ public void RemoveProcessor<TProcessor>() {
         /// IList{T} => List{T} or IDictionary{TKey, TValue} => Dictionary{TKey, TValue}.
         /// </summary>
         public void SetDefaultStorageType(Type abstractType, Type defaultStorageType) {
-            if ((abstractType.IsInterface || abstractType.IsAbstract) == false)
+            if ((abstractType.IsInterface() || abstractType.IsAbstract()) == false)
                 throw new ArgumentException("|abstractType| must be an interface or abstract type");
             _abstractTypeRemap[abstractType] = defaultStorageType;
         }