NH-3807 - Guard on System.Configuration

Author: ngbrown

src/NHibernate/Cfg/Configuration.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -29,6 +28,10 @@
 using NHibernate.Util;
 using Array = System.Array;
 
+#if FEATURE_SYSTEM_CONFIGURATION
+using System.Configuration;
+#endif
+
 #if FEATURE_SERIALIZATION
 using System.Runtime.Serialization;
 using System.Security;
@@ -1414,12 +1417,14 @@ private void AddProperties(ISessionFactoryConfiguration factoryConfiguration)
 		/// </remarks>
 		public Configuration Configure()
 		{
+#if FEATURE_SYSTEM_CONFIGURATION
 			var hc = ConfigurationManager.GetSection(CfgXmlHelper.CfgSectionName) as IHibernateConfiguration;
 			if (hc != null && hc.SessionFactory != null)
 			{
 				return DoConfigure(hc.SessionFactory);
 			}
 			else
+#endif
 			{
 				return Configure(GetDefaultConfigurationFilePath());
 			}

src/NHibernate/Cfg/ConfigurationSectionHandler.cs

@@ -1,3 +1,5 @@
+#if FEATURE_SYSTEM_CONFIGURATION
+
 using System;
 using System.Configuration;
 using System.Xml;
@@ -19,4 +21,6 @@ object IConfigurationSectionHandler.Create(object parent, object configContext,
 
 		#endregion
 	}
-}
+}
+
+#endif

src/NHibernate/Cfg/Environment.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using System.Reflection;
 
 using NHibernate.Bytecode;
 using NHibernate.Cfg.ConfigurationSchema;
 using NHibernate.Util;
 
+#if FEATURE_SYSTEM_CONFIGURATION
+using System.Configuration;
+#endif
+
 namespace NHibernate.Cfg
 {
 	/// <summary>
@@ -233,6 +236,7 @@ static Environment()
 
 		private static void LoadGlobalPropertiesFromAppConfig()
 		{
+#if FEATURE_SYSTEM_CONFIGURATION
 			object config = ConfigurationManager.GetSection(CfgXmlHelper.CfgSectionName);
 
 			if (config == null)
@@ -260,6 +264,7 @@ private static void LoadGlobalPropertiesFromAppConfig()
 					GlobalProperties[kvp.Key] = kvp.Value;
 				}
 			}
+#endif
 		}
 
 		internal static void ResetSessionFactoryProperties()

src/NHibernate/Connection/ConnectionProvider.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Collections;
-using System.Configuration;
 using System.Data.Common;
 
 using NHibernate.Driver;
 using NHibernate.Util;
 using Environment=NHibernate.Cfg.Environment;
 using System.Collections.Generic;
 
+#if FEATURE_SYSTEM_CONFIGURATION
+using System.Configuration;
+#endif
+
 namespace NHibernate.Connection
 {
 	/// <summary>
@@ -73,6 +76,7 @@ public virtual void Configure(IDictionary<string, string> settings)
 		/// </exception>
 		protected virtual string GetNamedConnectionString(IDictionary<string, string> settings)
 		{
+#if FEATURE_SYSTEM_CONFIGURATION
 			string connStringName;
 			if(!settings.TryGetValue(Environment.ConnectionStringName, out connStringName))
 				return null;
@@ -81,6 +85,9 @@ protected virtual string GetNamedConnectionString(IDictionary<string, string> se
 			if (connectionStringSettings == null)
 				throw new HibernateException(string.Format("Could not find named connection string {0}", connStringName));
 			return connectionStringSettings.ConnectionString;
+#else
+			return null;
+#endif
 		}
 
 		/// <summary>

src/NHibernate/Logging.cs

@@ -1,11 +1,14 @@
 using System;
-using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using NHibernate.Util;
 
+#if FEATURE_SYSTEM_CONFIGURATION
+using System.Configuration;
+#endif
+
 namespace NHibernate
 {
 	public interface IInternalLogger
@@ -79,9 +82,11 @@ private static ILoggerFactory GetLoggerFactory(string nhibernateLoggerClass)
 
 		private static string GetNhibernateLoggerClass()
 		{
-			var nhibernateLogger = ConfigurationManager.AppSettings.Keys.Cast<string>().FirstOrDefault(k => NhibernateLoggerConfKey.Equals(k.ToLowerInvariant()));
 			string nhibernateLoggerClass = null;
+#if FEATURE_SYSTEM_CONFIGURATION
+			var nhibernateLogger = ConfigurationManager.AppSettings.Keys.Cast<string>().FirstOrDefault(k => NhibernateLoggerConfKey.Equals(k.ToLowerInvariant()));
 			if (string.IsNullOrEmpty(nhibernateLogger))
+#endif
 			{
 				// look for log4net.dll
 				string baseDir = AppDomain.CurrentDomain.BaseDirectory;
@@ -94,10 +99,12 @@ private static string GetNhibernateLoggerClass()
 					nhibernateLoggerClass = typeof (Log4NetLoggerFactory).AssemblyQualifiedName;
 				}
 			}
+#if FEATURE_SYSTEM_CONFIGURATION
 			else
 			{
 				nhibernateLoggerClass = ConfigurationManager.AppSettings[nhibernateLogger];
 			}
+#endif
 			return nhibernateLoggerClass;
 		}