Fixing PCL unit tests

Author: Elad Zelingher

src/net45/WampSharp/Core/Utilities/TypeExtensions.cs

@@ -136,7 +136,14 @@ public static bool IsAssignableFrom(this Type interfaceType, Type type)
 
         public static Type[] GetGenericArguments(this Type type)
         {
-            return type.GenericTypeArguments;
+            TypeInfo typeInfo = type.GetTypeInfo();
+
+            if (typeInfo.IsGenericTypeDefinition)
+            {
+                return typeInfo.GenericTypeParameters;
+            }
+
+            return typeInfo.GenericTypeArguments;
         }
 
         public static MethodInfo GetMethod(this Type type, string methodName)

src/net45/WampSharp/Core/Utilities/ValueTuple/ValueTupleArrayConverter.cs

@@ -52,8 +52,10 @@ private Func<object[], object> BuildToTuple()
             ParameterExpression array =
                 Expression.Parameter(typeof(object[]), "array");
 
+            int tupleLength = mTupleType.GetValueTupleLength();
+
             IEnumerable<BinaryExpression> tupleItemValues =
-                Enumerable.Range(0, mTupleType.GetValueTupleLength())
+                Enumerable.Range(0, tupleLength)
                           .Select(index => Expression.ArrayIndex(array, Expression.Constant(index)));
 
             // new ValueTuple<T1, T2, ..>((T1)array[0],(T2)array[1], ...)

src/net45/WampSharp/Core/Utilities/ValueTuple/ValueTupleTypeExtensions.cs

@@ -40,15 +40,18 @@ public static int GetValueTupleLength(this Type type)
 
             Type genericTypeDefinition = type.GetGenericTypeDefinition();
 
+            Type[] genericArguments = genericTypeDefinition.GetGenericArguments();
+
+            int tupleLength = genericArguments.Length;
             if (!genericTypeDefinition.IsLongTuple())
             {
-                return genericTypeDefinition.GetGenericArguments().Length;
+                return tupleLength;
             }
             else
             {
                 Type last = type.GetGenericArguments().Last();
 
-                return (genericTypeDefinition.GetGenericArguments().Length - 1) +
+                return (tupleLength - 1) +
                        last.GetValueTupleLength();
             }
         }