Tidy up type extensions

Author: russcam

src/Nest/CommonAbstractions/Extensions/TypeExtensions.cs

@@ -85,7 +85,7 @@ private static ObjectActivator<T> GetActivator<T>(ConstructorInfo ctor)
 			Expression[] argsExp =
 				new Expression[paramsInfo.Length];
 
-			//pick each arg from the params array 
+			//pick each arg from the params array
 			//and create a typed expression of them
 			for (int i = 0; i < paramsInfo.Length; i++)
 			{
@@ -124,43 +124,5 @@ internal static IList<JsonProperty> GetCachedObjectProperties(this Type t, Membe
 			_cachedTypeProperties.TryAdd(t, propertyDictionary);
 			return propertyDictionary;
 		}
-
-#if DOTNETCORE
-		internal static bool IsAssignableFrom(this Type t, Type other) => t.GetTypeInfo().IsAssignableFrom(other.GetTypeInfo());
-#endif
-
-		internal static bool IsGeneric(this Type type)
-		{
-#if DOTNETCORE
-			return type.GetTypeInfo().IsGenericType;
-#else
-			return type.IsGenericType;
-#endif
-		}
-
-		internal static bool IsValue(this Type type)
-		{
-#if DOTNETCORE
-			return type.GetTypeInfo().IsValueType;
-#else
-			return type.IsValueType;
-#endif
-		}
-
-		internal static bool IsEnumType(this Type type)
-		{
-#if DOTNETCORE
-			return type.GetTypeInfo().IsEnum;
-#else
-			return type.IsEnum;
-#endif
-		}
-
-#if DOTNETCORE
-		internal static IEnumerable<Type> GetInterfaces(this Type type)
-		{
-			return type.GetTypeInfo().ImplementedInterfaces;
-		}
-#endif
 	}
-}
+}

src/Nest/CrossPlatform/TypeExtensions.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace Elasticsearch.Net
+namespace Nest
 {
 	internal static class DotNetCoreTypeExtensions
 	{
@@ -69,5 +69,25 @@ internal static TypeCode GetTypeCode(this Type type)
 				return TypeCode.Object;
 #endif
 		}
+
+#if DOTNETCORE
+		internal static bool IsAssignableFrom(this Type t, Type other) => t.GetTypeInfo().IsAssignableFrom(other.GetTypeInfo());
+#endif
+
+		internal static bool IsEnumType(this Type type)
+		{
+#if DOTNETCORE
+			return type.GetTypeInfo().IsEnum;
+#else
+			return type.IsEnum;
+#endif
+		}
+
+#if DOTNETCORE
+		internal static IEnumerable<Type> GetInterfaces(this Type type)
+		{
+			return type.GetTypeInfo().ImplementedInterfaces;
+		}
+#endif
 	}
 }