From 477f5dc5614e166d1b7b3a58609edfc6d9603f90 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 10 May 2017 07:24:53 +0200 Subject: [PATCH] [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 --- tools/mmp/driver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs index 71cbdd467d..7158257adf 100644 --- a/tools/mmp/driver.cs +++ b/tools/mmp/driver.cs @@ -663,7 +663,7 @@ namespace Xamarin.Bundler { { if (!App.EnableDebug) 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; else registrar = RegistrarMode.Dynamic;