Removes PNSE version of DispatchWrapper and keep only single version with ifdef

Commit migrated from https://github.com/dotnet/coreclr/commit/006771e3e7d2037a66093008b9c17e4927cd4745

diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/NonPortable.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/NonPortable.cs
index 49047a8..590a551 100644 (file)
--- a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/NonPortable.cs
+++ b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/NonPortable.cs
@@ -203,16 +203,6 @@ namespace System.Runtime.InteropServices
         }
     }
 
-    public class DispatchWrapper
-    {
-        public DispatchWrapper(object obj)
-        {
-            throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop);
-        }
-
-        public object WrappedObject => throw new PlatformNotSupportedException(SR.PlatformNotSupported_ComInterop);
-    }
-
     public static class ComEventsHelper
     {
         public static void Combine(object rcw, Guid iid, int dispid, Delegate d)

diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs
index b5c1d2b..12f0abc 100644 (file)
--- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/DispatchWrapper.cs
@@ -24,7 +24,7 @@ namespace System.Runtime.InteropServices
         {
             if (obj != null)
             {
-#if CORERT
+#if CORERT || !FEATURE_COMINTEROP
                 throw new PlatformNotSupportedException();
 #else
                 // Make sure this guy has an IDispatch