Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -51,7 +51,9 @@ namespace System.Resources {
// Don't use Assembly manifest, but grovel on disk for a file.
try
{
#if !DISABLE_CAS_USE
new System.Security.Permissions.FileIOPermission(System.Security.Permissions.PermissionState.Unrestricted).Assert();
#endif
// Create new ResourceSet, if a file exists on disk for it.
String tempFileName = _mediator.GetResourceFileName(culture);
@@ -77,7 +79,9 @@ namespace System.Resources {
}
finally
{
#if !DISABLE_CAS_USE
System.Security.CodeAccessPermission.RevertAssert();
#endif
}
}