2010-03-25 Sebastien Pouliot <sebastien@ximian.com>

	* AppDomain.cs: Add new properties that are in both FX4 and SL4
	since Moonlight needs them (for testing purpose).
	* Environment.cs: FailFast overloads are present in SL4 (and also
	needed for testing Moonlight)

svn path=/trunk/mcs/; revision=154209

diff --git a/mcs/class/corlib/System/AppDomain.cs b/mcs/class/corlib/System/AppDomain.cs
index b066493fc6785a0c4a0a2ddd0441c4fbaf166fec..b2e1e57f46f218ea7b49f2c76761a688db3e972e 100644 (file)
--- a/mcs/class/corlib/System/AppDomain.cs
+++ b/mcs/class/corlib/System/AppDomain.cs
@@ -1519,6 +1519,32 @@ namespace System {
                        // default (at least for SL4) is to return false for unknown values (can't get a null out of it)
                        return false;
                }
+
+               [MonoTODO ("Currently always returns false")]
+               public static bool MonitoringIsEnabled { 
+                       get { return false; }
+                       set { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public long MonitoringSurvivedMemorySize {
+                       get { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public static long MonitoringSurvivedProcessMemorySize {
+                       get { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public long MonitoringTotalAllocatedMemorySize {
+                       get { throw new NotImplementedException (); }
+               }
+
+               [MonoTODO]
+               public TimeSpan MonitoringTotalProcessorTime {
+                       get { throw new NotImplementedException (); }
+               }
 #endif
        }
 }

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 1e9b48d384313d794bdcad5128783b04a9102f07..e5f0b3f3b0f46dc0b41ae639bb4bd8601d08cb17 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-25  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * AppDomain.cs: Add new properties that are in both FX4 and SL4
+       since Moonlight needs them (for testing purpose).
+       * Environment.cs: FailFast overloads are present in SL4 (and also
+       needed for testing Moonlight)
+
 2010-03-24  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AppDomain.cs: Change default value from null to false for new

diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs
index 0dc905db1f7c89dab08c53be67175d796f195ef2..e6b0c7dd04faa65dc7d8f5ad1ad325e40082759a 100644 (file)
--- a/mcs/class/corlib/System/Environment.cs
+++ b/mcs/class/corlib/System/Environment.cs
@@ -701,20 +701,22 @@ namespace System {
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                internal static extern void InternalSetEnvironmentVariable (string variable, string value);
-
+#endif
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode=true)]
                public static void FailFast (string message)
                {
                        throw new NotImplementedException ();
                }
-#endif
-#if NET_4_0
+
+#if NET_4_0 || MOONLIGHT
                [SecurityCritical]
                public static void FailFast (string message, Exception exception)
                {
                        throw new NotImplementedException ();
                }
+#endif
 
+#if NET_4_0
                public static bool Is64BitOperatingSystem {
                        get { return IntPtr.Size == 8; } // FIXME: is this good enough?
                }