Use the right FileSystemWatcher sources (#16539)

* Use the right FileSystemWatcher sources

The corefx code for FileSystemEventArgs has some changes to support
constructing one with a null filename.

Fixes #16486

* Remove the mono sources for the newly replaced files

* [csproj] Update project files

4 files changed, 5 insertions, 113 deletions

diff --git a/mcs/class/System/System.IO/FileSystemEventArgs.cs b/mcs/class/System/System.IO/FileSystemEventArgs.cs
deleted file mode 100644
index ef7e7ed0d7e..00000000000
--- a/mcs/class/System/System.IO/FileSystemEventArgs.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 

-// System.IO.FileSystemEventArgs.cs

-//

-// Author:

-//   Tim Coleman (tim@timcoleman.com)

-//

-// Copyright (C) Tim Coleman, 2002

-//

-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-

-using System;

-

-namespace System.IO {

-	public class FileSystemEventArgs : EventArgs {

-

-		#region Fields

-

-		WatcherChangeTypes changeType;

-		string directory;

-		string name;

-

-		#endregion // Fields

-

-		#region Constructors

-

-		public FileSystemEventArgs (WatcherChangeTypes changeType, string directory, string name) 

-		{

-			this.changeType = changeType;

-			this.directory = directory;

-			this.name = name;

-		}

-		

-		internal void SetName (string name)

-		{

-			this.name = name;

-		}

-		#endregion // Constructors

-

-		#region Properties

-

-		public WatcherChangeTypes ChangeType {

-			get { return changeType; }

-		}

-

-		public string FullPath {

-			get { return Path.Combine (directory, name); }

-		}

-

-		public string Name {

-			get { return name; }

-		}

-

-		#endregion // Properties

-	}

-}

diff --git a/mcs/class/System/System.IO/FileSystemEventHandler.cs b/mcs/class/System/System.IO/FileSystemEventHandler.cs
deleted file mode 100644
index 16b0ad0cb0c..00000000000
--- a/mcs/class/System/System.IO/FileSystemEventHandler.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// 

-// System.IO.FileSystemEventHandler.cs

-//

-// Author:

-//   Tim Coleman (tim@timcoleman.com)

-//

-// Copyright (C) Tim Coleman, 2002

-// Copyright (C) 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
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-

-namespace System.IO {

-
-	public delegate void FileSystemEventHandler (object sender, FileSystemEventArgs e);

-}

diff --git a/mcs/class/System/System.csproj b/mcs/class/System/System.csproj
index 22898b0bd1d..5c1e07ac1e5 100644
--- a/mcs/class/System/System.csproj
+++ b/mcs/class/System/System.csproj
@@ -412,6 +412,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\CompressionMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\GZipStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\WaitForChangedResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.Mail\src\System\Net\Base64Stream.cs" />
@@ -866,8 +868,6 @@
     <Compile Include="System.IO.Compression\DeflateStream.cs" />
     <Compile Include="System.IO\ErrorEventArgs.cs" />
     <Compile Include="System.IO\ErrorEventHandler.cs" />
-    <Compile Include="System.IO\FileSystemEventArgs.cs" />
-    <Compile Include="System.IO\FileSystemEventHandler.cs" />
     <Compile Include="System.IO\IODescriptionAttribute.cs" />
     <Compile Include="System.IO\InternalBufferOverflowException.cs" />
     <Compile Include="System.IO\InvalidDataException.cs" />
diff --git a/mcs/class/System/common.sources b/mcs/class/System/common.sources
index 0bc6430b7a3..de785afbbe1 100644
--- a/mcs/class/System/common.sources
+++ b/mcs/class/System/common.sources
@@ -28,8 +28,6 @@ System.IO.Compression/DeflateStream.cs
 
 System.IO/ErrorEventArgs.cs
 System.IO/ErrorEventHandler.cs
-System.IO/FileSystemEventArgs.cs
-System.IO/FileSystemEventHandler.cs
 System.IO/InternalBufferOverflowException.cs
 System.IO/InvalidDataException.cs
 System.IO/IODescriptionAttribute.cs
@@ -872,13 +870,15 @@ ReferenceSources/Win32Exception.cs
 ../../../external/corefx/src/System.Private.Uri/src/System/UriBuilder.cs
 
 ../../../external/corefx/src/System.Runtime.Extensions/src/System/CodeDom/Compiler/IndentedTextWriter.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemEventArgs.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemEventHandler.cs
+../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
 ../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/WaitForChangedResult.cs
 
 ../../../external/corefx/src/System.Runtime.InteropServices/src/System/Security/SecureStringMarshal.cs
 ../../../external/corefx/src/System.Runtime.Extensions/src/System/StringNormalizationExtensions.cs
 ../../../external/corefx/src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackFrameExtensions.cs
 
-../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
 
 # Everything except compiled
 ../../../external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Capture.cs