Hey folks,

.net 4.0 adds an event handler to System.Exception for "safe serialization".

Here's a patch to add it before implementing support for it in the
serializer. It's also needed to upgrade MEF in trunk.

Ok to go in?

Thanks,

-- 
Jb Evain  <j...@nurv.fr>
Index: mcs/class/corlib/System/Exception.cs
===================================================================
--- mcs/class/corlib/System/Exception.cs	(revision 158394)
+++ mcs/class/corlib/System/Exception.cs	(working copy)
@@ -61,9 +61,22 @@
 		internal int hresult = -2146233088;
 		string source;
 		IDictionary _data;
+#if NET_4_0
+		internal EventHandler<SafeSerializationEventArgs> safe_serialization_handler;
+#else
+		object safe_serialization_handler;
+#endif
 		#endregion
 #pragma warning restore 169, 649		
 
+#if NET_4_0
+		[MonoTODO]
+		protected event EventHandler<SafeSerializationEventArgs> SerializeObjectState {
+			add { safe_serialization_handler += value; }
+			remove { safe_serialization_handler -= value; }
+		}
+#endif
+
 		public Exception ()
 		{
 		}
Index: mcs/class/corlib/System/Environment.cs
===================================================================
--- mcs/class/corlib/System/Environment.cs	(revision 158394)
+++ mcs/class/corlib/System/Environment.cs	(working copy)
@@ -55,7 +55,7 @@
 		 * of icalls, do not require an increment.
 		 */
 #pragma warning disable 169
-		private const int mono_corlib_version = 90;
+		private const int mono_corlib_version = 91;
 #pragma warning restore 169
 
 		[ComVisible (true)]
Index: mono/mono/metadata/object-internals.h
===================================================================
--- mono/mono/metadata/object-internals.h	(revision 158206)
+++ mono/mono/metadata/object-internals.h	(working copy)
@@ -241,6 +241,7 @@
 	gint32	    hresult;
 	MonoString *source;
 	MonoObject *_data;
+	MonoObject *safe_serialization_handler;
 };
 
 typedef struct {
Index: mono/mono/metadata/appdomain.c
===================================================================
--- mono/mono/metadata/appdomain.c	(revision 158206)
+++ mono/mono/metadata/appdomain.c	(working copy)
@@ -73,7 +73,7 @@
  * Changes which are already detected at runtime, like the addition
  * of icalls, do not require an increment.
  */
-#define MONO_CORLIB_VERSION 90
+#define MONO_CORLIB_VERSION 91
 
 typedef struct
 {
_______________________________________________
Mono-devel-list mailing list
Mono-devel-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-devel-list

Reply via email to