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

@@ -30,7 +30,7 @@ namespace System.Diagnostics {
get {
if (stackTrace == null)
stackTrace = Environment.StackTrace;
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
else
new EnvironmentPermission(PermissionState.Unrestricted).Demand();
#endif
@@ -77,7 +77,7 @@ namespace System.Diagnostics {
[ResourceExposure(ResourceScope.None)]
[ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
private static void InitProcessInfo() {
#if FEATURE_MONO_CAS
#if MONO_FEATURE_CAS
// Demand unmanaged code permission
new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Demand();
#endif