NH-3807 - Guard Remoting methods and types and Wcf service model operations

Author: ngbrown

src/NHibernate/Context/CallSessionContext.cs

@@ -1,3 +1,5 @@
+#if FEATURE_REMOTING
+
 using System;
 using System.Collections;
 using System.Runtime.Remoting.Messaging;
@@ -36,4 +38,6 @@ protected override IDictionary GetMap()
 			return CallContext.GetData(SessionFactoryMapKey) as IDictionary;
 		}
 	}
-}
+}
+
+#endif

src/NHibernate/Context/WcfOperationSessionContext.cs

@@ -1,3 +1,5 @@
+#if FEATURE_SYSTEM_SERVICEMODEL
+
 using System;
 using System.Collections;
 using System.ServiceModel;
@@ -49,4 +51,6 @@ public class WcfStateExtension : IExtension<OperationContext>
 		public void Attach(OperationContext owner) { }
 		public void Detach(OperationContext owner) { }
 	}
-}
+}
+
+#endif

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -1239,14 +1239,18 @@ private ICurrentSessionContext BuildCurrentSessionContext()
 			{
 				case null:
 					return null;
+#if FEATURE_REMOTING
 				case "call":
 					return new CallSessionContext(this);
+#endif
 				case "thread_static":
 					return new ThreadStaticSessionContext(this);
 				case "web":
 					return new WebSessionContext(this);
+#if FEATURE_REMOTING
 				case "wcf_operation":
 					return new WcfOperationSessionContext(this);
+#endif
 			}
 
 			try

src/NHibernate/Proxy/DefaultDynamicProxyMethodCheckerExtensions.cs

@@ -10,7 +10,9 @@ public static class DefaultDynamicProxyMethodCheckerExtensions
 		public static bool IsProxiable(this MethodInfo method)
 		{
 			return !method.IsFinal
+#if FEATURE_REMOTING
 				&& (method.DeclaringType != typeof(MarshalByRefObject))
+#endif
 				&& (method.DeclaringType != typeof(object) || !"finalize".Equals(method.Name.ToLowerInvariant()))
 				&&
 				(
@@ -23,7 +25,10 @@ public static bool IsProxiable(this MethodInfo method)
 		public static bool ShouldBeProxiable(this MethodInfo method)
 		{
 			// to use only for real methods (no getter/setter)
-			return (method.DeclaringType != typeof (MarshalByRefObject)) &&
+			return 
+#if FEATURE_REMOTING
+				   (method.DeclaringType != typeof (MarshalByRefObject)) &&
+#endif
 			       (method.DeclaringType != typeof (object) || !"finalize".Equals(method.Name.ToLowerInvariant())) &&
 			       (!(method.DeclaringType == typeof (object) && "GetType".Equals(method.Name))) &&
 			       (!(method.DeclaringType == typeof (object) && "obj_address".Equals(method.Name))) && // Mono-specific method
@@ -48,4 +53,4 @@ private static bool IsDisposeMethod(MethodInfo method)
 			// return method.Name.Equals("Dispose") && method.IsMethodOf(typeof(IDisposable));
 		}
 	}
-}
+}