2005-09-22 Sebastien Pouliot <sebastien@ximian.com>

	* ReflectionPermissionAttribute.cs: TypeInformation is obsolete.
	* SecurityAction.cs: *Choice security actions are removed in 2.0 RC.

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

diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog
index 4825090afeb0c35c90bb03d37b57d75f83dee09c..fe549896f96d64ffd17da0f042ec9f532b99d087 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/ChangeLog
+++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * ReflectionPermissionAttribute.cs: TypeInformation is obsolete.
+       * SecurityAction.cs: *Choice security actions are removed in 2.0 RC.
+
 2005-06-22  Sebastien Pouliot  <sebastien@ximian.com>
 
        * FileIOPermission.cs, IsolatedStorageFilePermission.cs, 

diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
index 2d82b3a27f981e5d6afcb8872e59f038332ae644..257894915ac08ebe8c0d1c5f3fe6a39874dc9f91 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
@@ -87,6 +87,9 @@ namespace System.Security.Permissions {
                        }
                }  
 
+#if NET_2_0
+               [Obsolete ("not enforced in 2.0+")]
+#endif
                public bool TypeInformation
                {
                        get { return typeInfo; }

diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs
index 118440add13232795b7a63aa67d7535e76748a7f..c85ec5dc773e11acddc38a2020b4c700bfe784e3 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs
@@ -49,13 +49,5 @@ namespace System.Security.Permissions {
                RequestMinimum = 8,
                RequestOptional = 9,
                RequestRefuse = 10,
-#if NET_2_0 || BOOTSTRAP_NET_2_0
-               [Obsolete ("to be removed before 2.0 RTM")]
-               LinkDemandChoice = 16,
-               [Obsolete ("to be removed before 2.0 RTM")]
-               InheritanceDemandChoice = 17,
-               [Obsolete ("to be removed before 2.0 RTM")]
-               DemandChoice = 18
-#endif
        }
 }