[Facades] Fixes System.Threading.Overlapped

4 files changed, 4 insertions, 24 deletions

diff --git a/mcs/class/Facades/System.Threading.Overlapped/Makefile b/mcs/class/Facades/System.Threading.Overlapped/Makefile
index 71630db2e94..44d534b1843 100644
--- a/mcs/class/Facades/System.Threading.Overlapped/Makefile
+++ b/mcs/class/Facades/System.Threading.Overlapped/Makefile
@@ -12,10 +12,9 @@ LIBRARY = System.Threading.Overlapped.dll
 KEY_FILE = ../../msfinal.pub
 SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
-LIB_MCS_FLAGS = $(SIGN_FLAGS) -unsafe -nowarn:3021
+LIB_MCS_FLAGS = $(SIGN_FLAGS)
 
-RESX_RESOURCE_STRING = \
-    ../../../../external/corefx/src/System.Threading.Overlapped/src/Resources/Strings.resx
+PLATFORM_DEBUG_FLAGS =
 
 NO_TEST = yes
 
diff --git a/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources b/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources
index a8d9932de85..719628dc7c6 100644
--- a/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources
+++ b/mcs/class/Facades/System.Threading.Overlapped/System.Threading.Overlapped.dll.sources
@@ -1,10 +1,2 @@
 TypeForwarders.cs
 AssemblyInfo.cs
-
-corefx/SR.cs
-
-../../../../external/corefx/src/Common/src/System/HResults.cs
-../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolBoundHandle.cs
-../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolBoundHandleOverlapped.cs
-../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/ClrThreadPoolPreAllocatedOverlapped.cs
-../../../../external/corefx/src/System.Threading.Overlapped/src/System/Threading/DeferredDisposableLifetime.cs
diff --git a/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs b/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs
index dd272df5d99..6610d8849e0 100644
--- a/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs
+++ b/mcs/class/Facades/System.Threading.Overlapped/TypeForwarders.cs
@@ -22,3 +22,5 @@
 
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.IOCompletionCallback))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.NativeOverlapped))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.PreAllocatedOverlapped))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.ThreadPoolBoundHandle))]
diff --git a/mcs/class/Facades/System.Threading.Overlapped/corefx/SR.cs b/mcs/class/Facades/System.Threading.Overlapped/corefx/SR.cs
deleted file mode 100644
index 7c2846a6b4f..00000000000
--- a/mcs/class/Facades/System.Threading.Overlapped/corefx/SR.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// This file was generated by resx2sr tool
-//
-
-partial class SR
-{
-	public const string Argument_AlreadyBoundOrSyncHandle = "'handle' has already been bound to the thread pool, or was not opened for asynchronous I/O.";
-	public const string Argument_InvalidHandle = "'handle' has been disposed or is an invalid handle.";
-	public const string Argument_NativeOverlappedAlreadyFree = "'overlapped' has already been freed.";
-	public const string Argument_NativeOverlappedWrongBoundHandle = "'overlapped' was not allocated by this ThreadPoolBoundHandle instance.";
-	public const string Argument_PreAllocatedAlreadyAllocated = "'preAllocated' is already in use.";
-	public const string InvalidOperation_NativeOverlappedReused = "NativeOverlapped cannot be reused for multiple operations.";
-}