X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.IO%2FFile.cs;h=3d042b11f329245ffa01ee99e2d1a6bed16c0814;hb=5760f579fb341ebc89adef52db260d78535cb7da;hp=2d2aad024c99e55177939d44e67dbbe9d12b1353;hpb=af90548a08ef5effc93b083b7eec44daa178b141;p=mono.git

diff --git a/mcs/class/corlib/System.IO/File.cs b/mcs/class/corlib/System.IO/File.cs
index 2d2aad024c9..3d042b11f32 100644
--- a/mcs/class/corlib/System.IO/File.cs
+++ b/mcs/class/corlib/System.IO/File.cs
@@ -10,10 +10,7 @@
 //
 // Copyright 2002 Ximian, Inc. http://www.ximian.com
 // Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -474,7 +471,6 @@ namespace System.IO
 			}
 		}
 
-#if NET_2_0
 		public static string [] ReadAllLines (string path)
 		{
 			using (StreamReader reader = File.OpenText (path)) {
@@ -496,7 +492,6 @@ namespace System.IO
 				list.Add (reader.ReadLine ());
 			return list.ToArray ();
 		}
-#endif
 
 		public static string ReadAllText (string path)
 		{
@@ -510,7 +505,6 @@ namespace System.IO
 			}
 		}
 
-#if NET_2_0
 		public static void WriteAllBytes (string path, byte [] data)
 		{
 			using (Stream stream = File.Create (path)) {
@@ -537,7 +531,6 @@ namespace System.IO
 			foreach (string line in lines)
 				writer.WriteLine (line);
 		}
-#endif
 
 		public static void WriteAllText (string path, string contents)
 		{
@@ -552,6 +545,26 @@ namespace System.IO
 		}
 
 		private static readonly DateTime _defaultLocalFileTime;
+
+		[MonoLimitation ("File encryption isn't supported (even on NTFS).")]
+		public static void Encrypt (string path)
+		{
+			// MS.NET support this only on NTFS file systems, i.e. it's a file-system (not a framework) feature.
+			// otherwise it throws a NotSupportedException (or a PlatformNotSupportedException on older OS).
+			// we throw the same (instead of a NotImplementedException) because most code should already be
+			// handling this exception to work properly.
+			throw new NotSupportedException (Locale.GetText ("File encryption isn't supported on any file system."));
+		}
+
+		[MonoLimitation ("File encryption isn't supported (even on NTFS).")]
+		public static void Decrypt (string path)
+		{
+			// MS.NET support this only on NTFS file systems, i.e. it's a file-system (not a framework) feature.
+			// otherwise it throws a NotSupportedException (or a PlatformNotSupportedException on older OS).
+			// we throw the same (instead of a NotImplementedException) because most code should already be
+			// handling this exception to work properly.
+			throw new NotSupportedException (Locale.GetText ("File encryption isn't supported on any file system."));
+		}
 #endif
 	}
 }