Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7f9c8cb
Sentry options - ios | introduce `IOS.ExceptionMode` option
bricefriha Nov 5, 2024
b0f054d
Format code
getsentry-bot Nov 5, 2024
af21af8
change log - update | add entry for #3729
bricefriha Nov 5, 2024
70a493b
IOS Options - MarshalExceptionMode | move enum to StructsAndEnums.cs
bricefriha Nov 5, 2024
11251b5
iOS option - MarshalManagedException | introduce `EnableMarshalManage…
bricefriha Nov 6, 2024
1173231
Change log - | update entry for EnableMarshalManagedException
bricefriha Nov 6, 2024
b571c57
iOS option - MarshalManagedException | make sure to get `EnableMarsha…
bricefriha Nov 6, 2024
82151e7
SentryOptions - iOS | remove IOSOptions reference
bricefriha Nov 6, 2024
e5a1f81
Update SentryOptions.cs | added spacing between EnableTracing and Ena…
bricefriha Nov 6, 2024
38e403d
Format code
getsentry-bot Nov 6, 2024
7b19d72
iOS - bindablesentry options | add `EnableMarshalManagedException`
bricefriha Nov 6, 2024
aa2cc4d
unit tests - iOS options | EnableMarshalManagedException setter test
bricefriha Nov 6, 2024
0528ac6
Cocoa/SentryOptions.cs | Update code doc
bricefriha Nov 6, 2024
f271bb0
Cocoa/SentrySdk.cs - MarshalManagedException | Update code doc
bricefriha Nov 6, 2024
9308b84
Update CHANGELOG.md entry to #3729
bricefriha Nov 6, 2024
e066eb3
iOS - initialisation | bypass the subscription to the subscription o…
bricefriha Nov 6, 2024
3386940
iOS - initialisation | just realised we already have a method that ch…
bricefriha Nov 6, 2024
35f6cdf
Format code
getsentry-bot Nov 6, 2024
114c7c2
Merge branch 'main' into fix/#3680
bricefriha Nov 7, 2024
137a68f
changelog | update entry post merge
bricefriha Nov 7, 2024
fa4d434
cocoa - build transitive | prevent use of unsupported marshalling beh…
bricefriha Nov 7, 2024
9137e0c
InitSentryCocoaSdk - Native AOT | set `marshal-managed-exceptions` at…
bricefriha Nov 8, 2024
baef746
Merge branch 'main' into fix/#3680
jamescrosswell Nov 16, 2024
2e63d5e
Merge branch 'main' into pr/3729
jamescrosswell Nov 20, 2024
4d2064d
Update src/Sentry.Bindings.Cocoa/buildTransitive/Sentry.Bindings.Coco…
bricefriha Nov 20, 2024
a4c2d32
Merge branch 'main' into fix/#3680
jamescrosswell Nov 20, 2024
7ba17b3
Cocoa - Build transitive | remove previously set `MtouchNoSymbolStrip`
bricefriha Nov 20, 2024
16965a9
Update src/Sentry.Bindings.Cocoa/buildTransitive/Sentry.Bindings.Coco…
jamescrosswell Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

- ArgumentNullException in FormRequestPayloadExtractor when handling invalid form data on ASP.NET ([#3734](https://github.com/getsentry/sentry-dotnet/pull/3734))
- Crash when using NLog with FailedRequestStatusCodes options in a Maui app with Trimming enabled ([#3743](https://github.com/getsentry/sentry-dotnet/pull/3743))
- iOS - prevent use of unsupported marshalling behavior `MarshalManagedExceptionMode.UnwindNativeCode` for [Native AOT] ([#3729](https://github.com/getsentry/sentry-dotnet/pull/3729))

### Dependencies

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
<Project>

<!--
Workaround for https://github.com/xamarin/xamarin-macios/issues/15252
ensuring that Native AOT compile code does not get the wrong marshal-managed-exceptions
-->
<Target Name="_SentryMarshalExceptionManagement">
<PropertyGroup Condition="'$(PublishAot)' == 'true'">
<MtouchExtraArgs>--marshal-managed-exceptions:disable</MtouchExtraArgs>
</PropertyGroup>

<PropertyGroup Condition="'$(PublishAot)' != 'true'">
<MtouchExtraArgs>--marshal-managed-exceptions:unwindnativecode</MtouchExtraArgs>
</PropertyGroup>
</Target>

<!--
Workaround to ensure the Sentry Cocoa SDK is present when using iOS "Hot Restart" deployments on Windows
Based on https://github.com/xamarin/xamarin-macios/pull/16605
Expand Down
5 changes: 0 additions & 5 deletions src/Sentry/Platforms/Cocoa/SentrySdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ public static partial class SentrySdk
private static void InitSentryCocoaSdk(SentryOptions options)
{
options.LogDebug("Initializing native SDK");
// Workaround for https://github.com/xamarin/xamarin-macios/issues/15252
ObjCRuntime.Runtime.MarshalManagedException += (_, args) =>
{
args.ExceptionMode = ObjCRuntime.MarshalManagedExceptionMode.UnwindNativeCode;
};

// Set default release and distribution
options.Release ??= GetDefaultReleaseString();
Expand Down