diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2005-05-16 16:03:08 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2005-05-16 16:03:08 +0400 |
| commit | f93c5365509affe3c250fb119b4e36342c5a3c4d (patch) | |
| tree | 02ceca751b0e13c6c3a58ae5fd867e4b7a7397ae /mcs/class/corlib/System.Security.Permissions | |
| parent | c41b07156f2ff6caa9dfc9db3b061205ef13dd8b (diff) | |
2005-05-16 Sebastien Pouliot <sebastien@ximian.com>
* IsolatedStoragePermission.cs: Added UserQuota attribute in XML.
svn path=/trunk/mcs/; revision=44555
Diffstat (limited to 'mcs/class/corlib/System.Security.Permissions')
| -rw-r--r-- | mcs/class/corlib/System.Security.Permissions/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog index 3247ad63366..1b3b1d3e812 100644 --- a/mcs/class/corlib/System.Security.Permissions/ChangeLog +++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog @@ -1,3 +1,7 @@ +2005-05-16 Sebastien Pouliot <sebastien@ximian.com> + + * IsolatedStoragePermission.cs: Added UserQuota attribute in XML. + 2005-05-12 Atsushi Enomoto <atsushi@ximian.com> * PermissionSetAttribute.cs : MiniParser->SmallXmlParser changes. diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs index d07cac0d12e..536ee27deab 100644 --- a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs +++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs @@ -29,11 +29,15 @@ // using System.Globalization; +using System.Runtime.InteropServices; namespace System.Security.Permissions { [Serializable] [SecurityPermission (SecurityAction.InheritanceDemand, ControlEvidence = true, ControlPolicy = true)] +#if NET_2_0 + [ComVisible (true)] +#endif public abstract class IsolatedStoragePermission : CodeAccessPermission, IUnrestrictedPermission { private const int version = 1; @@ -85,8 +89,11 @@ namespace System.Security.Permissions { if (m_allowed == IsolatedStorageContainment.UnrestrictedIsolatedStorage) se.AddAttribute ("Unrestricted", "true"); - else + else { se.AddAttribute ("Allowed", m_allowed.ToString ()); + if (m_userQuota > 0) + se.AddAttribute ("UserQuota", m_userQuota.ToString ()); + } return se; } @@ -106,13 +113,20 @@ namespace System.Security.Permissions { if (IsUnrestricted (esd)) { UsageAllowed = IsolatedStorageContainment.UnrestrictedIsolatedStorage; - } - else { + } else { string a = esd.Attribute ("Allowed"); if (a != null) { UsageAllowed = (IsolatedStorageContainment) Enum.Parse ( typeof (IsolatedStorageContainment), a); } + a = esd.Attribute ("UserQuota"); + if (a != null) { + try { + Int64.Parse (a, true, out m_userQuota); + } + catch (Exception) { + } + } } } |