Author: atsushi
Date: 2007-07-20 05:12:32 -0400 (Fri, 20 Jul 2007)
New Revision: 82343
Modified:
trunk/mcs/class/corlib/System/AppDomain.cs
trunk/mcs/class/corlib/System/AppDomainSetup.cs
trunk/mcs/class/corlib/System/ChangeLog
trunk/mcs/class/corlib/Test/System/AppDomainSetupTest.cs
trunk/mcs/class/corlib/Test/System/ChangeLog
Log:
2007-07-20 Atsushi Enomoto <[EMAIL PROTECTED]>
* AppDomainSetup.cs : added missing 2.0 members.
* AppDomain.cs : support AppDomainInitializer.
* AppDomainSetupTest.cs : added test for AppDomainInitializer.
Modified: trunk/mcs/class/corlib/System/AppDomain.cs
===================================================================
--- trunk/mcs/class/corlib/System/AppDomain.cs 2007-07-20 09:12:08 UTC (rev
82342)
+++ trunk/mcs/class/corlib/System/AppDomain.cs 2007-07-20 09:12:32 UTC (rev
82343)
@@ -750,6 +750,14 @@
else
ad._evidence = new Evidence (securityInfo);
// copy
+#if NET_2_0
+ if (info.AppDomainInitializer != null) {
+ if
((info.AppDomainInitializer.Method.Attributes & MethodAttributes.Static) == 0)
+ throw new ArgumentException
("Non-static methods cannot be invoked as an appdomain initializer");
+ info.AppDomainInitializer
(info.AppDomainInitializerArguments);
+ }
+#endif
+
return ad;
}
Modified: trunk/mcs/class/corlib/System/AppDomainSetup.cs
===================================================================
--- trunk/mcs/class/corlib/System/AppDomainSetup.cs 2007-07-20 09:12:08 UTC
(rev 82342)
+++ trunk/mcs/class/corlib/System/AppDomainSetup.cs 2007-07-20 09:12:32 UTC
(rev 82343)
@@ -37,6 +37,7 @@
#if NET_2_0
using System.Runtime.Hosting;
+using System.Security.Policy;
#endif
namespace System
@@ -63,9 +64,20 @@
private LoaderOptimization loader_optimization;
bool disallow_binding_redirects;
bool disallow_code_downloads;
+
+ // those fields also exist in the runtime, so we need dummies
in 1.x profile too.
#if NET_2_0
private ActivationArguments _activationArguments;
+ ApplicationTrust application_trust;
+ AppDomainInitializer domain_initializer;
+#else
+ object _activationArguments;
+ object application_trust; // always null
+ object domain_initializer; // always null
#endif
+ string [] domain_initializer_args;
+ bool disallow_appbase_probe;
+ byte [] configuration_bytes;
public AppDomainSetup ()
{
@@ -88,6 +100,14 @@
loader_optimization = setup.loader_optimization;
disallow_binding_redirects =
setup.disallow_binding_redirects;
disallow_code_downloads = setup.disallow_code_downloads;
+//#if NET_2_0
+ _activationArguments = setup._activationArguments;
+ domain_initializer = setup.domain_initializer;
+ domain_initializer_args = setup.domain_initializer_args;
+ application_trust = setup.application_trust;
+ disallow_appbase_probe = setup.disallow_appbase_probe;
+ configuration_bytes = setup.configuration_bytes;
+//#endif
}
#if NET_2_0
@@ -127,7 +147,7 @@
return appBase;
}
-
+
public string ApplicationBase {
get { return GetAppBase (application_base); }
set { application_base = value; }
@@ -278,6 +298,40 @@
get { return _activationArguments; }
set { _activationArguments = value; }
}
+
+ public AppDomainInitializer AppDomainInitializer {
+ get { return domain_initializer; }
+ set { domain_initializer = value; }
+ }
+
+ public string [] AppDomainInitializerArguments {
+ get { return domain_initializer_args; }
+ set { domain_initializer_args = value; }
+ }
+
+ [MonoNotSupported ("This property exists but not considered.")]
+ public ApplicationTrust ApplicationTrust {
+ get { return application_trust; }
+ set { application_trust = value; }
+ }
+
+ [MonoNotSupported ("This property exists but not considered.")]
+ public bool DisallowApplicationBaseProbing {
+ get { return disallow_appbase_probe; }
+ set { disallow_appbase_probe = value; }
+ }
+
+ [MonoNotSupported ("This method exists but not considered.")]
+ public byte [] GetConfigurationBytes ()
+ {
+ return configuration_bytes != null ?
configuration_bytes.Clone () as byte [] : null;
+ }
+
+ [MonoNotSupported ("This method exists but not considered.")]
+ public void SetConfigurationBytes (byte [] bytes)
+ {
+ configuration_bytes = bytes;
+ }
#endif
}
}
Modified: trunk/mcs/class/corlib/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System/ChangeLog 2007-07-20 09:12:08 UTC (rev
82342)
+++ trunk/mcs/class/corlib/System/ChangeLog 2007-07-20 09:12:32 UTC (rev
82343)
@@ -1,3 +1,8 @@
+2007-07-20 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * AppDomainSetup.cs : added missing 2.0 members.
+ * AppDomain.cs : support AppDomainInitializer.
+
2007-06-06 Miguel de Icaza <[EMAIL PROTECTED]>
* Int16.cs, UInt64.cs, SByte.cs, UInt16.cs, Byte.cs, Int32.cs,
Modified: trunk/mcs/class/corlib/Test/System/AppDomainSetupTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System/AppDomainSetupTest.cs 2007-07-20
09:12:08 UTC (rev 82342)
+++ trunk/mcs/class/corlib/Test/System/AppDomainSetupTest.cs 2007-07-20
09:12:32 UTC (rev 82343)
@@ -202,5 +202,35 @@
Assert.AreEqual (Path.GetFullPath ("la?lala"),
setup.ApplicationBase);
}
}
+
+#if NET_2_0
+ static bool app_domain_initialized;
+
+ [Test]
+ public void AppDomainInitializer1 ()
+ {
+ AppDomainSetup s = new AppDomainSetup ();
+ s.AppDomainInitializer = AppDomainInitialized1;
+ s.AppDomainInitializerArguments = new string [] {"A",
"B"};
+ AppDomain.CreateDomain ("MyDomain", null, s);
+ Assert.IsTrue (app_domain_initialized, "#1");
+ }
+
+ static void AppDomainInitialized1 (string [] args)
+ {
+ Assert.AreEqual ("A", args [0], "#x1");
+ Assert.AreEqual ("B", args [1], "#x2");
+ app_domain_initialized = true;
+ }
+
+ [Test]
+ [ExpectedException (typeof (ArgumentException))]
+ public void AppDomainInitializerNonStaticMethod ()
+ {
+ AppDomainSetup s = new AppDomainSetup ();
+ s.AppDomainInitializer = delegate (string [] args) {};
+ AppDomain.CreateDomain ("MyDomain", null, s);
+ }
+#endif
}
}
Modified: trunk/mcs/class/corlib/Test/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System/ChangeLog 2007-07-20 09:12:08 UTC
(rev 82342)
+++ trunk/mcs/class/corlib/Test/System/ChangeLog 2007-07-20 09:12:32 UTC
(rev 82343)
@@ -1,3 +1,7 @@
+2007-07-20 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * AppDomainSetupTest.cs : added test for AppDomainInitializer.
+
2007-07-07 Alan McGovern <[EMAIL PROTECTED]>
* GuidTest.cs: Added test to make sure whitespace is trimmed correctly
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches