Merge pull request #637 from callumnoble/fix-remoting

den-run-ai · web-flow · commit 19d854c72e1f · 2018-03-01T18:43:24.000-06:00
Fixed errors breaking .NET Remoting on method invoke (#276)
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -14,6 +14,7 @@
 
 -   Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
 -   Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
+-   Callum Noble ([@callumnoble](https://github.com/callumnoble))
 -   Christian Heimes ([@tiran](https://github.com/tiran))
 -   Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
 -   Christopher Pow ([@christopherpow](https://github.com/christopherpow))
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed double calling of constructor when deriving from .NET class (#495)
 -   Fixed `clr.GetClrType` when iterating over `System` members (#607) 
 -   Fixed `LockRecursionException` when loading assemblies (#627)
+-   Fixed errors breaking .NET Remoting on method invoke (#276)
 
 
 ## [2.3.0][] - 2017-03-11
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -155,7 +155,15 @@ internal static IntPtr ToPython(object value, Type type)
             var pyderived = value as IPythonDerivedType;
             if (null != pyderived)
             {
+                #if NETSTANDARD
                 return ClassDerivedObject.ToPython(pyderived);
+                #else
+                // if object is remote don't do this
+                if (!System.Runtime.Remoting.RemotingServices.IsTransparentProxy(pyderived))
+                {
+                    return ClassDerivedObject.ToPython(pyderived);
+                }
+                #endif
             }
 
             // hmm - from Python, we almost never care what the declared
