NH-3807 - Took care of most of the GetTypeInfo() needs.

Added TypeReflectionExtensions for CoreClr use.

Author: ngbrown

src/NHibernate/AdoNet/OracleDataClientBatchingBatcher.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Reflection;
 using System.Text;
 using NHibernate.AdoNet.Util;
 using NHibernate.Exceptions;
@@ -162,4 +163,4 @@ public override int BatchSize
 			set { _batchSize = value; }
 		}
 	}
-}
+}

src/NHibernate/Bytecode/AbstractBytecodeProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using NHibernate.Properties;
 using NHibernate.Util;
 
@@ -75,7 +76,7 @@ public virtual void SetProxyFactoryFactory(string typeName)
 				throw new UnableToLoadProxyFactoryFactoryException(typeName, he);
 			}
 
-			if (typeof(IProxyFactoryFactory).IsAssignableFrom(pffc) == false)
+			if (typeof(IProxyFactoryFactory).GetTypeInfo().IsAssignableFrom(pffc) == false)
 			{
 				var he = new HibernateByteCodeException(pffc.FullName + " does not implement " + typeof(IProxyFactoryFactory).FullName);
 				throw he;
@@ -116,4 +117,4 @@ public void SetCollectionTypeFactoryClass(System.Type type)
 
 		#endregion
 	}
-}
+}

src/NHibernate/Bytecode/CodeDom/BytecodeProviderImpl.cs

