From 12ca06416a2cac738e6a19ed490c11906a076f50 Mon Sep 17 00:00:00 2001
From: sebas77 <ssense@tiscali.it>
Date: Sat, 18 Feb 2017 13:31:40 +0000
Subject: [PATCH] FIX UWP (.net) compatibility

---
 ECS/EnginesRoot.cs            | 12 +++++++++++-
 Utilities/WeakActionStruct.cs | 19 +------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ECS/EnginesRoot.cs b/ECS/EnginesRoot.cs
index ab30b18..0f1867a 100644
--- a/ECS/EnginesRoot.cs
+++ b/ECS/EnginesRoot.cs
@@ -8,6 +8,9 @@ using WeakReference = Svelto.DataStructures.WeakReference<Svelto.ECS.EnginesRoot
 #if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
 using Svelto.ECS.Profiler;
 #endif
+#if NETFX_CORE
+using System.Reflection;
+#endif
 
 namespace Svelto.ECS
 {
@@ -122,9 +125,16 @@ namespace Svelto.ECS
 
                 return;
             }
-
+#if !NETFX_CORE
             var baseType = engine.GetType().BaseType;
+
             if (baseType.IsGenericType)
+#else
+            var baseType = engine.GetType().GetTypeInfo().BaseType;
+
+            if (baseType.IsConstructedGenericType)
+#endif
+            
             {
                 var genericType = baseType.GetGenericTypeDefinition();
 
diff --git a/Utilities/WeakActionStruct.cs b/Utilities/WeakActionStruct.cs
index 163f5f3..8bb39b4 100644
--- a/Utilities/WeakActionStruct.cs
+++ b/Utilities/WeakActionStruct.cs
@@ -12,16 +12,11 @@ namespace BetterWeakEvents
         public WeakAction(Action<T1, T2> listener)
         {
             ObjectRef = GCHandle.Alloc(listener.Target, GCHandleType.Weak);
+
 #if !NETFX_CORE
             Method = listener.Method;
-
-            if (Method.DeclaringType.GetCustomAttributes(typeof(CompilerGeneratedAttribute), false).Length != 0)
-                throw new ArgumentException("Cannot create weak event to anonymous method with closure.");
 #else
             Method = listener.GetMethodInfo();
-        
-            if (CustomAttributeExtensions.IsDefined(Method, typeof(CompilerGeneratedAttribute), false) == false)
-                throw new ArgumentException("Cannot create weak event to anonymous method with closure.");
 #endif
         }
 
@@ -58,14 +53,8 @@ namespace BetterWeakEvents
             ObjectRef = GCHandle.Alloc(listener.Target, GCHandleType.Weak);
 #if !NETFX_CORE
             Method = listener.Method;
-
-            if (Method.DeclaringType.GetCustomAttributes(typeof(CompilerGeneratedAttribute), false).Length != 0)
-                throw new ArgumentException("Cannot create weak event to anonymous method with closure.");
 #else
             Method = listener.GetMethodInfo();
-        
-            if (CustomAttributeExtensions.IsDefined(Method, typeof(CompilerGeneratedAttribute), false) == false)
-                throw new ArgumentException("Cannot create weak event to anonymous method with closure.");
 #endif
         }
 
@@ -102,14 +91,8 @@ namespace BetterWeakEvents
             ObjectRef = GCHandle.Alloc(listener.Target, GCHandleType.Weak);
 #if !NETFX_CORE
             Method = listener.Method;
-
-            if (Method.DeclaringType.GetCustomAttributes(typeof(CompilerGeneratedAttribute), false).Length != 0)
-                throw new ArgumentException("Cannot create weak event to anonymous method with closure.");
 #else
             Method = listener.GetMethodInfo();
-        
-            if (CustomAttributeExtensions.IsDefined(Method, typeof(CompilerGeneratedAttribute), false) == false)
-                throw new ArgumentException("Cannot create weak event to anonymous method with closure.");
 #endif
         }