Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -45,10 +45,10 @@ namespace System.Security.Permissions {
_flags = DataProtectionPermissionFlags.AllFlags;
}
public DataProtectionPermission (DataProtectionPermissionFlags flags)
public DataProtectionPermission (DataProtectionPermissionFlags flag)
{
// reuse validation by the Flags property
Flags = flags;
Flags = flag;
}
@@ -114,15 +114,15 @@ namespace System.Security.Permissions {
return ((_flags & ~dp._flags) == 0);
}
public override void FromXml (SecurityElement e)
public override void FromXml (SecurityElement securityElement)
{
// General validation in CodeAccessPermission
PermissionHelper.CheckSecurityElement (e, "e", version, version);
PermissionHelper.CheckSecurityElement (securityElement, "securityElement", version, version);
// Note: we do not (yet) care about the return value
// as we only accept version 1 (min/max values)
_flags = (DataProtectionPermissionFlags) Enum.Parse (
typeof (DataProtectionPermissionFlags), e.Attribute ("Flags"));
typeof (DataProtectionPermissionFlags), securityElement.Attribute ("Flags"));
}
public override SecurityElement ToXml ()