diff options
| author | Marek Safar <marek.safar@gmail.com> | 2009-07-30 17:19:58 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2009-07-30 17:19:58 +0400 |
| commit | a4a749d6a3e9dd45f8357ec1d845c0bbed432475 (patch) | |
| tree | b9edab0f043016abac63bdb8ee059ac7b445aa32 /mcs/class/corlib/System.Security.Permissions | |
| parent | c437ca8cfb1bbb5aed79ca5b464af98c6788f930 (diff) | |
2009-07-30 Marek Safar <marek.safar@gmail.com>
* ReflectionPermission.cs: RestrictedMemberAccess can be set.
* ReflectionPermissionFlag.cs: Add [Obsolete] on NET_4_0.
svn path=/trunk/mcs/; revision=139075
Diffstat (limited to 'mcs/class/corlib/System.Security.Permissions')
3 files changed, 19 insertions, 1 deletions
diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog index dac1fd38599..02c5cd241a3 100644 --- a/mcs/class/corlib/System.Security.Permissions/ChangeLog +++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog @@ -1,3 +1,9 @@ +2009-07-30 Marek Safar <marek.safar@gmail.com> + + * ReflectionPermission.cs: RestrictedMemberAccess can be set. + + * ReflectionPermissionFlag.cs: Add [Obsolete] on NET_4_0. + 2009-06-05 Sebastien Pouliot <sebastien@ximian.com> * SecurityPermissionFlag.cs: Add [Obsolete] on NET_2_1 since CAS diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs index bb7dabcfad3..4b5073b2907 100644 --- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs @@ -63,7 +63,13 @@ namespace System.Security.Permissions { public ReflectionPermissionFlag Flags { get { return flags; } set { - if ((value & ReflectionPermissionFlag.AllFlags) != value) { +#if NET_2_0 + const ReflectionPermissionFlag all_flags = ReflectionPermissionFlag.AllFlags | ReflectionPermissionFlag.RestrictedMemberAccess; +#else + const ReflectionPermissionFlag all_flags = ReflectionPermissionFlag.AllFlags; +#endif + + if ((value & all_flags) != value) { string msg = String.Format (Locale.GetText ("Invalid flags {0}"), value); throw new ArgumentException (msg, "ReflectionPermissionFlag"); } diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs index 47917ce89e5..32d4a1b973e 100644 --- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs +++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs @@ -49,8 +49,14 @@ namespace System.Security.Permissions { MemberAccess = 0x00000002, +#if NET_4_0 + [Obsolete] +#endif ReflectionEmit = 0x4, +#if NET_4_0 + [Obsolete] +#endif AllFlags = TypeInformation | MemberAccess | ReflectionEmit, #if NET_2_0 |