Serialize system types in preparation for .NET Core. (fix)

Author: ngbrown

src/NHibernate/Properties/BasicPropertyAccessor.cs

@@ -193,8 +193,8 @@ private BasicGetter(SerializationInfo info, StreamingContext context)
 
 			void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 			{
-				info.AddValueWithType("clazz", new SerializableSystemType(this.clazz));
-				info.AddValueWithType("property", SerializablePropertyInfo.Wrap(this.property));
+				info.AddValue("clazz", SerializableSystemType.Wrap(this.clazz));
+				info.AddValue("property", SerializablePropertyInfo.Wrap(this.property));
 				info.AddValue("propertyName", this.propertyName);
 			}
 
@@ -307,8 +307,8 @@ private BasicSetter(SerializationInfo info, StreamingContext context)
 
 			void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 			{
-				info.AddValueWithType("clazz", new SerializableSystemType(this.clazz));
-				info.AddValueWithType("property", SerializablePropertyInfo.Wrap(this.property));
+				info.AddValue("clazz", SerializableSystemType.Wrap(this.clazz));
+				info.AddValue("property", SerializablePropertyInfo.Wrap(this.property));
 				info.AddValue("propertyName", this.propertyName);
 			}
 

src/NHibernate/Properties/FieldAccessor.cs

@@ -191,8 +191,8 @@ private FieldGetter(SerializationInfo info, StreamingContext context)
 
 			void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 			{
-				info.AddValueWithType("field", SerializableFieldInfo.Wrap(this.field));
-				info.AddValueWithType("clazz", new SerializableSystemType(this.clazz));
+				info.AddValue("field", SerializableFieldInfo.Wrap(this.field));
+				info.AddValue("clazz", SerializableSystemType.Wrap(this.clazz));
 				info.AddValue("name", this.name);
 			}
 
@@ -293,8 +293,8 @@ private FieldSetter(SerializationInfo info, StreamingContext context)
 
 			void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 			{
-				info.AddValueWithType("field", SerializableFieldInfo.Wrap(this.field));
-				info.AddValueWithType("clazz", new SerializableSystemType(this.clazz));
+				info.AddValue("field", SerializableFieldInfo.Wrap(this.field));
+				info.AddValue("clazz", SerializableSystemType.Wrap(this.clazz));
 				info.AddValue("name", this.name);
 			}
 

src/NHibernate/Proxy/Poco/BasicLazyInitializer.cs

@@ -25,7 +25,7 @@ protected internal BasicLazyInitializer(string entityName, System.Type persisten
 			IAbstractComponentType componentIdType, ISessionImplementor session, bool overridesEquals)
 			: base(entityName, id, session)
 		{
-			this.persistentClass = new SerializableSystemType(persistentClass);
+			this.persistentClass = SerializableSystemType.Wrap(persistentClass);
 			this.getIdentifierMethod = SerializableMethodInfo.Wrap(getIdentifierMethod);
 			this.setIdentifierMethod = SerializableMethodInfo.Wrap(setIdentifierMethod);
 			this.componentIdType = componentIdType;

src/NHibernate/Transform/AliasToBeanConstructorResultTransformer.cs

@@ -29,7 +29,7 @@ protected AliasToBeanConstructorResultTransformer(SerializationInfo info, Stream
 
 		public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
-			info.AddValueWithType("constructor", new SerializableConstructorInfo(this.constructor));
+			info.AddValue("constructor", SerializableConstructorInfo.Wrap(this.constructor));
 		}
 
 		public object TransformTuple(object[] tuple, string[] aliases)