Revert "Moving expressions completely out of the core library for iOS"

This reverts commit bc2ece1.

Author: jbogard

src/AutoMapper/AutoMapper.Android.csproj

@@ -56,7 +56,6 @@
     <Compile Include="Mappers\NameValueCollectionMapper.cs" />
     <Compile Include="Mappers\PlatformSpecificMapperRegistryOverride.cs" />
     <Compile Include="Mappers\TypeConverterMapper.cs" />
-    <Compile Include="QueryableExtensions.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
   </ItemGroup>
   <ItemGroup>

src/AutoMapper/AutoMapper.Net4.csproj

@@ -61,7 +61,6 @@
     <Compile Include="Mappers\NameValueCollectionMapper.cs" />
     <Compile Include="Mappers\TypeConverterMapper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryableExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AutoMapper\AutoMapper.csproj">

src/AutoMapper/AutoMapper.SL5.csproj

@@ -69,7 +69,6 @@
     <Compile Include="Mappers\PlatformSpecificMapperRegistryOverride.cs" />
     <Compile Include="Mappers\TypeConverterMapper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryableExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="AutoMapper.csproj">

src/AutoMapper/AutoMapper.WP8.csproj

@@ -52,7 +52,6 @@
     <Compile Include="Mappers\PlatformSpecificMapperRegistryOverride.cs" />
     <Compile Include="Mappers\TypeConverterMapper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryableExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="AutoMapper.csproj">

src/AutoMapper/AutoMapper.WPA81.csproj

@@ -98,7 +98,6 @@
     <Compile Include="Mappers\HashSetMapper.cs" />
     <Compile Include="Mappers\PlatformSpecificMapperRegistryOverride.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryableExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\AutoMapper.snk">

src/AutoMapper/AutoMapper.WinRT.csproj

@@ -110,7 +110,6 @@
     <Compile Include="Mappers\HashSetMapper.cs" />
     <Compile Include="Mappers\PlatformSpecificMapperRegistryOverride.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryableExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="AutoMapper.csproj">

src/AutoMapper/AutoMapper.csproj

@@ -145,6 +145,7 @@
     <Compile Include="PropertyMap.cs" />
     <Compile Include="Internal\ReflectionHelper.cs" />
     <Compile Include="Internal\ProxyBase.cs" />
+    <Compile Include="QueryableExtensions.cs" />
     <Compile Include="ResolutionContext.cs" />
     <Compile Include="Internal\ResolutionExpression.cs" />
     <Compile Include="ResolutionResult.cs" />

src/AutoMapper/QueryableExtensions.cs

@@ -131,8 +131,8 @@ private static List<MemberBinding> CreateMemberBindings(IMappingEngine mappingEn
                 }
                 else if (result.Type != propertyMap.DestinationPropertyType &&
                     // avoid nullable etc.
-                         propertyMap.DestinationPropertyType.GetBaseType() != typeof(ValueType) &&
-                         propertyMap.DestinationPropertyType.GetBaseType() != typeof(Enum))
+                         propertyMap.DestinationPropertyType.BaseType != typeof(ValueType) &&
+                         propertyMap.DestinationPropertyType.BaseType != typeof(Enum))
                 {
                     bindExpression = BindMappedTypeExpression(mappingEngine, propertyMap, result, destinationMember, typePairCount);
                 }
@@ -388,83 +388,4 @@ public IQueryable<TResult> To<TResult>()
             return _source.Select(expr);
         }
     }
-
-#if NETFX_CORE
-    internal static class ExtensionMethods
-    {
-        public static PropertyInfo GetProperty(this Type type, String propertyName)
-        {
-            return type.GetTypeInfo().GetDeclaredProperty(propertyName);
-        }
-
-        public static MethodInfo GetMethod(this Type type, String methodName)
-        {
-            return type.GetTypeInfo().GetDeclaredMethod(methodName);
-        }
-
-        public static bool IsSubclassOf(this Type type, Type parentType)
-        {
-            return type.GetTypeInfo().IsSubclassOf(parentType);
-        }
-
-        public static bool IsAssignableFrom(this Type type, Type parentType)
-        {
-            return type.GetTypeInfo().IsAssignableFrom(parentType.GetTypeInfo());
-        }
-
-        public static bool IsEnum(this Type type)
-        {
-            return type.GetTypeInfo().IsEnum;
-        }
-
-        public static bool IsPrimitive(this Type type)
-        {
-            return type.GetTypeInfo().IsPrimitive;
-        }
-
-        public static Type GetBaseType(this Type type)
-        {
-            return type.GetTypeInfo().BaseType;
-        }
-
-        public static bool IsGenericType(this Type type)
-        {
-            return type.GetTypeInfo().IsGenericType;
-        }
-
-        public static Type[] GetGenericArguments(this Type type)
-        {
-            return type.GetTypeInfo().GenericTypeArguments;
-        }
-
-        public static object GetPropertyValue(this Object instance, string propertyValue)
-        {
-            return instance.GetType().GetTypeInfo().GetDeclaredProperty(propertyValue).GetValue(instance);
-        }
-
-        public static TypeInfo GetTypeInfo(this Type type)
-        {
-            IReflectableType reflectableType = (IReflectableType)type;
-            return reflectableType.GetTypeInfo();
-        }
-
-        public static IEnumerable<MemberInfo> GetMember(this Type type, string name)
-        {
-            return type.GetTypeInfo().DeclaredMembers.Where(m => m.Name == name);
-        }
-
-        public static IEnumerable<Type> GetInterfaces(this Type type)
-        {
-            return type.GetTypeInfo().ImplementedInterfaces;
-        } 
-    }
-#else
-    internal static class ExtensionMethods
-    {
-        public static Type GetBaseType(this Type type)
-        {
-            return type.BaseType;
-        }
-    }
-#endif
 }