From aeb10d991e4377107ee94445a0ee3634f1cd2151 Mon Sep 17 00:00:00 2001 From: Jb Evain Date: Wed, 24 Sep 2008 14:01:36 +0000 Subject: [PATCH] 2008-09-24 Jb Evain * AppDomain.cs: implement the CreateDomain overload which takes an AppDomain initializer. Fixes #429545. svn path=/trunk/mcs/; revision=113960 --- mcs/class/corlib/System/AppDomain.cs | 28 +++++++++++++++------------- mcs/class/corlib/System/ChangeLog | 5 +++++ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/mcs/class/corlib/System/AppDomain.cs b/mcs/class/corlib/System/AppDomain.cs index 6532592419e..c024862c93d 100644 --- a/mcs/class/corlib/System/AppDomain.cs +++ b/mcs/class/corlib/System/AppDomain.cs @@ -859,17 +859,7 @@ namespace System { public static AppDomain CreateDomain (string friendlyName, Evidence securityInfo,string appBasePath, string appRelativeSearchPath, bool shadowCopyFiles) { - AppDomainSetup info = new AppDomainSetup (); - - info.ApplicationBase = appBasePath; - info.PrivateBinPath = appRelativeSearchPath; - - if (shadowCopyFiles) - info.ShadowCopyFiles = "true"; - else - info.ShadowCopyFiles = "false"; - - return CreateDomain (friendlyName, securityInfo, info); + return CreateDomain (friendlyName, securityInfo, appBasePath, appRelativeSearchPath, shadowCopyFiles, null, null); } #if NET_2_0 @@ -1193,11 +1183,23 @@ namespace System { // static methods - [MonoTODO ("add support for new delegate")] public static AppDomain CreateDomain (string friendlyName, Evidence securityInfo, string appBasePath, string appRelativeSearchPath, bool shadowCopyFiles, AppDomainInitializer adInit, string[] adInitArgs) { - return CreateDomain (friendlyName, securityInfo, appBasePath, appRelativeSearchPath, shadowCopyFiles); + AppDomainSetup info = new AppDomainSetup (); + + info.ApplicationBase = appBasePath; + info.PrivateBinPath = appRelativeSearchPath; + + if (shadowCopyFiles) + info.ShadowCopyFiles = "true"; + else + info.ShadowCopyFiles = "false"; + + info.AppDomainInitializerArguments = adInitArgs; + info.AppDomainInitializer = adInit; + + return CreateDomain (friendlyName, securityInfo, info); } public int ExecuteAssemblyByName (string assemblyName) diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog index 7e60470b38b..69dea0a8f7d 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,3 +1,8 @@ +2008-09-24 Jb Evain + + * AppDomain.cs: implement the CreateDomain overload which + takes an AppDomain initializer. Fixes #429545. + 2008-09-17 Robert Jordan * DelegateSerializationHolder.cs: Starting with .NET 2.0, delegates -- 2.25.1