Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -54,9 +54,6 @@ namespace MonoCasTests.System.Web.Caching {
// note: CacheDependency still requires some file access
[FileIOPermission (SecurityAction.Assert, Unrestricted = true)]
#if ONLY_1_1
[SecurityPermission (SecurityAction.Assert, UnmanagedCode = true)]
#endif
private object FileIOPermissionCreateControl (SecurityAction action, AspNetHostingPermissionLevel level)
{
return CreateControlStringCtor (action, level);
@ -69,13 +66,6 @@ namespace MonoCasTests.System.Web.Caching {
return FileIOPermissionCreateControl (action, level);
}
catch (TargetInvocationException tie) {
#if ONLY_1_1
// hide this error (occurs with ms 1.x)
if ((tie.InnerException is NullReferenceException) &&
(level == AspNetHostingPermissionLevel.Unrestricted)) {
return String.Empty;
}
#endif
throw tie;
}
}