diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-03-13 10:16:28 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-03-13 10:16:28 +0300 |
| commit | 00eeda36b079cc922df7e223628c26b241e24c42 (patch) | |
| tree | 4202a7db9a9eea479f3e7040b46e07d9b1d560c6 /mcs/class/System.XML/System.Xml.Serialization | |
| parent | 8c18de8f16f93aa9f17c29797f45edc38d89373f (diff) | |
2009-03-13 Atsushi Enomoto <atsushi@ximian.com>
* XmlChoiceIdentifierAttribute.cs : added internal MemberInfo
property for SL2.
svn path=/trunk/mcs/; revision=129245
Diffstat (limited to 'mcs/class/System.XML/System.Xml.Serialization')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog index 7f32c1c3821..01b57571d54 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog @@ -1,5 +1,10 @@ 2009-03-13 Atsushi Enomoto <atsushi@ximian.com> + * XmlChoiceIdentifierAttribute.cs : added internal MemberInfo + property for SL2. + +2009-03-13 Atsushi Enomoto <atsushi@ximian.com> + * SerializationSource.cs, KeyHelper.cs : split out KeyHelper from SerializationSource as the class is going to be used in 2.1 too. * XmlRootAttribute.cs : use KeyHelper above to add internal Key diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs index 4f4d22eaacf..c0b757e492c 100644 --- a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs +++ b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs @@ -29,6 +29,7 @@ // using System; +using System.Reflection; namespace System.Xml.Serialization { @@ -58,7 +59,12 @@ namespace System.Xml.Serialization } set { memberName = value; } } - + +#if NET_2_1 + // It is used only in 2.1 S.X.Serialization.dll in MS SDK. + internal MemberInfo MemberInfo { get; set; } +#endif + internal void AddKeyHash (System.Text.StringBuilder sb) { sb.Append ("XCA "); |