Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -90,7 +90,7 @@ namespace System.Security.Permissions {
private PermissionSet CreateFromXml (string xml)
{
#if !NET_2_1
#if !MOBILE
SecurityParser sp = new SecurityParser ();
try {
sp.LoadXml (xml);
@@ -125,7 +125,7 @@ namespace System.Security.Permissions {
public PermissionSet CreatePermissionSet ()
{
PermissionSet pset = null;
#if !NET_2_1
#if !MOBILE
if (this.Unrestricted)
pset = new PermissionSet (PermissionState.Unrestricted);
else {