[mmp] The partial static registrar can't be used with custom managed exception marshaling. Fixes #55870. (#2064)

This is because the generated output from the static registrar depends on the
managed exception marshaling mode, and the partial static registrar executes
with the default managed exception marshaling mode.

https://bugzilla.xamarin.com/show_bug.cgi?id=55870
This commit is contained in:
Rolf Bjarne Kvinge 2017-05-10 07:24:53 +02:00 коммит произвёл GitHub
Родитель 7571635efb
Коммит 477f5dc561
1 изменённых файлов: 1 добавлений и 1 удалений

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

@ -663,7 +663,7 @@ namespace Xamarin.Bundler {
{ {
if (!App.EnableDebug) if (!App.EnableDebug)
registrar = RegistrarMode.Static; registrar = RegistrarMode.Static;
else if (IsUnified && App.LinkMode == LinkMode.None && embed_mono) else if (IsUnified && App.LinkMode == LinkMode.None && embed_mono && App.IsDefaultMarshalManagedExceptionMode)
registrar = RegistrarMode.PartialStatic; registrar = RegistrarMode.PartialStatic;
else else
registrar = RegistrarMode.Dynamic; registrar = RegistrarMode.Dynamic;