From 5f25d80c169e12c94ab824de72c171950c002302 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 17 Nov 2020 09:30:08 +0100 Subject: [PATCH] [tools] Use the same defaults for exception marshalling for catalyst as we use for Xamarin.Mac. --- tools/common/Application.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/common/Application.cs b/tools/common/Application.cs index 32f26811e3..af1355808a 100644 --- a/tools/common/Application.cs +++ b/tools/common/Application.cs @@ -1202,6 +1202,7 @@ namespace Xamarin.Bundler { MarshalManagedExceptions = EnableDebug && IsSimulatorBuild ? MarshalManagedExceptionMode.UnwindNativeCode : MarshalManagedExceptionMode.Disable; break; case ApplePlatform.MacOSX: + case ApplePlatform.MacCatalyst: MarshalManagedExceptions = EnableDebug ? MarshalManagedExceptionMode.UnwindNativeCode : MarshalManagedExceptionMode.Disable; break; default: @@ -1232,6 +1233,7 @@ namespace Xamarin.Bundler { MarshalObjectiveCExceptions = EnableDebug && IsSimulatorBuild ? MarshalObjectiveCExceptionMode.UnwindManagedCode : MarshalObjectiveCExceptionMode.Disable; break; case ApplePlatform.MacOSX: + case ApplePlatform.MacCatalyst: MarshalObjectiveCExceptions = EnableDebug ? MarshalObjectiveCExceptionMode.ThrowManagedException : MarshalObjectiveCExceptionMode.Disable; break; default: