NH-3807 - Since AppDomain is no longer CoreClr, use AppContext.BaseDirectory instead of AppDomain.CurrentDomain.BaseDirectory.

Added shim for easier use with .NET 4.0.

Author: ngbrown

src/NHibernate/Cfg/Configuration.cs

@@ -1862,10 +1862,15 @@ private void ValidationHandler(object o, ValidationEventArgs args)
 
 		protected virtual string GetDefaultConfigurationFilePath()
 		{
+#if FEATURE_APPDOMAIN
 			string baseDir = AppDomain.CurrentDomain.BaseDirectory;
 
 			// Note RelativeSearchPath can be null even if the doc say something else; don't remove the check
 			var searchPath = AppDomain.CurrentDomain.RelativeSearchPath ?? string.Empty;
+#else
+			string baseDir = AppContext.BaseDirectory;
+			var searchPath = string.Empty;
+#endif
 
 			string relativeSearchPath = searchPath.Split(';').First();
 			string binPath = Path.Combine(baseDir, relativeSearchPath);

src/NHibernate/Compat/AppContext.cs

@@ -0,0 +1,13 @@
+#if NET_4_0
+namespace System
+{
+	internal static class AppContext
+	{
+		/// <summary>Gets the pathname of the base directory that the assembly resolver uses to probe for assemblies. </summary>
+		public static string BaseDirectory
+		{
+			get { return AppDomain.CurrentDomain.BaseDirectory; }
+		}
+	}
+}
+#endif

src/NHibernate/Logging.cs

@@ -89,12 +89,21 @@ private static string GetNhibernateLoggerClass()
 #endif
 			{
 				// look for log4net.dll
+#if FEATURE_APPDOMAIN
 				string baseDir = AppDomain.CurrentDomain.BaseDirectory;
 				string relativeSearchPath = AppDomain.CurrentDomain.RelativeSearchPath;
+#else
+				string baseDir = AppContext.BaseDirectory;
+				string relativeSearchPath = null;
+#endif
 				string binPath = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath);
 				string log4NetDllPath = binPath == null ? "log4net.dll" : Path.Combine(binPath, "log4net.dll");
 
-				if (File.Exists(log4NetDllPath) || AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == "log4net"))
+				if (File.Exists(log4NetDllPath) 
+#if FEATURE_APPDOMAIN
+					|| AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == "log4net")
+#endif
+					)
 				{
 					nhibernateLoggerClass = typeof (Log4NetLoggerFactory).AssemblyQualifiedName;
 				}

src/NHibernate/Mapping/ByCode/MappingsExtensions.cs

@@ -40,8 +40,13 @@ public static string AsString(this HbmMapping mappings)
 
 		private static string ArrangeMappingsFolderPath()
 		{
+#if FEATURE_APPDOMAIN
 			string baseDir = AppDomain.CurrentDomain.BaseDirectory;
 			string relativeSearchPath = AppDomain.CurrentDomain.RelativeSearchPath;
+#else
+			string baseDir = AppContext.BaseDirectory;
+			string relativeSearchPath = null;
+#endif
 			string binPath = relativeSearchPath != null ? Path.Combine(baseDir, relativeSearchPath): baseDir;
 			string mappingsFolderPath = Path.Combine(binPath, "Mappings");
 

src/NHibernate/NHibernate.csproj

@@ -148,6 +148,7 @@
     <Compile Include="Collection\IPersistentCollection.cs" />
     <Compile Include="Collection\Generic\SetHelpers\ISetSnapshot.cs" />
     <Compile Include="Collection\Generic\SetHelpers\SetSnapShot.cs" />
+    <Compile Include="Compat\AppContext.cs" />
     <Compile Include="Compat\CustomAttributeExtensions.cs" />
     <Compile Include="Compat\DesignerCategoryAttribute.cs" />
     <Compile Include="Compat\ICloneable.cs" />