| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent df2aa64 commit f55ee1e
3 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | 15 | - Arvid JB ([@ArvidJB](https://github.com/ArvidJB)) | |
| 16 | 16 | - Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich)) | |
| 17 | + - Callum Noble ([@callumnoble](https://github.com/callumnoble)) | ||
| 17 | 18 | - Christian Heimes ([@tiran](https://github.com/tiran)) | |
| 18 | 19 | - Christoph Gohlke ([@cgohlke](https://github.com/cgohlke)) | |
| 19 | 20 | - Christopher Pow ([@christopherpow](https://github.com/christopherpow)) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -30,6 +30,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][]. | |||
| 30 | 30 | - Fixed double calling of constructor when deriving from .NET class (#495) | |
| 31 | 31 | - Fixed `clr.GetClrType` when iterating over `System` members (#607) | |
| 32 | 32 | - Fixed `LockRecursionException` when loading assemblies (#627) | |
| 33 | + - Fixed errors breaking .NET Remoting on method invoke (#276) | ||
| 33 | 34 | ||
| 34 | 35 | ||
| 35 | 36 | ## [2.3.0][] - 2017-03-11 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -155,7 +155,15 @@ internal static IntPtr ToPython(object value, Type type) | |||
| 155 | 155 | var pyderived = value as IPythonDerivedType; | |
| 156 | 156 | if (null != pyderived) | |
| 157 | 157 | { | |
| 158 | + #if NETSTANDARD | ||
| 158 | 159 | return ClassDerivedObject.ToPython(pyderived); | |
| 160 | + #else | ||
| 161 | + // if object is remote don't do this | ||
| 162 | + if (!System.Runtime.Remoting.RemotingServices.IsTransparentProxy(pyderived)) | ||
| 163 | + { | ||
| 164 | + return ClassDerivedObject.ToPython(pyderived); | ||
| 165 | + } | ||
| 166 | + #endif | ||
| 159 | 167 | } | |
| 160 | 168 | ||
| 161 | 169 | // hmm - from Python, we almost never care what the declared | |
| Back | FazBrowse Home | New Git URL |
0 commit comments