2010-03-10 Atsushi Enomoto <atsushi@ximian.com>

	* XmlAnyElementAttribute.cs : add internal IsNullableSpecified
	  (for moonlight compatibility).
	* XmlChoiceIdentifierAttribute.cs : implement MemberInfo (ditto).

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

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
index b7d5c55bac9c8fec4ffaa2121d8999205f062d56..c32317932accccc1a92b8606f7e3a14d3f1dd434 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-10  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XmlAnyElementAttribute.cs : add internal IsNullableSpecified
+         (for moonlight compatibility).
+       * XmlChoiceIdentifierAttribute.cs : implement MemberInfo (ditto).
+
 2010-03-08  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XmlSerializationWriter.cs : namespaces argument could be null.

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
index fa7560a200f80ea77e13add06db870d6fe368ea5..afa733704b3018d9d1ebc0185136a6cab106faa8 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
@@ -85,6 +85,9 @@ namespace System.Xml.Serialization
                }
 
 #if NET_2_0
+               [MonoTODO]
+               internal bool IsNullableSpecified { get; set; }
+
                [MonoTODO]
                public int Order {
                        get { return order; }

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
index c0b757e492c4db1e74a69c4e5ac0fcfef4316d63..cf1434afff2497758d294f9e84a6cc9ee47bae2e 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
@@ -61,8 +61,15 @@ namespace System.Xml.Serialization
                }
 
 #if NET_2_1
+               MemberInfo member;
                // It is used only in 2.1 S.X.Serialization.dll in MS SDK.
-               internal MemberInfo MemberInfo { get; set; }
+               internal MemberInfo MemberInfo {
+                       get { return member; }
+                       set {
+                               MemberName = value != null ? value.Name : null;
+                               member = value;
+                       }
+               }
 #endif
 
                internal void AddKeyHash (System.Text.StringBuilder sb)