2010-01-26 Marek Habersack <mhabersack@novell.com>

	* net_2_1_raw_corlib.dll.sources: added System.IO/SearchOption.cs
	to fix the build.

2010-01-26  Marek Habersack  <mhabersack@novell.com>

	* SearchOption.cs: included in 2.1 build as internal to fix
	the build.

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

diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index 310d926b0fab88f3ffdb9208cd35977868acd542..bbc5f2be96d08dbd1e0aeff448d0d71579f3b2c6 100644 (file)
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-26  Marek Habersack  <mhabersack@novell.com>
+
+       * net_2_1_raw_corlib.dll.sources: added System.IO/SearchOption.cs
+       to fix the build.
+
 2009-12-03  Marek Habersack  <mhabersack@novell.com>
 
        * corlib.dll.sources: added

diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index 94eff7dcef8104a84a517f4ef896cb19636f1ae0..3471e6eb0d2c6d2c34a966c8791538a82b75baf9 100644 (file)
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-26  Marek Habersack  <mhabersack@novell.com>
+
+       * SearchOption.cs: included in 2.1 build as internal to fix
+       the build.
+
 2010-01-25 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * DirectoryInfo.cs: new overload for GetFileSystemInfos().

diff --git a/mcs/class/corlib/System.IO/SearchOption.cs b/mcs/class/corlib/System.IO/SearchOption.cs
index 8af3692e009e66414427fb0aa22aa7677a13212b..d77ec7bf58cad5ebe602dad0b208f624fde1f656 100644 (file)
--- a/mcs/class/corlib/System.IO/SearchOption.cs
+++ b/mcs/class/corlib/System.IO/SearchOption.cs
@@ -31,10 +31,12 @@
 using System.Runtime.InteropServices;
 
 namespace System.IO {
-
+#if !NET_2_1 || MONOTOUCH
        [ComVisible (true)]
        [Serializable]
-       public enum SearchOption {
+       public
+#endif
+       enum SearchOption {
                TopDirectoryOnly = 0,
                AllDirectories = 1
        }

diff --git a/mcs/class/corlib/net_2_1_raw_corlib.dll.sources b/mcs/class/corlib/net_2_1_raw_corlib.dll.sources
index 9f1d695825d79be04cea4305c02a7e2b12d01827..6d0055bd1bd9f087c84c11b6bef732e27d4a4084 100644 (file)
--- a/mcs/class/corlib/net_2_1_raw_corlib.dll.sources
+++ b/mcs/class/corlib/net_2_1_raw_corlib.dll.sources
@@ -349,6 +349,7 @@ System.IO/MonoFileType.cs
 System.IO/MonoIOStat.cs
 System.IO/Path.cs
 System.IO/PathTooLongException.cs
+System.IO/SearchOption.cs
 System.IO/SearchPattern.cs
 System.IO/SeekOrigin.cs
 System.IO/Stream.cs