NH-3807 - Make ProxyFactory take care of its own AppDomain.CurrentDomain

Author: ngbrown

src/NHibernate.Test/DynamicProxyTests/PeVerifyFixture.cs

@@ -121,10 +121,10 @@ public SavingProxyAssemblyBuilder(string assemblyName)
 				this.assemblyName = assemblyName;
 			}
 
-			public AssemblyBuilder DefineDynamicAssembly(AppDomain appDomain, AssemblyName name)
+			public AssemblyBuilder DefineDynamicAssembly(AssemblyName name)
 			{
 				AssemblyBuilderAccess access = AssemblyBuilderAccess.RunAndSave;
-				return appDomain.DefineDynamicAssembly(new AssemblyName(assemblyName), access);
+				return AppDomain.CurrentDomain.DefineDynamicAssembly(new AssemblyName(assemblyName), access);
 			}
 
 			public ModuleBuilder DefineDynamicModule(AssemblyBuilder assemblyBuilder, string moduleName)
@@ -140,4 +140,4 @@ public void Save(AssemblyBuilder assemblyBuilder)
 
 		#endregion
 	}
-}
+}

src/NHibernate/Proxy/DynamicProxy/DefaultProxyAssemblyBuilder.cs

@@ -6,19 +6,24 @@ namespace NHibernate.Proxy.DynamicProxy
 {
 	public class DefaultProxyAssemblyBuilder : IProxyAssemblyBuilder
 	{
-		public AssemblyBuilder DefineDynamicAssembly(AppDomain appDomain, AssemblyName name)
+		public AssemblyBuilder DefineDynamicAssembly(AssemblyName name)
 		{
+#if FEATURE_APPDOMAIN || NET_4_0
 #if DEBUG
 			AssemblyBuilderAccess access = AssemblyBuilderAccess.RunAndSave;
 #else
 			AssemblyBuilderAccess access = AssemblyBuilderAccess.Run;
 #endif
+			AppDomain appDomain = AppDomain.CurrentDomain;
 			return appDomain.DefineDynamicAssembly(name, access);
+#else
+			return AssemblyBuilder.DefineDynamicAssembly(name, AssemblyBuilderAccess.Run);
+#endif
 		}
 
 		public ModuleBuilder DefineDynamicModule(AssemblyBuilder assemblyBuilder, string moduleName)
 		{
-#if DEBUG
+#if DEBUG && FEATURE_APPDOMAIN
 			ModuleBuilder moduleBuilder =
 				assemblyBuilder.DefineDynamicModule(moduleName, string.Format("{0}.mod", moduleName), true);
 #else

src/NHibernate/Proxy/DynamicProxy/IProxyAssemblyBuilder.cs

@@ -6,7 +6,7 @@ namespace NHibernate.Proxy.DynamicProxy
 {
 	public interface IProxyAssemblyBuilder
 	{
-		AssemblyBuilder DefineDynamicAssembly(AppDomain appDomain, AssemblyName name);
+		AssemblyBuilder DefineDynamicAssembly(AssemblyName name);
 		ModuleBuilder DefineDynamicModule(AssemblyBuilder assemblyBuilder, string moduleName);
 		void Save(AssemblyBuilder assemblyBuilder);
 	}

src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs

@@ -97,13 +97,12 @@ public System.Type CreateProxyType(System.Type baseType, params System.Type[] in
 
 		private System.Type CreateUncachedProxyType(System.Type baseType, System.Type[] baseInterfaces)
 		{
-			AppDomain currentDomain = AppDomain.CurrentDomain;
 			string typeName = string.Format("{0}Proxy", baseType.Name);
 			string assemblyName = string.Format("{0}Assembly", typeName);
 			string moduleName = string.Format("{0}Module", typeName);
 
 			var name = new AssemblyName(assemblyName);
-			AssemblyBuilder assemblyBuilder = ProxyAssemblyBuilder.DefineDynamicAssembly(currentDomain, name);
+			AssemblyBuilder assemblyBuilder = ProxyAssemblyBuilder.DefineDynamicAssembly(name);
 			ModuleBuilder moduleBuilder = ProxyAssemblyBuilder.DefineDynamicModule(assemblyBuilder, moduleName);
 
 			TypeAttributes typeAttributes = TypeAttributes.AutoClass | TypeAttributes.Class |