@@ -19,7 +19,7 @@ public class BytecodeProviderImpl : AbstractBytecodeProvider
 
 		public override IReflectionOptimizer GetReflectionOptimizer(System.Type clazz, IGetter[] getters, ISetter[] setters)
 		{
-			if (clazz.IsValueType)
+			if (clazz.GetTypeInfo().IsValueType)
 			{
 				// Cannot create optimizer for value types - the setter method will not work.
 				log.Info("Disabling reflection optimizer for value type " + clazz.FullName);
@@ -220,7 +220,7 @@ private string GenerateCode()
 					{
 						System.Type type = getters[i].ReturnType;
 
-						if (type.IsValueType)
+						if (type.GetTypeInfo().IsValueType)
 						{
 							sb.AppendFormat("  t.{0} = values[{2}] == null ? new {1}() : ({1})values[{2}];\n", setter.PropertyName,
 							                type.FullName.Replace('+', '.'), i);
@@ -261,4 +261,4 @@ private string GenerateCode()
 
 		#endregion
 	}
-}
+}

src/NHibernate/Bytecode/EmitUtil.cs

@@ -62,7 +62,7 @@ public static void EmitFastInt(ILGenerator il, int value)
 
 		public static void EmitBoxIfNeeded(ILGenerator il, System.Type type)
 		{
-			if (type.IsValueType)
+			if (type.GetTypeInfo().IsValueType)
 			{
 				il.Emit(OpCodes.Box, type);
 			}
@@ -103,7 +103,7 @@ static EmitUtil()
 		public static void PreparePropertyForSet(ILGenerator il, System.Type propertyType)
 		{
 			// If this is a value type, we need to unbox it
-			if (propertyType.IsValueType)
+			if (propertyType.GetTypeInfo().IsValueType)
 			{
 				// if (object[i] == null), create a new instance 
 				Label notNullLabel = il.DefineLabel();
@@ -210,4 +210,4 @@ public static void EmitCreateDelegateInstance(ILGenerator il, System.Type delega
 			il.Emit(OpCodes.Castclass, delegateType);
 		}
 	}
-}
+}

src/NHibernate/Bytecode/Lightweight/ReflectionOptimizer.cs

@@ -36,7 +36,7 @@ public ReflectionOptimizer(System.Type mappedType, IGetter[] getters, ISetter[]
 		{
 			// save off references
 			this.mappedType = mappedType;
-			typeOfThis = mappedType.IsValueType ? mappedType.MakeByRefType() : mappedType;
+			typeOfThis = mappedType.GetTypeInfo().IsValueType ? mappedType.MakeByRefType() : mappedType;
 			//this.getters = getters;
 			//this.setters = setters;
 
@@ -54,7 +54,7 @@ public ReflectionOptimizer(System.Type mappedType, IGetter[] getters, ISetter[]
 		/// </summary>
 		protected virtual CreateInstanceInvoker CreateCreateInstanceMethod(System.Type type)
 		{
-			if (type.IsInterface || type.IsAbstract)
+			if (type.GetTypeInfo().IsInterface || type.GetTypeInfo().IsAbstract)
 			{
 				return null;
 			}
@@ -63,7 +63,7 @@ protected virtual CreateInstanceInvoker CreateCreateInstanceMethod(System.Type t
 
 			ILGenerator il = method.GetILGenerator();
 
-			if (type.IsValueType)
+			if (type.GetTypeInfo().IsValueType)
 			{
 				LocalBuilder tmpLocal = il.DeclareLocal(type);
 				il.Emit(OpCodes.Ldloca, tmpLocal);
@@ -99,7 +99,7 @@ protected virtual void ThrowExceptionForNoDefaultCtor(System.Type type)
 
 		protected DynamicMethod CreateDynamicMethod(System.Type returnType, System.Type[] argumentTypes)
 		{
-			System.Type owner = mappedType.IsInterface ? typeof (object) : mappedType;
+			System.Type owner = mappedType.GetTypeInfo().IsInterface ? typeof (object) : mappedType;
 #pragma warning disable 618
 			bool canSkipChecks = SecurityManager.IsGranted(new ReflectionPermission(ReflectionPermissionFlag.MemberAccess));
 #pragma warning restore 618
@@ -108,7 +108,7 @@ protected DynamicMethod CreateDynamicMethod(System.Type returnType, System.Type[
 
 		private static void EmitCastToReference(ILGenerator il, System.Type type)
 		{
-			if (type.IsValueType)
+			if (type.GetTypeInfo().IsValueType)
 			{
 				il.Emit(OpCodes.Unbox, type);
 			}

src/NHibernate/Cfg/Configuration.cs

@@ -709,7 +709,7 @@ public Configuration AddResources(IEnumerable<string> paths, Assembly assembly)
 		/// </remarks>
 		public Configuration AddClass(System.Type persistentClass)
 		{
-			return AddResource(persistentClass.FullName + ".hbm.xml", persistentClass.Assembly);
+			return AddResource(persistentClass.FullName + ".hbm.xml", persistentClass.GetTypeInfo().Assembly);
 		}
 
 		/// <summary>

src/NHibernate/Cfg/Environment.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
+using System.Linq;
 using System.Reflection;
 
 using NHibernate.Bytecode;
@@ -49,8 +50,7 @@ public static string Version
 				{
 					Assembly thisAssembly = Assembly.GetExecutingAssembly();
 					var attrs =
-						(AssemblyInformationalVersionAttribute[])
-						thisAssembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
+						thisAssembly.GetCustomAttributes<AssemblyInformationalVersionAttribute>().ToArray();
 
 					if (attrs != null && attrs.Length > 0)
 					{

src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using NHibernate.Mapping;
 using NHibernate.Type;
 using NHibernate.Util;
@@ -230,7 +231,7 @@ private void BindCollection(ICollectionPropertiesMapping collectionMapping, Mapp
 			if (!isGeneric.HasValue && containingType != null)
 			{
 				collectionType = GetPropertyType(containingType, collectionMapping.Name, collectionMapping.Access);
-				isGeneric = collectionType.IsGenericType;
+				isGeneric = collectionType.GetTypeInfo().IsGenericType;
 			}
 
 			model.IsGeneric = isGeneric.GetValueOrDefault();

src/NHibernate/Compat/CustomAttributeExtensions.cs

@@ -1,5 +1,8 @@
-#if FEATURE_LEGACY_REFLECTION_API
+#if FEATURE_LEGACY_REFLECTION_API
 // ReSharper disable once CheckNamespace
+
+using System.Collections.Generic;
+
 namespace System.Reflection
 {
 	/// <summary>
@@ -23,6 +26,17 @@ public static T GetCustomAttribute<T>(this MemberInfo element) where T : Attribu
 		{
 			return (T)Attribute.GetCustomAttribute(element, typeof(T));
 		}
+
+		/// <summary>Retrieves a collection of custom attributes of a specified type that are applied to a specified assembly. </summary>
+		/// <returns>A collection of the custom attributes that are applied to <paramref name="element" /> and that match <paramref name="T" />, or an empty collection if no such attributes exist. </returns>
+		/// <param name="element">The assembly to inspect.</param>
+		/// <typeparam name="T">The type of attribute to search for.</typeparam>
+		/// <exception cref="T:System.ArgumentNullException">
+		/// <paramref name="element" /> is null. </exception>
+		public static IEnumerable<T> GetCustomAttributes<T>(this Assembly element) where T : Attribute
+		{
+			return (IEnumerable<T>) element.GetCustomAttributes(typeof(T), false);
+		}
 	}
 }
 #endif

src/NHibernate/Compat/TypeReflectionExtensions.cs

@@ -0,0 +1,43 @@
+#if FEATURE_NETCORE_REFLECTION_API
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace NHibernate
+{
+	internal static class TypeReflectionExtensions
+	{
+		public static MethodInfo GetMethod(this System.Type type, string name, BindingFlags bindingAttr, object binder,
+			System.Type[] types, ParameterModifier[] modifiers)
+		{
+			return type.GetMethods(bindingAttr)
+				.FirstOrDefault(m => m.Name == name && m.GetParameters().Select(p => p.ParameterType).SequenceEqual(types));
+		}
+
+		public static PropertyInfo GetProperty(this System.Type type, string name, BindingFlags bindingAttr, System.Type returnType, object binder,
+			System.Type[] types, ParameterModifier[] modifiers)
+		{
+			return type.GetProperties(bindingAttr)
+				.FirstOrDefault(m => m.Name == name 
+					&& (returnType == null || m.PropertyType == returnType)
+					&& (type == null || m.GetIndexParameters().Select(p => p.ParameterType).SequenceEqual(types)));
+		}
+
+		public static ConstructorInfo GetConstructor(this System.Type type, BindingFlags bindingAttr, object binder,
+			System.Type[] types, ParameterModifier[] modifiers)
+		{
+			return type.GetConstructors(bindingAttr)
+				.FirstOrDefault(m => m.GetParameters().Select(p => p.ParameterType).SequenceEqual(types));
+		}
+
+		public static ConstructorInfo GetConstructor(this System.Type type, BindingFlags bindingAttr, object binder,
+			CallingConventions callingConventions, System.Type[] types, ParameterModifier[] modifiers)
+		{
+			return type.GetConstructors(bindingAttr)
+				.FirstOrDefault(m => m.CallingConvention.HasFlag(callingConventions) && m.GetParameters().Select(p => p.ParameterType).SequenceEqual(types));
+		}
+	}
+}
+
+#endif