Fixed errors breaking .NET Remoting on method invoke (#276)

This commit is contained in:
Callum Noble 2017-12-19 16:30:04 -08:00
Родитель df2aa64f19
Коммит f55ee1e3b4
3 изменённых файлов: 10 добавлений и 0 удалений

Просмотреть файл

@ -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))

Просмотреть файл

@ -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

Просмотреть файл

@ -155,7 +155,15 @@ namespace Python.Runtime
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