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

@ -36,7 +36,7 @@ namespace System.Runtime
[SecurityCritical]
internal static bool IsInFullTrust()
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
if (!SecurityManager.CurrentThreadRequiresSecurityContextCapture())
{
return true;
@ -114,7 +114,7 @@ namespace System.Runtime
[SecurityCritical]
internal static bool CheckAppDomainPermissions(PermissionSet permissions)
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
return AppDomain.CurrentDomain.IsHomogenous &&
permissions.IsSubsetOf(AppDomain.CurrentDomain.PermissionSet);
#else
@ -126,7 +126,7 @@ namespace System.Runtime
[SecurityCritical]
internal static bool HasEtwPermissions()
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
//Currently unrestricted permissions are required to create Etw provider.
PermissionSet permissions = new PermissionSet(PermissionState.Unrestricted);
return CheckAppDomainPermissions(permissions);
@ -142,7 +142,7 @@ namespace System.Runtime
[SecuritySafeCritical]
get
{
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
if (!checkedForFullTrust)
{
inFullTrust = AppDomain.CurrentDomain.IsFullyTrusted;