Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -7,7 +7,9 @@ namespace System.Xml {
[PermissionSetAttribute(SecurityAction.InheritanceDemand, Name = "FullTrust")]
public partial class XmlSecureResolver : XmlResolver {
public override Task<object> GetEntityAsync(Uri absoluteUri, string role, Type ofObjectToReturn) {
#if !DISABLE_CAS_USE
permissionSet.PermitOnly();
#endif
return resolver.GetEntityAsync(absoluteUri, role, ofObjectToReturn);
}
}