Merge pull request #1082 from esdrubal/bug19287

[mono.git] / mcs / class / corlib / System.IO / FileInfo.cs

diff --git a/mcs/class/corlib/System.IO/FileInfo.cs b/mcs/class/corlib/System.IO/FileInfo.cs
index 0911f8152c4827f7fdafb5f2dd993d302a651da0..cad54a4d553f71ff2141c8227c880d16332a2add 100644 (file)
--- a/mcs/class/corlib/System.IO/FileInfo.cs
+++ b/mcs/class/corlib/System.IO/FileInfo.cs
@@ -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);