Merge pull request #901 from Blewzman/FixAggregateExceptionGetBaseException

[mono.git] / mcs / class / System / System.IO / FileSystemWatcher.cs

diff --git a/mcs/class/System/System.IO/FileSystemWatcher.cs b/mcs/class/System/System.IO/FileSystemWatcher.cs
index 88dd5d813dd7c34cdb0757f5046af06a671c75e8..125f07805f9403f212fe5789357ff92bd0d02f33 100644 (file)
--- a/mcs/class/System/System.IO/FileSystemWatcher.cs
+++ b/mcs/class/System/System.IO/FileSystemWatcher.cs
@@ -40,9 +40,7 @@ using System.Threading;
 
 namespace System.IO {
        [DefaultEvent("Changed")]
-#if NET_2_0
        [IODescription ("")]
-#endif
        public class FileSystemWatcher : Component, ISupportInitialize {
 
                #region Fields
@@ -95,7 +93,7 @@ namespace System.IO {
                                throw new ArgumentException ("Empty path", "path");
 
                        if (!Directory.Exists (path))
-                               throw new ArgumentException ("Directory does not exists", "path");
+                               throw new ArgumentException ("Directory does not exist", "path");
 
                        this.enableRaisingEvents = false;
                        this.filter = filter;
@@ -314,7 +312,7 @@ namespace System.IO {
                                        throw new ArgumentException ("Invalid directory name", "value", exc);
 
                                if (!exists)
-                                       throw new ArgumentException ("Directory does not exists", "value");
+                                       throw new ArgumentException ("Directory does not exist", "value");
 
                                path = value;
                                fullpath = null;
@@ -333,9 +331,7 @@ namespace System.IO {
 
                [DefaultValue(null)]
                [IODescription("The object used to marshal the event handler calls resulting from a directory change")]
-#if NET_2_0
                [Browsable (false)]
-#endif
                public ISynchronizeInvoke SynchronizingObject {
                        get { return synchronizingObject; }
                        set { synchronizingObject = value; }