2007-04-15 Alp Toker <alp@atoker.com>

	* NonSerializedAttribute.cs: Inherited=false in 2.0.

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

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 2948599859d2297e7b9161bbbe236dd00da64bb0..3e462bea6658ad19afaeaa2ca0eec4220cf173a2 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-15  Alp Toker  <alp@atoker.com>
+
+       * NonSerializedAttribute.cs: Inherited=false in 2.0.
+
 2007-04-05  Dick Porter  <dick@ximian.com>
 
        * Environment.cs: Increment mono_corlib_version

diff --git a/mcs/class/corlib/System/NonSerializedAttribute.cs b/mcs/class/corlib/System/NonSerializedAttribute.cs
index ae0f4dc3a08751018639cd17f17460c4fb0842e3..c09a88313bac390d477a8fc1c6f7d2ce1e62d609 100644 (file)
--- a/mcs/class/corlib/System/NonSerializedAttribute.cs
+++ b/mcs/class/corlib/System/NonSerializedAttribute.cs
@@ -32,7 +32,11 @@
 
 namespace System
 {
+#if NET_2_0
+       [AttributeUsage (AttributeTargets.Field, Inherited=false)]
+#else
        [AttributeUsage (AttributeTargets.Field)]
+#endif
        public sealed class NonSerializedAttribute : Attribute
        {
                public NonSerializedAttribute ()