Merge branch 'master' into GH-1300

Author: gliljas

src/NHibernate/Bytecode/Lightweight/ReflectionOptimizer.cs

@@ -101,13 +101,22 @@ protected virtual void ThrowExceptionForNoDefaultCtor(System.Type type)
 
 		protected DynamicMethod CreateDynamicMethod(System.Type returnType, System.Type[] argumentTypes)
 		{
-			System.Type owner = mappedType.IsInterface ? typeof (object) : mappedType;
-#pragma warning disable 612,618
-			bool canSkipChecks = SecurityManager.IsGranted(new ReflectionPermission(ReflectionPermissionFlag.MemberAccess));
-#pragma warning restore 612,618
+			var owner = mappedType.IsInterface ? typeof (object) : mappedType;
+			var canSkipChecks = CanSkipVisibilityChecks();
 			return new DynamicMethod(string.Empty, returnType, argumentTypes, owner, canSkipChecks);
 		}
 
+		private static bool CanSkipVisibilityChecks()
+		{
+#if NETFX
+			var permissionSet = new PermissionSet(PermissionState.None);
+			permissionSet.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.MemberAccess));
+			return permissionSet.IsSubsetOf(AppDomain.CurrentDomain.PermissionSet);
+#else
+			return false;
+#endif
+		}
+
 		private static void EmitCastToReference(ILGenerator il, System.Type type)
 		{
 			if (type.IsValueType)

src/NHibernate/Context/WcfOperationSessionContext.cs

@@ -1,4 +1,10 @@
-using System;
+// There is no support of WCF Server under .Net Core, so it makes little sense to provide
+// a WCF OperationContext for it. Since it adds additional heavy dependencies, it has been
+// considered not desirable to provide it for .Net Standard. (It could be useful in case some
+// WCF server becames available in another frameworks or if a .Net Framework application
+// consumes the .Net Standard distribution of NHibernate instead of the .Net Framework one.)
+// See https://github.com/dotnet/wcf/issues/1200 and #1842
+#if NETFX
 using System.Collections;
 using System.ServiceModel;
 
@@ -50,3 +56,36 @@ public void Attach(OperationContext owner) { }
 		public void Detach(OperationContext owner) { }
 	}
 }
+#else
+// 6.0 TODO: remove the whole #else
+using System;
+using System.Collections;
+using NHibernate.Engine;
+
+namespace NHibernate.Context
+{
+	/// <summary>
+	/// Obsolete class not usable with the current framework. Use the
+	/// .Net Framework distribution of NHibernate if you need it. See
+	/// https://github.com/nhibernate/nhibernate-core/issues/1842
+	/// </summary>
+	[Obsolete("Not supported in this platform", true)]
+	public class WcfOperationSessionContext : MapBasedSessionContext
+	{
+		public WcfOperationSessionContext(ISessionFactoryImplementor factory) : base(factory)
+		{
+			throw new PlatformNotSupportedException(
+				"WcfOperationSessionContext is not supported for the current framework");
+		}
+
+		protected override IDictionary GetMap()
+		{
+			return null;
+		}
+
+		protected override void SetMap(IDictionary value)
+		{
+		}
+	}
+}
+#endif

src/NHibernate/Driver/OdbcDriver.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.Odbc;
 using NHibernate.SqlTypes;
 using NHibernate.Util;
 using Environment = NHibernate.Cfg.Environment;
@@ -47,12 +46,12 @@ public OdbcDriver()
 #else
 		public override DbConnection CreateConnection()
 		{
-			return new OdbcConnection();
+			return new System.Data.Odbc.OdbcConnection();
 		}
 
 		public override DbCommand CreateCommand()
 		{
-			return new OdbcCommand();
+			return new System.Data.Odbc.OdbcCommand();
 		}
 #endif
 

src/NHibernate/Driver/OleDbDriver.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Data.Common;
-using System.Data.OleDb;
 
 namespace NHibernate.Driver
 {
@@ -26,12 +25,12 @@ public OleDbDriver()
 #else
 		public override DbConnection CreateConnection()
 		{
-			return new OleDbConnection();
+			return new System.Data.OleDb.OleDbConnection();
 		}
 
 		public override DbCommand CreateCommand()
 		{
-			return new OleDbCommand();
+			return new System.Data.OleDb.OleDbCommand();
 		}
 #endif
 

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -1276,7 +1276,18 @@ private ICurrentSessionContext BuildCurrentSessionContext()
 				case "web":
 					return new WebSessionContext(this);
 				case "wcf_operation":
+#if NETFX
 					return new WcfOperationSessionContext(this);
+#else
+					// There is no support of WCF Server under .Net Core, so it makes little sense to provide
+					// a WCF OperationContext for it. Since it adds additional heavy dependencies, it has been
+					// considered not desirable to provide it for .Net Standard. (It could be useful in case some
+					// WCF server becames available in another frameworks or if a .Net Framework application
+					// consumes the .Net Standard distribution of NHibernate instead of the .Net Framework one.)
+					// See https://github.com/dotnet/wcf/issues/1200 and #1842
+					throw new PlatformNotSupportedException(
+						"WcfOperationSessionContext is not supported for the current framework");
+#endif
 			}
 
 			try

src/NHibernate/NHibernate.csproj

@@ -52,15 +52,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
-    <PackageReference Include="System.Security.Permissions" Version="4.4.1" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
-    <PackageReference Include="System.Security.Permissions" Version="4.4.1" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
   </ItemGroup>