Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -15,11 +15,11 @@ namespace System.Xml {
[PermissionSetAttribute(SecurityAction.InheritanceDemand, Name = "FullTrust")]
public partial class XmlSecureResolver : XmlResolver {
XmlResolver resolver;
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
PermissionSet permissionSet;
#endif
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
public XmlSecureResolver(XmlResolver resolver, string securityUrl) : this(resolver, CreateEvidenceForUrl(securityUrl)) {}
public XmlSecureResolver(XmlResolver resolver, Evidence evidence) : this(resolver, SecurityManager.GetStandardSandbox(evidence)) {}
@ -31,7 +31,7 @@ namespace System.Xml {
public XmlSecureResolver(XmlResolver resolver, PermissionSet permissionSet) {
this.resolver = resolver;
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
this.permissionSet = permissionSet;
#endif
}
@ -41,7 +41,7 @@ namespace System.Xml {
}
public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn) {
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
permissionSet.PermitOnly();
#endif
return resolver.GetEntity(absoluteUri, role, ofObjectToReturn);
@ -54,7 +54,7 @@ namespace System.Xml {
}
public static Evidence CreateEvidenceForUrl(string securityUrl) {
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
Evidence evidence = new Evidence();
if (securityUrl != null && securityUrl.Length > 0) {
evidence.AddHostEvidence(new Url(securityUrl));
@ -79,7 +79,7 @@ namespace System.Xml {
#endif
}
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
[Serializable]
private class UncDirectory : EvidenceBase, IIdentityPermissionFactory {
private string uncDir;