2010-03-16 Rolf Bjarne Kvinge <RKvinge@novell.com>

	* Path.cs:
	* Directory.cs:
	* DirectoryInfo.cs: Add some of the 4.0 methods to Moonlight.

svn path=/trunk/mcs/; revision=153650

diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index ce6e19179fb8f4c0e006b88bfbb2f2e26e5347aa..e94fd183d9deadd6656d5cb2cf0912eb4497ad7a 100644 (file)
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-16  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * Path.cs:
+       * Directory.cs:
+       * DirectoryInfo.cs: Add some of the 4.0 methods to Moonlight.
+
 2010-03-15  Rolf Bjarne Kvinge  <RKvinge@novell.com>
 
        * SearchOption.cs: Make public for Moonlight, this type is in SL4.

diff --git a/mcs/class/corlib/System.IO/Directory.cs b/mcs/class/corlib/System.IO/Directory.cs
index 58a74aea3825f90aeac13b6f68191229fdd89570..61de9677dbd3f99d2bfe9ab92d330a7c23633626 100644 (file)
--- a/mcs/class/corlib/System.IO/Directory.cs
+++ b/mcs/class/corlib/System.IO/Directory.cs
@@ -522,7 +522,7 @@ namespace System.IO
                        return result;
                }
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
                public static string[] GetFileSystemEntries (string path, string searchPattern, SearchOption searchOption)
                {
                        // Take the simple way home:

diff --git a/mcs/class/corlib/System.IO/DirectoryInfo.cs b/mcs/class/corlib/System.IO/DirectoryInfo.cs
index 16b6e19dc27a0f5690a083f19d0a40d973863eb3..ac680a230c12b65f48dad49bcf94532e5a865081 100644 (file)
--- a/mcs/class/corlib/System.IO/DirectoryInfo.cs
+++ b/mcs/class/corlib/System.IO/DirectoryInfo.cs
@@ -370,7 +370,7 @@ namespace System.IO {
                }
 #endif
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
 
                public IEnumerable<DirectoryInfo> EnumerateDirectories ()
                {

diff --git a/mcs/class/corlib/System.IO/Path.cs b/mcs/class/corlib/System.IO/Path.cs
index 0c78b0350aae11adb712d5d98c9d4eab38cf6dda..471d37c227fd58c3e47f2f543b4d2612c8103b33 100644 (file)
--- a/mcs/class/corlib/System.IO/Path.cs
+++ b/mcs/class/corlib/System.IO/Path.cs
@@ -736,7 +736,7 @@ namespace System.IO {
                        return String.Compare (subset, slast, path, slast, subset.Length - slast) == 0;
                }
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
                public static string Combine (params string [] paths)
                {
                        if (paths == null)