Imported Upstream version 3.8.0

Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
This commit is contained in:
Jo Shields
2014-09-04 09:07:35 +01:00
parent a575963da9
commit fe777c5c82
1062 changed files with 12460 additions and 5983 deletions

View File

@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Security;
#if !NET_2_1
#if !MOBILE
using System.Security.AccessControl;
#endif
@ -93,7 +93,6 @@ namespace System.IO {
}
}
#if !NET_2_1
public bool IsReadOnly {
get {
if (!Exists)
@ -138,7 +137,6 @@ namespace System.IO {
// handling this exception to work properly.
throw new NotSupportedException (Locale.GetText ("File encryption isn't supported on any file system."));
}
#endif
public long Length {
get {
@ -265,15 +263,10 @@ namespace System.IO {
public override string ToString ()
{
#if NET_2_1
// for Moonlight we *never* return paths, since ToString is not [SecurityCritical] we simply return the Name
return Name;
#else
return OriginalPath;
#endif
}
#if !NET_2_1
#if !MOBILE
public FileSecurity GetAccessControl ()
{
return File.GetAccessControl (FullPath);