From 9ac7e0c98d9850cafbf749cde7d76e59eafeb74b Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Wed, 20 May 2026 21:06:21 +0200
Subject: [PATCH 01/17] build and use sentry-native on macos

---
 .github/workflows/ci.yml                      |  2 +
 .github/workflows/sdk.yml                     | 12 ++++-
 build/native-sdks.targets                     | 53 ++++++++++++++++++-
 scripts/download-native-sdks.ps1              |  7 ++-
 .../ConfigurationWindow/AdvancedTab.cs        | 13 +++++
 .../Native/BuildPostProcess.cs                | 51 +++++++++++++++++-
 src/Sentry.Unity.Native/SentryNativeBridge.cs | 10 ++++
 src/Sentry.Unity/MacosBackend.cs              | 16 ++++++
 .../ScriptableSentryUnityOptions.cs           |  2 +
 src/Sentry.Unity/SentryUnityOptions.cs        |  7 +++
 .../IntegrationOptionsConfiguration.cs        |  3 ++
 .../ScriptableSentryUnityOptionsTests.cs      | 19 +++++++
 .../SentryUnityOptionsTests.cs                | 14 +++++
 13 files changed, 204 insertions(+), 5 deletions(-)
 create mode 100644 src/Sentry.Unity/MacosBackend.cs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0414c8868..311166d62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,6 +44,8 @@ jobs:
             host: windows-latest
           - target: Cocoa
             host: macos-latest
+          - target: MacOSNative
+            host: macos-latest
     uses: ./.github/workflows/sdk.yml
     with:
       target: ${{ matrix.target }}
diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index 35c963615..e3819943b 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -107,12 +107,20 @@ jobs:
           name: ${{ env.TARGET }}-sdk
           path: |
             package-dev/Plugins/iOS/Sentry.xcframework~
-            package-dev/Plugins/macOS/Sentry
+            package-dev/Plugins/macOS/Sentry~
           # Lower retention period - we only need this to retry CI.
           retention-days: 14
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        if: ${{ env.TARGET != 'Cocoa' }}
+        if: ${{ env.TARGET == 'MacOSNative' }}
+        with:
+          name: ${{ env.TARGET }}-sdk
+          path: package-dev/Plugins/macOS/SentryNative~
+          # Lower retention period - we only need this to retry CI.
+          retention-days: 14
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        if: ${{ env.TARGET != 'Cocoa' && env.TARGET != 'MacOSNative' }}
         with:
           name: ${{ env.TARGET }}-sdk
           path: package-dev/Plugins/${{ env.TARGET }}
diff --git a/build/native-sdks.targets b/build/native-sdks.targets
index 63be39e0e..8b679fbd8 100644
--- a/build/native-sdks.targets
+++ b/build/native-sdks.targets
@@ -5,7 +5,8 @@
     <!-- Cocoa -->
     <SentryCocoaRoot>$(RepoRoot)modules/sentry-cocoa/</SentryCocoaRoot>
     <SentryiOSArtifactsDestination>$(SentryArtifactsDestination)iOS/Sentry.xcframework~/</SentryiOSArtifactsDestination>
-    <SentrymacOSArtifactsDestination>$(SentryArtifactsDestination)macOS/Sentry/</SentrymacOSArtifactsDestination>
+    <SentrymacOSArtifactsDestination>$(SentryArtifactsDestination)macOS/Sentry~/</SentrymacOSArtifactsDestination>
+    <SentryMacOSNativeArtifactsDestination>$(SentryArtifactsDestination)macOS/SentryNative~/</SentryMacOSNativeArtifactsDestination>
 
     <!-- Android -->
     <SentryAndroidRoot>$(RepoRoot)modules/sentry-java/</SentryAndroidRoot>
@@ -131,6 +132,56 @@
     <CallTarget Targets="BuildWindowsSDK" />
   </Target>
 
+  <!--
+    Build the Sentry Native SDK for macOS (universal binary, native backend):
+        dotnet msbuild /t:BuildMacOSNativeSDK src/Sentry.Unity
+    Short-circuits if libsentry.dylib already exists. Produces a universal
+    (x86_64 + arm64) dylib and the sentry-crash out-of-process handler.
+    Debug symbols are extracted into .dSYM bundles; binaries are then stripped.
+  -->
+  <Target Name="BuildMacOSNativeSDK"
+          Condition="'$(MSBuildProjectName)' == 'Sentry.Unity'
+            And $([MSBuild]::IsOSPlatform('OSX'))
+            And !Exists('$(SentryMacOSNativeArtifactsDestination)libsentry.dylib')">
+    <Error Condition="!Exists('$(SentryNativeRoot)')" Text="sentry-native submodule not checked out at $(SentryNativeRoot). Run: git submodule update --init modules/sentry-native" />
+
+    <Message Importance="High" Text="Building Sentry Native SDK for macOS (universal binary, native backend)." />
+
+    <Exec WorkingDirectory="$(SentryNativeRoot)"
+          Command="cmake -B build_macos -D SENTRY_BACKEND=native -D SENTRY_SDK_NAME=sentry.native.unity -D SENTRY_BUILD_SHARED_LIBS=ON -D &quot;CMAKE_OSX_ARCHITECTURES=x86_64;arm64&quot; -D CMAKE_OSX_DEPLOYMENT_TARGET=10.15 -D CMAKE_BUILD_TYPE=RelWithDebInfo -S ." />
+    <Exec WorkingDirectory="$(SentryNativeRoot)"
+          Command="cmake --build build_macos --target sentry --config RelWithDebInfo --parallel" />
+    <Exec WorkingDirectory="$(SentryNativeRoot)"
+          Command="cmake --build build_macos --target sentry-crash --config RelWithDebInfo --parallel" />
+
+    <MakeDir Directories="$(SentryMacOSNativeArtifactsDestination)" />
+
+    <ItemGroup>
+      <MacOSNativeSdkArtifacts Include="$(SentryNativeRoot)build_macos/libsentry.dylib" />
+      <MacOSNativeSdkArtifacts Include="$(SentryNativeRoot)build_macos/sentry-crash" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MacOSNativeSdkArtifacts)" DestinationFolder="$(SentryMacOSNativeArtifactsDestination)" />
+
+    <!-- Generate dSYMs for symbol upload, then strip debug info from the shipped binaries -->
+    <Exec Command="dsymutil $(SentryMacOSNativeArtifactsDestination)libsentry.dylib -o $(SentryMacOSNativeArtifactsDestination)libsentry.dylib.dSYM" />
+    <Exec Command="dsymutil $(SentryMacOSNativeArtifactsDestination)sentry-crash -o $(SentryMacOSNativeArtifactsDestination)sentry-crash.dSYM" />
+    <Exec Command="strip -x $(SentryMacOSNativeArtifactsDestination)libsentry.dylib" />
+    <Exec Command="strip -x $(SentryMacOSNativeArtifactsDestination)sentry-crash" />
+
+    <Error Condition="!Exists('$(SentryMacOSNativeArtifactsDestination)libsentry.dylib')" Text="Failed to produce libsentry.dylib for macOS." />
+    <Error Condition="!Exists('$(SentryMacOSNativeArtifactsDestination)sentry-crash')" Text="Failed to produce sentry-crash for macOS." />
+  </Target>
+
+  <!-- Cleans the macOS native SDK build artifacts. -->
+  <Target Name="CleanMacOSNativeSDK" AfterTargets="Clean" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity'">
+    <RemoveDir Directories="$(SentryNativeRoot)build_macos" ContinueOnError="true" />
+    <Delete Files="$(SentryMacOSNativeArtifactsDestination)libsentry.dylib" ContinueOnError="true" />
+    <Delete Files="$(SentryMacOSNativeArtifactsDestination)sentry-crash" ContinueOnError="true" />
+    <RemoveDir Directories="$(SentryMacOSNativeArtifactsDestination)libsentry.dylib.dSYM" ContinueOnError="true" />
+    <RemoveDir Directories="$(SentryMacOSNativeArtifactsDestination)sentry-crash.dSYM" ContinueOnError="true" />
+  </Target>
+
   <!--
     Build sentry-native-ndk and publish it to the local Maven repo (~/.m2)
     so sentry-java's :sentry-android-ndk build can resolve it via mavenLocal().
diff --git a/scripts/download-native-sdks.ps1 b/scripts/download-native-sdks.ps1
index 6d6853881..487d2d93d 100644
--- a/scripts/download-native-sdks.ps1
+++ b/scripts/download-native-sdks.ps1
@@ -34,8 +34,13 @@ $SDKs = @(
         Destination = $ArtifactsDestination
         CheckFiles = @(
             "iOS/Sentry.xcframework~/Info.plist",
-            "macOS/Sentry/Sentry.dylib"
+            "macOS/Sentry~/Sentry.dylib"
         )
+    },
+    @{
+        Name = "MacOSNative"
+        Destination = Join-Path $ArtifactsDestination "macOS/SentryNative~"
+        CheckFile = "libsentry.dylib"
     }
 )
 
diff --git a/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs b/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs
index 56d0c2e9e..5959206b6 100644
--- a/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs
+++ b/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs
@@ -102,6 +102,19 @@ internal static void Display(ScriptableSentryUnityOptions options, SentryCliOpti
                 new GUIContent("macOS", "Whether to enable native crashes support on macOS."),
                 options.MacosNativeSupportEnabled);
 
+            EditorGUI.indentLevel++;
+            using (new EditorGUI.DisabledScope(!options.MacosNativeSupportEnabled))
+            {
+                options.MacosBackend = (MacosBackend)EditorGUILayout.EnumPopup(
+                    new GUIContent(
+                        "macOS Backend",
+                        "Cocoa: uses sentry-cocoa via the Objective-C bridge. Requires IL2CPP.\n" +
+                        "Native (experimental): uses sentry-native with the new out-of-process crash daemon. " +
+                        "Uploads crashes immediately and supports both IL2CPP and Mono."),
+                    options.MacosBackend);
+            }
+            EditorGUI.indentLevel--;
+
             options.LinuxNativeSupportEnabled = EditorGUILayout.Toggle(
                 new GUIContent("Linux", "Whether to enable native crashes support on Linux."),
                 options.LinuxNativeSupportEnabled);
diff --git a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
index c4867fac3..46d8c178e 100644
--- a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
+++ b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
@@ -88,6 +88,10 @@ and not BuildTargetGroup.PS5
         try
         {
             AddCrashHandler(logger, target, buildOutputDir);
+            if (target == BuildTarget.StandaloneOSX)
+            {
+                CopyMacOSPlugins(logger, options, executablePath);
+            }
         }
         catch (Exception e)
         {
@@ -137,6 +141,42 @@ private static void AddCrashHandler(IDiagnosticLogger logger, BuildTarget target
         }
     }
 
+    private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOptions options, string executablePath)
+    {
+        // executablePath on macOS is the .app bundle itself (e.g. /Build/MyGame.app).
+        var packagePluginsDir = Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS");
+        var sourceDir = options.MacosBackend == MacosBackend.Native
+            ? Path.Combine(packagePluginsDir, "SentryNative~")
+            : Path.Combine(packagePluginsDir, "Sentry~");
+
+        if (!Directory.Exists(sourceDir))
+        {
+            var target = options.MacosBackend == MacosBackend.Native ? "BuildMacOSNativeSDK" : "BuildCocoaSDK";
+            throw new BuildFailedException(
+                $"Sentry macOS plugin directory not found: {sourceDir}\n" +
+                $"Run 'dotnet msbuild /t:{target} src/Sentry.Unity' (or 'dotnet msbuild /t:DownloadNativeSDKs src/Sentry.Unity') to populate it.");
+        }
+
+        // Native: dylib + daemon must be next to the player executable so that sentry-native can
+        // posix_spawn the daemon from @executable_path and so DllImport("sentry") resolves
+        // libsentry.dylib via DYLD's @executable_path search.
+        // Cocoa: SentryNativeBridge.m dlopens Sentry.dylib from @executable_path/../PlugIns/.
+        var contentsDir = Path.Combine(executablePath, "Contents");
+        var destDir = options.MacosBackend == MacosBackend.Native
+            ? Path.Combine(contentsDir, "MacOS")
+            : Path.Combine(contentsDir, "PlugIns");
+        Directory.CreateDirectory(destDir);
+
+        logger.LogInfo("Copying macOS Sentry plugins from '{0}' to '{1}'", sourceDir, destDir);
+        foreach (var file in Directory.GetFiles(sourceDir))
+        {
+            var destFile = Path.Combine(destDir, Path.GetFileName(file));
+            logger.LogDebug("Copying '{0}' to '{1}'", file, destFile);
+            File.Copy(file, destFile, overwrite: true);
+        }
+        // dSYMs are not copied — they're only consumed from the package source at symbol-upload time.
+    }
+
     private static void CopyHandler(IDiagnosticLogger logger, string buildOutputDir, string handlerPath)
     {
         var fullHandlerPath = Path.GetFullPath(Path.Combine("Packages", SentryPackageInfo.GetName(), "Plugins", handlerPath));
@@ -273,7 +313,16 @@ private static void UploadDebugSymbols(IDiagnosticLogger logger, BuildTarget tar
                 AddPath(paths, Path.Combine(buildOutputDir, executableName), logger, required: true);
 
                 // Sentry dSYM from package
-                AddPath(paths, Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS/Sentry/Sentry.dylib.dSYM"), logger);
+                if (options.MacosBackend == MacosBackend.Native)
+                {
+                    var packageMacOSDir = $"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS/SentryNative~";
+                    AddPath(paths, Path.GetFullPath($"{packageMacOSDir}/libsentry.dylib.dSYM"), logger);
+                    AddPath(paths, Path.GetFullPath($"{packageMacOSDir}/sentry-crash.dSYM"), logger);
+                }
+                else
+                {
+                    AddPath(paths, Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS/Sentry~/Sentry.dylib.dSYM"), logger);
+                }
 
                 if (!isMono) // IL2CPP
                 {
diff --git a/src/Sentry.Unity.Native/SentryNativeBridge.cs b/src/Sentry.Unity.Native/SentryNativeBridge.cs
index ee79334a3..a3803ecc8 100644
--- a/src/Sentry.Unity.Native/SentryNativeBridge.cs
+++ b/src/Sentry.Unity.Native/SentryNativeBridge.cs
@@ -23,6 +23,7 @@ internal static class SentryNativeBridge
     private static IDiagnosticLogger? Logger; // This is also the logger we're forwarding native messages to.
     private static bool UseLibC;
     private static bool IsWindows;
+    private static bool IsMacOS;
 
     public static bool Init(SentryUnityOptions options)
     {
@@ -34,6 +35,8 @@ is RuntimePlatform.LinuxPlayer or RuntimePlatform.LinuxServer
         IsWindows = Application.platform
             is RuntimePlatform.WindowsPlayer or RuntimePlatform.WindowsServer
             or RuntimePlatform.GameCoreXboxSeries or RuntimePlatform.GameCoreXboxOne;
+        IsMacOS = Application.platform
+            is RuntimePlatform.OSXPlayer or RuntimePlatform.OSXServer;
 
         var cOptions = sentry_options_new();
 
@@ -93,6 +96,10 @@ is RuntimePlatform.WindowsPlayer or RuntimePlatform.WindowsServer
         }
 #endif
 
+        var shutdownTimeoutMs = (ulong)Math.Max(0, options.ShutdownTimeout.TotalMilliseconds);
+        Logger?.LogDebug("Setting ShutdownTimeout: {0}ms", shutdownTimeoutMs);
+        sentry_options_set_shutdown_timeout(cOptions, shutdownTimeoutMs);
+
         Logger?.LogDebug("Setting EnableLogs: {0}", options.EnableLogs);
         sentry_options_set_enable_logs(cOptions, options.EnableLogs ? 1 : 0);
 
@@ -172,6 +179,9 @@ internal static string GetDatabasePath(SentryUnityOptions options, IApplication?
     [DllImport(SentryLib)]
     private static extern void sentry_options_set_attach_screenshot(IntPtr options, int attachScreenshot);
 
+    [DllImport(SentryLib)]
+    private static extern void sentry_options_set_shutdown_timeout(IntPtr options, ulong shutdown_timeout);
+
     [DllImport(SentryLib)]
     private static extern void sentry_options_set_enable_logs(IntPtr options, int enable_logs);
 
diff --git a/src/Sentry.Unity/MacosBackend.cs b/src/Sentry.Unity/MacosBackend.cs
new file mode 100644
index 000000000..ec2b8eefd
--- /dev/null
+++ b/src/Sentry.Unity/MacosBackend.cs
@@ -0,0 +1,16 @@
+namespace Sentry.Unity;
+
+/// <summary>
+/// Selects the native backend used on macOS.
+/// </summary>
+public enum MacosBackend
+{
+    /// <summary>
+    /// Use the Sentry Cocoa SDK (default). Requires IL2CPP.
+    /// </summary>
+    Cocoa,
+    /// <summary>
+    /// Use the sentry-native SDK. Runs out-of-process and uploads crashes immediately. Supports both IL2CPP and Mono.
+    /// </summary>
+    Native,
+}
diff --git a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
index e357b6724..814d5fb5c 100644
--- a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
+++ b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
@@ -125,6 +125,7 @@ public static string GetConfigPath(string? notDefaultConfigName = null)
     [field: SerializeField] public int PostGenerateGradleProjectCallbackOrder { get; set; } = 1;
     [field: SerializeField] public bool WindowsNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool MacosNativeSupportEnabled { get; set; } = true;
+    [field: SerializeField] public MacosBackend MacosBackend { get; set; } = MacosBackend.Cocoa;
     [field: SerializeField] public bool LinuxNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool XboxNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool PlayStationNativeSupportEnabled { get; set; } = true;
@@ -210,6 +211,7 @@ internal SentryUnityOptions ToSentryUnityOptions(
             PostGenerateGradleProjectCallbackOrder = PostGenerateGradleProjectCallbackOrder,
             WindowsNativeSupportEnabled = WindowsNativeSupportEnabled,
             MacosNativeSupportEnabled = MacosNativeSupportEnabled,
+            MacosBackend = MacosBackend,
             LinuxNativeSupportEnabled = LinuxNativeSupportEnabled,
             XboxNativeSupportEnabled = XboxNativeSupportEnabled,
             PlayStationNativeSupportEnabled = PlayStationNativeSupportEnabled,
diff --git a/src/Sentry.Unity/SentryUnityOptions.cs b/src/Sentry.Unity/SentryUnityOptions.cs
index 20da43cb0..85d4f8723 100644
--- a/src/Sentry.Unity/SentryUnityOptions.cs
+++ b/src/Sentry.Unity/SentryUnityOptions.cs
@@ -266,6 +266,13 @@ public sealed class SentryUnityOptions : SentryOptions
     /// </summary>
     public bool MacosNativeSupportEnabled { get; set; } = true;
 
+    /// <summary>
+    /// Selects the native backend to use on macOS. Defaults to <see cref="MacosBackend.Cocoa"/>, which requires IL2CPP.
+    /// Use <see cref="MacosBackend.Native"/> for the out-of-process sentry-native backend, which uploads crashes
+    /// immediately and supports both IL2CPP and Mono.
+    /// </summary>
+    public MacosBackend MacosBackend { get; set; } = MacosBackend.Cocoa;
+
     /// <summary>
     /// Whether the SDK should add native support for Linux
     /// </summary>
diff --git a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
index 4e3dd43d5..59a666c1d 100644
--- a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
+++ b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
@@ -45,6 +45,9 @@ public override void Configure(SentryUnityOptions options)
         options.AndroidNativeInitializationType = NativeInitializationType.Runtime;
         options.IosNativeInitializationType = NativeInitializationType.Runtime;
 
+        // Use the new sentry-native backend on macOS in integration tests.
+        options.MacosBackend = MacosBackend.Native;
+
         Debug.Log("Sentry: IntegrationOptionsConfig::Configure() finished");
     }
 }
diff --git a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
index ed821f48a..9598a3beb 100644
--- a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
+++ b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
@@ -165,6 +165,25 @@ public void ToSentryUnityOptions_UnityBadGatewayExceptionFilterAdded()
         Assert.True(filters.OfType<UnityBadGatewayExceptionFilter>().Any());
     }
 
+    [Test]
+    public void MacosBackend_DefaultValue_IsCocoa()
+    {
+        var scriptableOptions = ScriptableObject.CreateInstance<ScriptableSentryUnityOptions>();
+
+        Assert.AreEqual(MacosBackend.Cocoa, scriptableOptions.MacosBackend);
+    }
+
+    [Test]
+    public void ToSentryUnityOptions_MacosBackendNative_Propagates()
+    {
+        var scriptableOptions = ScriptableObject.CreateInstance<ScriptableSentryUnityOptions>();
+        scriptableOptions.MacosBackend = MacosBackend.Native;
+
+        var options = scriptableOptions.ToSentryUnityOptions(_fixture.Application);
+
+        Assert.AreEqual(MacosBackend.Native, options.MacosBackend);
+    }
+
     public static void AssertOptions(SentryUnityOptions expected, SentryUnityOptions actual)
     {
         Assert.AreEqual(expected.Enabled, actual.Enabled);
diff --git a/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs b/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs
index 63c976844..3c532280c 100644
--- a/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs
+++ b/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs
@@ -111,4 +111,18 @@ public void Ctor_IsEnvironmentUser_DefaultsBasedOnPlatform(RuntimePlatform platf
 
         Assert.AreEqual(expectedValue, sut.IsEnvironmentUser);
     }
+
+    [Test]
+    public void Options_MacosBackend_DefaultsToCocoa()
+    {
+        var options = new SentryUnityOptions();
+        Assert.AreEqual(MacosBackend.Cocoa, options.MacosBackend);
+    }
+
+    [Test]
+    public void Options_MacosBackend_IsSettable()
+    {
+        var options = new SentryUnityOptions { MacosBackend = MacosBackend.Native };
+        Assert.AreEqual(MacosBackend.Native, options.MacosBackend);
+    }
 }

From 80de807e16c4e2b756e5d9d7ffc6b2b3ce23c1f8 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Wed, 20 May 2026 21:54:44 +0200
Subject: [PATCH 02/17] fix targets, fix buildpostprocess

---
 build/native-sdks.targets                     | 45 ++++++++++---------
 .../Native/BuildPostProcess.cs                | 28 +++++++-----
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/build/native-sdks.targets b/build/native-sdks.targets
index 8b679fbd8..01d91a264 100644
--- a/build/native-sdks.targets
+++ b/build/native-sdks.targets
@@ -133,26 +133,28 @@
   </Target>
 
   <!--
-    Build the Sentry Native SDK for macOS (universal binary, native backend):
+    Build the Sentry Native SDK for macOS:
         dotnet msbuild /t:BuildMacOSNativeSDK src/Sentry.Unity
-    Short-circuits if libsentry.dylib already exists. Produces a universal
+    Always wipes prior outputs and rebuilds. Produces a universal
     (x86_64 + arm64) dylib and the sentry-crash out-of-process handler.
     Debug symbols are extracted into .dSYM bundles; binaries are then stripped.
   -->
-  <Target Name="BuildMacOSNativeSDK"
-          Condition="'$(MSBuildProjectName)' == 'Sentry.Unity'
-            And $([MSBuild]::IsOSPlatform('OSX'))
-            And !Exists('$(SentryMacOSNativeArtifactsDestination)libsentry.dylib')">
+  <Target Name="BuildMacOSNativeSDK" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity'">
+    <Error Condition="!$([MSBuild]::IsOSPlatform('OSX'))" Text="BuildMacOSNativeSDK can only run on macOS." />
     <Error Condition="!Exists('$(SentryNativeRoot)')" Text="sentry-native submodule not checked out at $(SentryNativeRoot). Run: git submodule update --init modules/sentry-native" />
 
-    <Message Importance="High" Text="Building Sentry Native SDK for macOS (universal binary, native backend)." />
+    <Message Importance="High" Text="Building Sentry Native SDK for macOS (clean rebuild)." />
+
+    <!-- Wipe prior outputs -->
+    <RemoveDir Directories="$(SentryNativeRoot)build_macos" ContinueOnError="true" />
+    <Delete Files="$(SentryMacOSNativeArtifactsDestination)libsentry.dylib" ContinueOnError="true" />
+    <Delete Files="$(SentryMacOSNativeArtifactsDestination)sentry-crash" ContinueOnError="true" />
+    <RemoveDir Directories="$(SentryMacOSNativeArtifactsDestination)libsentry.dylib.dSYM" ContinueOnError="true" />
+    <RemoveDir Directories="$(SentryMacOSNativeArtifactsDestination)sentry-crash.dSYM" ContinueOnError="true" />
 
-    <Exec WorkingDirectory="$(SentryNativeRoot)"
-          Command="cmake -B build_macos -D SENTRY_BACKEND=native -D SENTRY_SDK_NAME=sentry.native.unity -D SENTRY_BUILD_SHARED_LIBS=ON -D &quot;CMAKE_OSX_ARCHITECTURES=x86_64;arm64&quot; -D CMAKE_OSX_DEPLOYMENT_TARGET=10.15 -D CMAKE_BUILD_TYPE=RelWithDebInfo -S ." />
-    <Exec WorkingDirectory="$(SentryNativeRoot)"
-          Command="cmake --build build_macos --target sentry --config RelWithDebInfo --parallel" />
-    <Exec WorkingDirectory="$(SentryNativeRoot)"
-          Command="cmake --build build_macos --target sentry-crash --config RelWithDebInfo --parallel" />
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake -B build_macos -D SENTRY_BACKEND=native -D SENTRY_SDK_NAME=sentry.native.unity -D SENTRY_BUILD_SHARED_LIBS=ON -D &quot;CMAKE_OSX_ARCHITECTURES=x86_64;arm64&quot; -D CMAKE_OSX_DEPLOYMENT_TARGET=10.15 -D CMAKE_BUILD_TYPE=RelWithDebInfo -S ." />
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake --build build_macos --target sentry --config RelWithDebInfo --parallel" />
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake --build build_macos --target sentry-crash --config RelWithDebInfo --parallel" />
 
     <MakeDir Directories="$(SentryMacOSNativeArtifactsDestination)" />
 
@@ -169,17 +171,16 @@
     <Exec Command="strip -x $(SentryMacOSNativeArtifactsDestination)libsentry.dylib" />
     <Exec Command="strip -x $(SentryMacOSNativeArtifactsDestination)sentry-crash" />
 
-    <Error Condition="!Exists('$(SentryMacOSNativeArtifactsDestination)libsentry.dylib')" Text="Failed to produce libsentry.dylib for macOS." />
-    <Error Condition="!Exists('$(SentryMacOSNativeArtifactsDestination)sentry-crash')" Text="Failed to produce sentry-crash for macOS." />
+    <Error Condition="!Exists('$(SentryMacOSNativeArtifactsDestination)libsentry.dylib')" Text="Failed to set up the macOS Native SDK." />
   </Target>
 
-  <!-- Cleans the macOS native SDK build artifacts. -->
-  <Target Name="CleanMacOSNativeSDK" AfterTargets="Clean" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity'">
-    <RemoveDir Directories="$(SentryNativeRoot)build_macos" ContinueOnError="true" />
-    <Delete Files="$(SentryMacOSNativeArtifactsDestination)libsentry.dylib" ContinueOnError="true" />
-    <Delete Files="$(SentryMacOSNativeArtifactsDestination)sentry-crash" ContinueOnError="true" />
-    <RemoveDir Directories="$(SentryMacOSNativeArtifactsDestination)libsentry.dylib.dSYM" ContinueOnError="true" />
-    <RemoveDir Directories="$(SentryMacOSNativeArtifactsDestination)sentry-crash.dSYM" ContinueOnError="true" />
+  <!-- Hooks into 'dotnet build' so a missing macOS Native plugin auto-triggers BuildMacOSNativeSDK. -->
+  <Target Name="EnsureMacOSNativeSDK"
+          BeforeTargets="BeforeBuild"
+          Condition="'$(MSBuildProjectName)' == 'Sentry.Unity'
+            And $([MSBuild]::IsOSPlatform('OSX'))
+            And !Exists('$(SentryMacOSNativeArtifactsDestination)libsentry.dylib')">
+    <CallTarget Targets="BuildMacOSNativeSDK" />
   </Target>
 
   <!--
diff --git a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
index 46d8c178e..452f17aa4 100644
--- a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
+++ b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
@@ -157,24 +157,30 @@ private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOption
                 $"Run 'dotnet msbuild /t:{target} src/Sentry.Unity' (or 'dotnet msbuild /t:DownloadNativeSDKs src/Sentry.Unity') to populate it.");
         }
 
-        // Native: dylib + daemon must be next to the player executable so that sentry-native can
-        // posix_spawn the daemon from @executable_path and so DllImport("sentry") resolves
-        // libsentry.dylib via DYLD's @executable_path search.
-        // Cocoa: SentryNativeBridge.m dlopens Sentry.dylib from @executable_path/../PlugIns/.
+        // Files split by type:
+        //  - dylibs go to Contents/PlugIns/ — Unity's IL2CPP loader searches there for DllImport.
+        //  - executables (e.g. sentry-native's sentry-crash daemon) go to Contents/MacOS/
+        //    because sentry-native posix_spawns the daemon from @executable_path.
+        //  - dSYMs are skipped — only consumed from the package at symbol-upload time.
         var contentsDir = Path.Combine(executablePath, "Contents");
-        var destDir = options.MacosBackend == MacosBackend.Native
-            ? Path.Combine(contentsDir, "MacOS")
-            : Path.Combine(contentsDir, "PlugIns");
-        Directory.CreateDirectory(destDir);
+        var pluginsDest = Path.Combine(contentsDir, "PlugIns");
+        var macOSDest = Path.Combine(contentsDir, "MacOS");
+        Directory.CreateDirectory(pluginsDest);
+        Directory.CreateDirectory(macOSDest);
 
-        logger.LogInfo("Copying macOS Sentry plugins from '{0}' to '{1}'", sourceDir, destDir);
         foreach (var file in Directory.GetFiles(sourceDir))
         {
-            var destFile = Path.Combine(destDir, Path.GetFileName(file));
+            var name = Path.GetFileName(file);
+            // Dylibs into PlugIns/ (Unity's loader searches there). Everything
+            // else — i.e. the sentry-crash daemon executable for the Native
+            // backend — into MacOS/ so it sits next to the player binary,
+            // which is where sentry-native posix_spawns it from.
+            var destFile = name.EndsWith(".dylib", StringComparison.OrdinalIgnoreCase)
+                ? Path.Combine(pluginsDest, name)
+                : Path.Combine(macOSDest, name);
             logger.LogDebug("Copying '{0}' to '{1}'", file, destFile);
             File.Copy(file, destFile, overwrite: true);
         }
-        // dSYMs are not copied — they're only consumed from the package source at symbol-upload time.
     }
 
     private static void CopyHandler(IDiagnosticLogger logger, string buildOutputDir, string handlerPath)

From 78e285d2a335b38da7bf58466e6d56dd9e56e834 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 10:00:36 +0200
Subject: [PATCH 03/17] meta data

---
 .../Runtime/Sentry.Unity.Native.dll.meta      |  6 +-
 package-dev/Runtime/SentryInitialization.cs   | 61 ++++++++++++++++---
 2 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/package-dev/Runtime/Sentry.Unity.Native.dll.meta b/package-dev/Runtime/Sentry.Unity.Native.dll.meta
index 61ba7eb38..8f7b22dcf 100644
--- a/package-dev/Runtime/Sentry.Unity.Native.dll.meta
+++ b/package-dev/Runtime/Sentry.Unity.Native.dll.meta
@@ -21,7 +21,7 @@ PluginImporter:
         Exclude GameCoreScarlett: 1
         Exclude GameCoreXboxOne: 1
         Exclude Linux64: 0
-        Exclude OSXUniversal: 1
+        Exclude OSXUniversal: 0
         Exclude PS4: 1
         Exclude PS5: 1
         Exclude Switch: 1
@@ -75,9 +75,9 @@ PluginImporter:
   - first:
       Standalone: OSXUniversal
     second:
-      enabled: 0
+      enabled: 1
       settings:
-        CPU: None
+        CPU: AnyCPU
   - first:
       Standalone: Win
     second:
diff --git a/package-dev/Runtime/SentryInitialization.cs b/package-dev/Runtime/SentryInitialization.cs
index db340bc7f..18091e312 100644
--- a/package-dev/Runtime/SentryInitialization.cs
+++ b/package-dev/Runtime/SentryInitialization.cs
@@ -1,19 +1,25 @@
 #if !UNITY_EDITOR
+
 #if UNITY_IOS || (UNITY_STANDALONE_OSX && ENABLE_IL2CPP)
 #define SENTRY_NATIVE_COCOA
-#elif UNITY_ANDROID && ENABLE_IL2CPP
+#endif
+
+#if UNITY_ANDROID && ENABLE_IL2CPP
 #define SENTRY_NATIVE_ANDROID
-#elif UNITY_STANDALONE_WIN || UNITY_STANDALONE_LINUX
-#define SENTRY_NATIVE
-#elif UNITY_GAMECORE
-#define SENTRY_NATIVE
-#elif UNITY_PS5
+#endif
+
+#if UNITY_STANDALONE_WIN || UNITY_STANDALONE_LINUX || UNITY_STANDALONE_OSX || UNITY_GAMECORE || UNITY_PS5
 #define SENTRY_NATIVE
-#elif UNITY_SWITCH
+#endif
+
+#if UNITY_SWITCH
 #define SENTRY_NATIVE_SWITCH
-#elif UNITY_WEBGL
+#endif
+
+#if UNITY_WEBGL
 #define SENTRY_WEBGL
 #endif
+
 #endif
 
 #if ENABLE_IL2CPP && (SENTRY_NATIVE_COCOA || SENTRY_NATIVE_ANDROID || SENTRY_NATIVE)
@@ -29,8 +35,15 @@
 using UnityEngine;
 using UnityEngine.Scripting;
 
+#if UNITY_STANDALONE_OSX
 #if SENTRY_NATIVE_COCOA
 using Sentry.Unity.iOS;
+#endif
+#if SENTRY_NATIVE
+using Sentry.Unity.Native;
+#endif
+#elif SENTRY_NATIVE_COCOA
+using Sentry.Unity.iOS;
 #elif SENTRY_NATIVE_ANDROID
 using Sentry.Unity.Android;
 #elif SENTRY_NATIVE || SENTRY_NATIVE_SWITCH
@@ -75,7 +88,15 @@ private static void Init()
             {
                 // If the SDK is not `enabled` we're closing down the native layer as well. This is especially relevant
                 // in a `built-time-initialization` scenario where the native SDKs self-initialize.
+#if UNITY_STANDALONE_OSX
 #if SENTRY_NATIVE_COCOA
+                if (options.MacosBackend == MacosBackend.Cocoa)
+                {
+                    SentryNativeCocoa.Close(options);
+                }
+#endif
+                // Native: nothing to do — SentryNative registers its own close callback at Configure time.
+#elif SENTRY_NATIVE_COCOA
                 SentryNativeCocoa.Close(options);
 #elif SENTRY_NATIVE_ANDROID
                 SentryNativeAndroid.Close(options);
@@ -88,7 +109,9 @@ private static void SetUpPlatformServices()
             SentryPlatformServices.CollectMainThreadData();
             SentryPlatformServices.UnityInfo = new SentryUnityInfo();
 
-#if SENTRY_NATIVE_COCOA
+#if UNITY_STANDALONE_OSX
+            SentryPlatformServices.PlatformConfiguration = ConfigureMacosBackend;
+#elif SENTRY_NATIVE_COCOA
             SentryPlatformServices.PlatformConfiguration = SentryNativeCocoa.Configure;
 #elif SENTRY_NATIVE_ANDROID
             SentryPlatformServices.PlatformConfiguration = SentryNativeAndroid.Configure;
@@ -100,6 +123,26 @@ private static void SetUpPlatformServices()
             SentryPlatformServices.PlatformConfiguration = SentryWebGL.Configure;
 #endif
         }
+
+#if UNITY_STANDALONE_OSX
+        private static void ConfigureMacosBackend(SentryUnityOptions options)
+        {
+#if SENTRY_NATIVE
+            if (options.MacosBackend == MacosBackend.Native)
+            {
+                SentryNative.Configure(options);
+                return;
+            }
+#endif
+#if SENTRY_NATIVE_COCOA
+            SentryNativeCocoa.Configure(options);
+#else
+            options.DiagnosticLogger?.LogWarning(
+                "MacosBackend is set to Cocoa, but Cocoa requires IL2CPP. " +
+                "Native crash reporting is disabled. Set MacosBackend to Native or enable IL2CPP.");
+#endif
+        }
+#endif
     }
 
     public class SentryUnityInfo : ISentryUnityInfo

From c80ad0bb25e6bd93cf8079a6ed46834e1deef2d2 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 10:04:52 +0200
Subject: [PATCH 04/17] closing

---
 package-dev/Runtime/SentryInitialization.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/package-dev/Runtime/SentryInitialization.cs b/package-dev/Runtime/SentryInitialization.cs
index 18091e312..9bc217349 100644
--- a/package-dev/Runtime/SentryInitialization.cs
+++ b/package-dev/Runtime/SentryInitialization.cs
@@ -89,13 +89,7 @@ private static void Init()
                 // If the SDK is not `enabled` we're closing down the native layer as well. This is especially relevant
                 // in a `built-time-initialization` scenario where the native SDKs self-initialize.
 #if UNITY_STANDALONE_OSX
-#if SENTRY_NATIVE_COCOA
-                if (options.MacosBackend == MacosBackend.Cocoa)
-                {
-                    SentryNativeCocoa.Close(options);
-                }
-#endif
-                // Native: nothing to do — SentryNative registers its own close callback at Configure time.
+                CloseMacosBackend(options);
 #elif SENTRY_NATIVE_COCOA
                 SentryNativeCocoa.Close(options);
 #elif SENTRY_NATIVE_ANDROID
@@ -142,6 +136,17 @@ private static void ConfigureMacosBackend(SentryUnityOptions options)
                 "Native crash reporting is disabled. Set MacosBackend to Native or enable IL2CPP.");
 #endif
         }
+
+        private static void CloseMacosBackend(SentryUnityOptions options)
+        {
+#if SENTRY_NATIVE_COCOA
+            if (options.MacosBackend == MacosBackend.Cocoa)
+            {
+                SentryNativeCocoa.Close(options);
+            }
+#endif
+            // Native: nothing to do — SentryNative registers its own close callback at Configure time.
+        }
 #endif
     }
 

From c47d1ade35bea97a047f7a78199593ce3d9139ad Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 11:34:54 +0200
Subject: [PATCH 05/17] CI

---
 .github/workflows/ci.yml                      |  4 ++-
 .github/workflows/test-build-macos.yml        | 32 ++++++++++++++++---
 .github/workflows/test-run-desktop.yml        | 11 +++++--
 .../Scripts/SentryOptionConfiguration.cs      |  8 +++++
 .../IntegrationOptionsConfiguration.cs        | 10 ++++--
 5 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 311166d62..1cfee42fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -423,7 +423,7 @@ jobs:
       platform: windows
 
   test-run-macos:
-    name: Run macOS ${{ matrix.unity-version }} Integration Test
+    name: Run macOS ${{ matrix.backend }} ${{ matrix.unity-version }} Integration Test
     if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
     needs: [test-build-macos, create-unity-matrix]
     secrets: inherit
@@ -431,10 +431,12 @@ jobs:
       fail-fast: false
       matrix:
         unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }}
+        backend: ["cocoa", "native"]
     uses: ./.github/workflows/test-run-desktop.yml
     with:
       unity-version: ${{ matrix.unity-version }}
       platform: macos
+      backend: ${{ matrix.backend }}
 
   build-size-summary:
     name: Build Size
diff --git a/.github/workflows/test-build-macos.yml b/.github/workflows/test-build-macos.yml
index 300b9f517..a2593e1c6 100644
--- a/.github/workflows/test-build-macos.yml
+++ b/.github/workflows/test-build-macos.yml
@@ -87,7 +87,7 @@ jobs:
         env:
           SENTRY_DSN: ${{ secrets.SENTRY_TEST_DSN }}
 
-      - name: Build with Sentry SDK
+      - name: Build with Sentry SDK (Cocoa backend)
         run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform MacOS -UnityVersion "$env:UNITY_VERSION"
 
       - name: Compare build sizes
@@ -101,15 +101,39 @@ jobs:
           retention-days: 1
 
       # We create tar explicitly because upload-artifact is slow for many files.
-      - name: Create archive
+      - name: Create archive (Cocoa backend)
         run: |
           Remove-Item -Recurse -Force samples/IntegrationTest/Build/*_BackUpThisFolder_ButDontShipItWithYourGame -ErrorAction SilentlyContinue
           tar -cvzf test-app-desktop.tar.gz samples/IntegrationTest/Build
 
-      - name: Upload test app
+      - name: Upload test app (Cocoa backend)
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: testapp-desktop-compiled-${{ env.UNITY_VERSION }}-macos
+          name: testapp-desktop-compiled-${{ env.UNITY_VERSION }}-macos-cocoa
+          if-no-files-found: error
+          path: test-app-desktop.tar.gz
+          retention-days: 14
+
+      - name: Overwrite IntegrationOptionsConfiguration for Native backend
+        run: |
+          $optionsPath = "samples/IntegrationTest/Assets/Scripts/IntegrationOptionsConfiguration.cs"
+          $content = Get-Content $optionsPath -Raw
+          $content = $content -replace 'MacosBackend = MacosBackend.Cocoa', 'MacosBackend = MacosBackend.Native'
+          Set-Content $optionsPath $content
+
+      - name: Build with Sentry SDK (Native backend)
+        run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform MacOS -UnityVersion "$env:UNITY_VERSION"
+
+      - name: Create archive (Native backend)
+        run: |
+          Remove-Item -Recurse -Force samples/IntegrationTest/Build/*_BackUpThisFolder_ButDontShipItWithYourGame -ErrorAction SilentlyContinue
+          Remove-Item -Force test-app-desktop.tar.gz -ErrorAction SilentlyContinue
+          tar -cvzf test-app-desktop.tar.gz samples/IntegrationTest/Build
+
+      - name: Upload test app (Native backend)
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: testapp-desktop-compiled-${{ env.UNITY_VERSION }}-macos-native
           if-no-files-found: error
           path: test-app-desktop.tar.gz
           retention-days: 14
diff --git a/.github/workflows/test-run-desktop.yml b/.github/workflows/test-run-desktop.yml
index 771c60c0a..3f3a7be91 100644
--- a/.github/workflows/test-run-desktop.yml
+++ b/.github/workflows/test-run-desktop.yml
@@ -9,6 +9,11 @@ on:
         required: true
         type: string
         description: "linux, windows, or macos"
+      backend:
+        required: false
+        type: string
+        default: ""
+        description: "macOS only: native or cocoa"
 
 defaults:
   run:
@@ -16,7 +21,7 @@ defaults:
 
 jobs:
   run:
-    name: ${{ inputs.platform }} ${{ inputs.unity-version }}
+    name: ${{ inputs.platform }}${{ inputs.backend && format(' ({0})', inputs.backend) || '' }} ${{ inputs.unity-version }}
     runs-on: ${{ inputs.platform == 'linux' && 'ubuntu-latest' || inputs.platform == 'macos' && 'macos-latest' || 'windows-latest' }}
     env:
       SENTRY_DSN: ${{ secrets.SENTRY_TEST_DSN }}
@@ -33,7 +38,7 @@ jobs:
       - name: Download test app artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          name: testapp-desktop-compiled-${{ inputs.unity-version }}-${{ inputs.platform }}
+          name: testapp-desktop-compiled-${{ inputs.unity-version }}-${{ inputs.platform }}${{ inputs.backend && format('-{0}', inputs.backend) || '' }}
 
       - name: Extract test app
         run: tar -xvzf test-app-desktop.tar.gz
@@ -78,7 +83,7 @@ jobs:
         if: ${{ failure() }}
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: testapp-desktop-logs-${{ inputs.platform }}-${{ inputs.unity-version }}
+          name: testapp-desktop-logs-${{ inputs.platform }}${{ inputs.backend && format('-{0}', inputs.backend) || '' }}-${{ inputs.unity-version }}
           path: |
             test/IntegrationTest/results/
           retention-days: 14
diff --git a/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs b/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
index 356ce4dfa..26ce3fd21 100644
--- a/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
+++ b/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
@@ -1,3 +1,4 @@
+using System;
 using Sentry.Unity;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -53,6 +54,13 @@ public override void Configure(SentryUnityOptions options)
         options.AndroidNativeInitializationType = NativeInitializationType.Runtime;
 #elif UNITY_IOS
         options.IosNativeInitializationType = NativeInitializationType.Runtime;
+#elif UNITY_STANDALONE_OSX
+        // sentry-native uploads crashes out-of-process on shutdown; give the native
+        // backend enough time to flush before the player exits.
+        if (options.MacosBackend == MacosBackend.Native)
+        {
+            options.ShutdownTimeout = TimeSpan.FromSeconds(20);
+        }
 #endif
 
         Debug.Log("SentryOptionConfigure finished.");
diff --git a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
index 59a666c1d..ec99da240 100644
--- a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
+++ b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
@@ -45,8 +45,14 @@ public override void Configure(SentryUnityOptions options)
         options.AndroidNativeInitializationType = NativeInitializationType.Runtime;
         options.IosNativeInitializationType = NativeInitializationType.Runtime;
 
-        // Use the new sentry-native backend on macOS in integration tests.
-        options.MacosBackend = MacosBackend.Native;
+        options.MacosBackend = MacosBackend.Cocoa;
+
+        // sentry-native uploads crashes out-of-process on shutdown; give the native
+        // backend enough time to flush before the player exits.
+        if (options.MacosBackend == MacosBackend.Native)
+        {
+            options.ShutdownTimeout = TimeSpan.FromSeconds(20);
+        }
 
         Debug.Log("Sentry: IntegrationOptionsConfig::Configure() finished");
     }

From 176209db818b491943a482debfb0081045a4e007 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 12:41:18 +0200
Subject: [PATCH 06/17] make backend experimental

---
 .../Plugins/macOS/Sentry/Sentry.dylib.meta    | 81 -------------------
 .../ConfigurationWindow/AdvancedTab.cs        | 41 +++++++---
 .../Native/BuildPostProcess.cs                |  6 +-
 .../ExperimentalSentryUnityOptions.cs         | 19 +++++
 .../ScriptableSentryUnityOptions.cs           |  4 +-
 src/Sentry.Unity/SentryUnityOptions.cs        |  6 +-
 .../IntegrationOptionsConfiguration.cs        |  4 +-
 .../ScriptableSentryUnityOptionsTests.cs      |  8 +-
 .../SentryUnityOptionsTests.cs                | 11 +--
 9 files changed, 66 insertions(+), 114 deletions(-)
 delete mode 100644 package-dev/Plugins/macOS/Sentry/Sentry.dylib.meta
 create mode 100644 src/Sentry.Unity/ExperimentalSentryUnityOptions.cs

diff --git a/package-dev/Plugins/macOS/Sentry/Sentry.dylib.meta b/package-dev/Plugins/macOS/Sentry/Sentry.dylib.meta
deleted file mode 100644
index 2ff22fed8..000000000
--- a/package-dev/Plugins/macOS/Sentry/Sentry.dylib.meta
+++ /dev/null
@@ -1,81 +0,0 @@
-fileFormatVersion: 2
-guid: 23251176c1b104465a1b141cf7aabd2b
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 1
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      : Any
-    second:
-      enabled: 0
-      settings:
-        Exclude Android: 1
-        Exclude Editor: 1
-        Exclude Linux64: 1
-        Exclude OSXUniversal: 0
-        Exclude WebGL: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude iOS: 1
-  - first:
-      Android: Android
-    second:
-      enabled: 0
-      settings:
-        CPU: ARMv7
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  - first:
-      Standalone: OSXUniversal
-    second:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-  - first:
-      Standalone: Win
-    second:
-      enabled: 0
-      settings:
-        CPU: x86
-  - first:
-      Standalone: Win64
-    second:
-      enabled: 0
-      settings:
-        CPU: x86_64
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 0
-      settings:
-        AddToEmbeddedBinaries: false
-        CPU: AnyCPU
-        CompileFlags: 
-        FrameworkDependencies: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs b/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs
index 5959206b6..75ed0aa34 100644
--- a/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs
+++ b/src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs
@@ -9,6 +9,7 @@ internal static class AdvancedTab
 {
     private static bool UnfoldAutomaticOptions;
     private static bool UnfoldNativeOptions;
+    private static bool UnfoldExperimentalOptions;
 
     internal static void Display(ScriptableSentryUnityOptions options, SentryCliOptions? cliOptions)
     {
@@ -102,19 +103,6 @@ internal static void Display(ScriptableSentryUnityOptions options, SentryCliOpti
                 new GUIContent("macOS", "Whether to enable native crashes support on macOS."),
                 options.MacosNativeSupportEnabled);
 
-            EditorGUI.indentLevel++;
-            using (new EditorGUI.DisabledScope(!options.MacosNativeSupportEnabled))
-            {
-                options.MacosBackend = (MacosBackend)EditorGUILayout.EnumPopup(
-                    new GUIContent(
-                        "macOS Backend",
-                        "Cocoa: uses sentry-cocoa via the Objective-C bridge. Requires IL2CPP.\n" +
-                        "Native (experimental): uses sentry-native with the new out-of-process crash daemon. " +
-                        "Uploads crashes immediately and supports both IL2CPP and Mono."),
-                    options.MacosBackend);
-            }
-            EditorGUI.indentLevel--;
-
             options.LinuxNativeSupportEnabled = EditorGUILayout.Toggle(
                 new GUIContent("Linux", "Whether to enable native crashes support on Linux."),
                 options.LinuxNativeSupportEnabled);
@@ -217,5 +205,32 @@ internal static void Display(ScriptableSentryUnityOptions options, SentryCliOpti
                     "Metrics are connected to traces for correlation."),
                 options.EnableMetrics);
         }
+
+        EditorGUILayout.Space();
+        EditorGUI.DrawRect(EditorGUILayout.GetControlRect(false, 1), Color.gray);
+        EditorGUILayout.Space();
+
+        UnfoldExperimentalOptions = EditorGUILayout.BeginFoldoutHeaderGroup(UnfoldExperimentalOptions, "Experimental");
+        EditorGUI.indentLevel++;
+        if (UnfoldExperimentalOptions)
+        {
+            EditorGUILayout.HelpBox(
+                "Experimental options. Behavior and defaults may change between releases. " +
+                "Set the values you depend on explicitly.",
+                MessageType.Warning);
+
+            using (new EditorGUI.DisabledScope(!options.MacosNativeSupportEnabled))
+            {
+                options.Experimental.MacosBackend = (MacosBackend)EditorGUILayout.EnumPopup(
+                    new GUIContent(
+                        "macOS Backend",
+                        "Cocoa: uses sentry-cocoa via the Objective-C bridge. Requires IL2CPP.\n" +
+                        "Native: uses sentry-native with the new out-of-process crash daemon. " +
+                        "Uploads crashes immediately and supports both IL2CPP and Mono."),
+                    options.Experimental.MacosBackend);
+            }
+        }
+        EditorGUI.indentLevel--;
+        EditorGUILayout.EndFoldoutHeaderGroup();
     }
 }
diff --git a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
index 452f17aa4..ebc6c1cf4 100644
--- a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
+++ b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
@@ -145,13 +145,13 @@ private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOption
     {
         // executablePath on macOS is the .app bundle itself (e.g. /Build/MyGame.app).
         var packagePluginsDir = Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS");
-        var sourceDir = options.MacosBackend == MacosBackend.Native
+        var sourceDir = options.Experimental.MacosBackend == MacosBackend.Native
             ? Path.Combine(packagePluginsDir, "SentryNative~")
             : Path.Combine(packagePluginsDir, "Sentry~");
 
         if (!Directory.Exists(sourceDir))
         {
-            var target = options.MacosBackend == MacosBackend.Native ? "BuildMacOSNativeSDK" : "BuildCocoaSDK";
+            var target = options.Experimental.MacosBackend == MacosBackend.Native ? "BuildMacOSNativeSDK" : "BuildCocoaSDK";
             throw new BuildFailedException(
                 $"Sentry macOS plugin directory not found: {sourceDir}\n" +
                 $"Run 'dotnet msbuild /t:{target} src/Sentry.Unity' (or 'dotnet msbuild /t:DownloadNativeSDKs src/Sentry.Unity') to populate it.");
@@ -319,7 +319,7 @@ private static void UploadDebugSymbols(IDiagnosticLogger logger, BuildTarget tar
                 AddPath(paths, Path.Combine(buildOutputDir, executableName), logger, required: true);
 
                 // Sentry dSYM from package
-                if (options.MacosBackend == MacosBackend.Native)
+                if (options.Experimental.MacosBackend == MacosBackend.Native)
                 {
                     var packageMacOSDir = $"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS/SentryNative~";
                     AddPath(paths, Path.GetFullPath($"{packageMacOSDir}/libsentry.dylib.dSYM"), logger);
diff --git a/src/Sentry.Unity/ExperimentalSentryUnityOptions.cs b/src/Sentry.Unity/ExperimentalSentryUnityOptions.cs
new file mode 100644
index 000000000..0e937e4ec
--- /dev/null
+++ b/src/Sentry.Unity/ExperimentalSentryUnityOptions.cs
@@ -0,0 +1,19 @@
+using System;
+using UnityEngine;
+
+namespace Sentry.Unity;
+
+/// <summary>
+/// Experimental options. APIs in this group may change without notice and their default values
+/// may change between releases. Set the values you depend on explicitly.
+/// </summary>
+[Serializable]
+public class ExperimentalSentryUnityOptions
+{
+    /// <summary>
+    /// Selects the native backend to use on macOS. Defaults to <see cref="Sentry.Unity.MacosBackend.Cocoa"/>,
+    /// which requires IL2CPP. Use <see cref="Sentry.Unity.MacosBackend.Native"/> for the out-of-process
+    /// sentry-native backend, which uploads crashes immediately and supports both IL2CPP and Mono.
+    /// </summary>
+    [field: SerializeField] public MacosBackend MacosBackend { get; set; } = MacosBackend.Cocoa;
+}
diff --git a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
index 814d5fb5c..a9875b48e 100644
--- a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
+++ b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
@@ -125,13 +125,13 @@ public static string GetConfigPath(string? notDefaultConfigName = null)
     [field: SerializeField] public int PostGenerateGradleProjectCallbackOrder { get; set; } = 1;
     [field: SerializeField] public bool WindowsNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool MacosNativeSupportEnabled { get; set; } = true;
-    [field: SerializeField] public MacosBackend MacosBackend { get; set; } = MacosBackend.Cocoa;
     [field: SerializeField] public bool LinuxNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool XboxNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool PlayStationNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool SwitchNativeSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool Il2CppLineNumberSupportEnabled { get; set; } = true;
     [field: SerializeField] public bool EnableMetrics { get; set; } = true;
+    [field: SerializeField] public ExperimentalSentryUnityOptions Experimental { get; set; } = new();
     [field: SerializeField] public SentryOptionsConfiguration? OptionsConfiguration { get; set; }
 
     [field: SerializeField] public bool Debug { get; set; } = true;
@@ -211,7 +211,6 @@ internal SentryUnityOptions ToSentryUnityOptions(
             PostGenerateGradleProjectCallbackOrder = PostGenerateGradleProjectCallbackOrder,
             WindowsNativeSupportEnabled = WindowsNativeSupportEnabled,
             MacosNativeSupportEnabled = MacosNativeSupportEnabled,
-            MacosBackend = MacosBackend,
             LinuxNativeSupportEnabled = LinuxNativeSupportEnabled,
             XboxNativeSupportEnabled = XboxNativeSupportEnabled,
             PlayStationNativeSupportEnabled = PlayStationNativeSupportEnabled,
@@ -231,6 +230,7 @@ internal SentryUnityOptions ToSentryUnityOptions(
         };
 
         options.EnableMetrics = EnableMetrics;
+        options.Experimental.MacosBackend = Experimental.MacosBackend;
 
         // By default, the cacheDirectoryPath gets set on known platforms. We're overwriting this behaviour here.
         if (!EnableOfflineCaching)
diff --git a/src/Sentry.Unity/SentryUnityOptions.cs b/src/Sentry.Unity/SentryUnityOptions.cs
index 85d4f8723..1db24eff4 100644
--- a/src/Sentry.Unity/SentryUnityOptions.cs
+++ b/src/Sentry.Unity/SentryUnityOptions.cs
@@ -267,11 +267,9 @@ public sealed class SentryUnityOptions : SentryOptions
     public bool MacosNativeSupportEnabled { get; set; } = true;
 
     /// <summary>
-    /// Selects the native backend to use on macOS. Defaults to <see cref="MacosBackend.Cocoa"/>, which requires IL2CPP.
-    /// Use <see cref="MacosBackend.Native"/> for the out-of-process sentry-native backend, which uploads crashes
-    /// immediately and supports both IL2CPP and Mono.
+    /// Experimental options. APIs and defaults here may change between releases.
     /// </summary>
-    public MacosBackend MacosBackend { get; set; } = MacosBackend.Cocoa;
+    public ExperimentalSentryUnityOptions Experimental { get; } = new();
 
     /// <summary>
     /// Whether the SDK should add native support for Linux
diff --git a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
index ec99da240..0edb4ad9a 100644
--- a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
+++ b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
@@ -45,11 +45,11 @@ public override void Configure(SentryUnityOptions options)
         options.AndroidNativeInitializationType = NativeInitializationType.Runtime;
         options.IosNativeInitializationType = NativeInitializationType.Runtime;
 
-        options.MacosBackend = MacosBackend.Cocoa;
+        options.Experimental.MacosBackend = MacosBackend.Cocoa;
 
         // sentry-native uploads crashes out-of-process on shutdown; give the native
         // backend enough time to flush before the player exits.
-        if (options.MacosBackend == MacosBackend.Native)
+        if (options.Experimental.MacosBackend == MacosBackend.Native)
         {
             options.ShutdownTimeout = TimeSpan.FromSeconds(20);
         }
diff --git a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
index 9598a3beb..71bb948e0 100644
--- a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
+++ b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
@@ -166,22 +166,22 @@ public void ToSentryUnityOptions_UnityBadGatewayExceptionFilterAdded()
     }
 
     [Test]
-    public void MacosBackend_DefaultValue_IsCocoa()
+    public void Experimental_MacosBackend_DefaultValue_IsCocoa()
     {
         var scriptableOptions = ScriptableObject.CreateInstance<ScriptableSentryUnityOptions>();
 
-        Assert.AreEqual(MacosBackend.Cocoa, scriptableOptions.MacosBackend);
+        Assert.AreEqual(MacosBackend.Cocoa, scriptableOptions.Experimental.MacosBackend);
     }
 
     [Test]
     public void ToSentryUnityOptions_MacosBackendNative_Propagates()
     {
         var scriptableOptions = ScriptableObject.CreateInstance<ScriptableSentryUnityOptions>();
-        scriptableOptions.MacosBackend = MacosBackend.Native;
+        scriptableOptions.Experimental.MacosBackend = MacosBackend.Native;
 
         var options = scriptableOptions.ToSentryUnityOptions(_fixture.Application);
 
-        Assert.AreEqual(MacosBackend.Native, options.MacosBackend);
+        Assert.AreEqual(MacosBackend.Native, options.Experimental.MacosBackend);
     }
 
     public static void AssertOptions(SentryUnityOptions expected, SentryUnityOptions actual)
diff --git a/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs b/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs
index 3c532280c..25d08b7a5 100644
--- a/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs
+++ b/test/Sentry.Unity.Tests/SentryUnityOptionsTests.cs
@@ -113,16 +113,17 @@ public void Ctor_IsEnvironmentUser_DefaultsBasedOnPlatform(RuntimePlatform platf
     }
 
     [Test]
-    public void Options_MacosBackend_DefaultsToCocoa()
+    public void Options_Experimental_MacosBackend_DefaultsToCocoa()
     {
         var options = new SentryUnityOptions();
-        Assert.AreEqual(MacosBackend.Cocoa, options.MacosBackend);
+        Assert.AreEqual(MacosBackend.Cocoa, options.Experimental.MacosBackend);
     }
 
     [Test]
-    public void Options_MacosBackend_IsSettable()
+    public void Options_Experimental_MacosBackend_IsSettable()
     {
-        var options = new SentryUnityOptions { MacosBackend = MacosBackend.Native };
-        Assert.AreEqual(MacosBackend.Native, options.MacosBackend);
+        var options = new SentryUnityOptions();
+        options.Experimental.MacosBackend = MacosBackend.Native;
+        Assert.AreEqual(MacosBackend.Native, options.Experimental.MacosBackend);
     }
 }

From 6dafbf17c1fc14c61d0a41100407ffbcea785143 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 14:53:09 +0200
Subject: [PATCH 07/17] updated snapshot

---
 .../package-release.zip.snapshot              | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/test/Scripts.Tests/package-release.zip.snapshot b/test/Scripts.Tests/package-release.zip.snapshot
index 7bc579921..191e836af 100644
--- a/test/Scripts.Tests/package-release.zip.snapshot
+++ b/test/Scripts.Tests/package-release.zip.snapshot
@@ -34,13 +34,28 @@ Plugins/macOS.meta
 Plugins/PS5.meta
 Plugins/Switch.meta
 Plugins/Windows.meta
+Plugins/macOS/Sentry/
 Plugins/macOS/Sentry.meta
 Plugins/macOS/SentryNativeBridge.m
 Plugins/macOS/SentryNativeBridge.m.meta
-Plugins/macOS/Sentry/Sentry.dylib
-Plugins/macOS/Sentry/Sentry.dylib.dSYM
-Plugins/macOS/Sentry/Sentry.dylib.dSYM.meta
-Plugins/macOS/Sentry/Sentry.dylib.meta
+Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/
+Plugins/macOS/SentryNative~/sentry-crash.dSYM/
+Plugins/macOS/SentryNative~/libsentry.dylib
+Plugins/macOS/SentryNative~/sentry-crash
+Plugins/macOS/SentryNative~/sentry-crash.dSYM/Contents/Resources/
+Plugins/macOS/SentryNative~/sentry-crash.dSYM/Contents/Info.plist
+Plugins/macOS/SentryNative~/sentry-crash.dSYM/Contents/Resources/Relocations/
+Plugins/macOS/SentryNative~/sentry-crash.dSYM/Contents/Resources/Relocations/aarch64/sentry-crash.yml
+Plugins/macOS/SentryNative~/sentry-crash.dSYM/Contents/Resources/Relocations/x86_64/sentry-crash.yml
+Plugins/macOS/SentryNative~/sentry-crash.dSYM/Contents/Resources/DWARF/sentry-crash
+Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/Contents/Resources/
+Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/Contents/Info.plist
+Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/Contents/Resources/Relocations/
+Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/Contents/Resources/Relocations/aarch64/libsentry.dylib.yml
+Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/Contents/Resources/Relocations/x86_64/libsentry.dylib.yml
+Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/Contents/Resources/DWARF/libsentry.dylib
+Plugins/macOS/Sentry~/Sentry.dylib
+Plugins/macOS/Sentry~/Sentry.dylib.dSYM
 Plugins/PS5/sentry_utils.c
 Plugins/PS5/sentry_utils.c.meta
 Plugins/iOS/SentryCxaThrowHook.cpp

From 558843c5b1b751810305eeeadde5740107b7b158 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 16:00:07 +0200
Subject: [PATCH 08/17] cleanup

---
 .github/workflows/build.yml                                 | 6 ++++++
 .../Assets/Scripts/SentryOptionConfiguration.cs             | 2 +-
 test/Scripts.Tests/package-release.zip.snapshot             | 2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f64c3dc5a..ed0309e6d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,6 +92,12 @@ jobs:
           name: Cocoa-sdk
           path: package-dev/Plugins
 
+      - name: Download MacOSNative SDK
+        uses: ./.github/actions/wait-for-artifact
+        with:
+          name: MacOSNative-sdk
+          path: package-dev/Plugins/macOS/SentryNative~
+
       - name: Download Linux SDK
         uses: ./.github/actions/wait-for-artifact
         with:
diff --git a/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs b/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
index 26ce3fd21..89fa89a80 100644
--- a/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
+++ b/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
@@ -57,7 +57,7 @@ public override void Configure(SentryUnityOptions options)
 #elif UNITY_STANDALONE_OSX
         // sentry-native uploads crashes out-of-process on shutdown; give the native
         // backend enough time to flush before the player exits.
-        if (options.MacosBackend == MacosBackend.Native)
+        if (options.Experimental.MacosBackend == MacosBackend.Native)
         {
             options.ShutdownTimeout = TimeSpan.FromSeconds(20);
         }
diff --git a/test/Scripts.Tests/package-release.zip.snapshot b/test/Scripts.Tests/package-release.zip.snapshot
index 191e836af..85cbbef6e 100644
--- a/test/Scripts.Tests/package-release.zip.snapshot
+++ b/test/Scripts.Tests/package-release.zip.snapshot
@@ -34,8 +34,6 @@ Plugins/macOS.meta
 Plugins/PS5.meta
 Plugins/Switch.meta
 Plugins/Windows.meta
-Plugins/macOS/Sentry/
-Plugins/macOS/Sentry.meta
 Plugins/macOS/SentryNativeBridge.m
 Plugins/macOS/SentryNativeBridge.m.meta
 Plugins/macOS/SentryNative~/libsentry.dylib.dSYM/

From 598d6c8c26a07a3e6770bc1b933f35b504779ae8 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 16:03:51 +0200
Subject: [PATCH 09/17] updated changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7e6ba02..64761128f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Features
+
+- Introduce `sentry-native` on macOS as experimental backend. This is an opt-in and accessible programmatically via the `options.Experimental`. The `sentry-native` backend allows for crashes to be sent immediately and will enable further updates, like `AppHangTracking` support ([#2687](https://github.com/getsentry/sentry-unity/pull/2687))
+
 ### Fixes
 
 - When targeting iOS, the SDK no longer crashes in `urlSessionTask:setState:` when handling an `AVAssetDownloadTask` ([#2677](https://github.com/getsentry/sentry-unity/pull/2677))

From 1578bf6c84d01a04a6cf487be16d9061855d0fcd Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 16:15:13 +0200
Subject: [PATCH 10/17] upsi. merge-derp

---
 package-dev/Runtime/SentryInitialization.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package-dev/Runtime/SentryInitialization.cs b/package-dev/Runtime/SentryInitialization.cs
index 9bc217349..703554fe7 100644
--- a/package-dev/Runtime/SentryInitialization.cs
+++ b/package-dev/Runtime/SentryInitialization.cs
@@ -122,7 +122,7 @@ private static void SetUpPlatformServices()
         private static void ConfigureMacosBackend(SentryUnityOptions options)
         {
 #if SENTRY_NATIVE
-            if (options.MacosBackend == MacosBackend.Native)
+            if (options.Experimental.MacosBackend == MacosBackend.Native)
             {
                 SentryNative.Configure(options);
                 return;
@@ -139,8 +139,12 @@ private static void ConfigureMacosBackend(SentryUnityOptions options)
 
         private static void CloseMacosBackend(SentryUnityOptions options)
         {
+            if (options is null)
+            {
+                return;
+            }
 #if SENTRY_NATIVE_COCOA
-            if (options.MacosBackend == MacosBackend.Cocoa)
+            if (options.Experimental.MacosBackend == MacosBackend.Cocoa)
             {
                 SentryNativeCocoa.Close(options);
             }

From cc6cb373fc5e61b5251e65249445908193802cfb Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Fri, 22 May 2026 18:54:07 +0200
Subject: [PATCH 11/17] clean up with every build

---
 .../Native/BuildPostProcess.cs                | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
index ebc6c1cf4..82eacb0d1 100644
--- a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
+++ b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
@@ -168,6 +168,25 @@ private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOption
         Directory.CreateDirectory(pluginsDest);
         Directory.CreateDirectory(macOSDest);
 
+        // Remove artifacts from a prior build with the other backend. On
+        // case-insensitive APFS, mono's DllImport("sentry") otherwise resolves
+        // "sentry.dylib" to a leftover Sentry.dylib (Cocoa) before finding
+        // libsentry.dylib (Native), surfacing as `sentry_options_new` not
+        // found at runtime.
+        foreach (var stale in new[]
+        {
+            Path.Combine(pluginsDest, "Sentry.dylib"),
+            Path.Combine(pluginsDest, "libsentry.dylib"),
+            Path.Combine(macOSDest, "sentry-crash"),
+        })
+        {
+            if (File.Exists(stale))
+            {
+                logger.LogDebug("Removing stale Sentry artifact from prior build: '{0}'", stale);
+                File.Delete(stale);
+            }
+        }
+
         foreach (var file in Directory.GetFiles(sourceDir))
         {
             var name = Path.GetFileName(file);

From 5a756d6aefd74f39fef4c7f1b01988cd7d24bdf2 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 28 May 2026 12:08:35 +0200
Subject: [PATCH 12/17] permissions

---
 .../Native/BuildPostProcess.cs                | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
index 82eacb0d1..b5e87dc1f 100644
--- a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
+++ b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
@@ -161,18 +161,13 @@ private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOption
         //  - dylibs go to Contents/PlugIns/ — Unity's IL2CPP loader searches there for DllImport.
         //  - executables (e.g. sentry-native's sentry-crash daemon) go to Contents/MacOS/
         //    because sentry-native posix_spawns the daemon from @executable_path.
-        //  - dSYMs are skipped — only consumed from the package at symbol-upload time.
         var contentsDir = Path.Combine(executablePath, "Contents");
         var pluginsDest = Path.Combine(contentsDir, "PlugIns");
         var macOSDest = Path.Combine(contentsDir, "MacOS");
         Directory.CreateDirectory(pluginsDest);
         Directory.CreateDirectory(macOSDest);
 
-        // Remove artifacts from a prior build with the other backend. On
-        // case-insensitive APFS, mono's DllImport("sentry") otherwise resolves
-        // "sentry.dylib" to a leftover Sentry.dylib (Cocoa) before finding
-        // libsentry.dylib (Native), surfacing as `sentry_options_new` not
-        // found at runtime.
+        // Cleanup of previous runs
         foreach (var stale in new[]
         {
             Path.Combine(pluginsDest, "Sentry.dylib"),
@@ -190,15 +185,16 @@ private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOption
         foreach (var file in Directory.GetFiles(sourceDir))
         {
             var name = Path.GetFileName(file);
-            // Dylibs into PlugIns/ (Unity's loader searches there). Everything
-            // else — i.e. the sentry-crash daemon executable for the Native
-            // backend — into MacOS/ so it sits next to the player binary,
-            // which is where sentry-native posix_spawns it from.
-            var destFile = name.EndsWith(".dylib", StringComparison.OrdinalIgnoreCase)
-                ? Path.Combine(pluginsDest, name)
-                : Path.Combine(macOSDest, name);
+            var isExecutable = !name.EndsWith(".dylib", StringComparison.OrdinalIgnoreCase);
+            var destFile = isExecutable
+                ? Path.Combine(macOSDest, name)
+                : Path.Combine(pluginsDest, name);
             logger.LogDebug("Copying '{0}' to '{1}'", file, destFile);
             File.Copy(file, destFile, overwrite: true);
+            if (isExecutable)
+            {
+                SentryCli.SetExecutePermission(destFile);
+            }
         }
     }
 

From a2cc9a19ea00379a49c935830ecdd6b5a6be2709 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 28 May 2026 13:07:01 +0200
Subject: [PATCH 13/17] refactor buildpostprocess

---
 .../Native/BuildPostProcess.cs                | 133 +++++++++---------
 1 file changed, 68 insertions(+), 65 deletions(-)

diff --git a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
index b5e87dc1f..4a5700eb0 100644
--- a/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
+++ b/src/Sentry.Unity.Editor/Native/BuildPostProcess.cs
@@ -85,17 +85,29 @@ and not BuildTargetGroup.PS5
             return;
         }
 
+        // Setup the actual plugin and crash handler in the build ouput directory
         try
         {
-            AddCrashHandler(logger, target, buildOutputDir);
             if (target == BuildTarget.StandaloneOSX)
             {
-                CopyMacOSPlugins(logger, options, executablePath);
+                // Since the backend can change between iterative builds we need to clean up after ourselves
+                CleanupStaleMacOSArtifacts(logger, executablePath);
+            }
+
+            foreach (var artifact in GetNativePluginArtifact(target, options, executablePath, buildOutputDir))
+            {
+                _ = Directory.CreateDirectory(Path.GetDirectoryName(artifact.Destination));
+                logger.LogDebug("Copying '{0}' to '{1}'", artifact.Source, artifact.Destination);
+                File.Copy(artifact.Source, artifact.Destination, overwrite: true);
+                if (artifact.MarkExecutable)
+                {
+                    SentryCli.SetExecutePermission(artifact.Destination);
+                }
             }
         }
         catch (Exception e)
         {
-            logger.LogError(e, "Failed to add the crash-handler to the built application.");
+            logger.LogError(e, "Failed to copy Sentry runtime artifacts into the built application.");
             throw new BuildFailedException("Sentry Native BuildPostProcess failed");
         }
     }
@@ -112,67 +124,81 @@ and not BuildTargetGroup.PS5
         _ => false,
     };
 
-    private static void AddCrashHandler(IDiagnosticLogger logger, BuildTarget target, string buildOutputDir)
+    private readonly struct NativePluginArtifact(string source, string destination, bool isExecutable = false)
     {
+        public readonly string Source = source;
+        public readonly string Destination = destination;
+        public readonly bool MarkExecutable = isExecutable;
+    }
+
+    private static IEnumerable<NativePluginArtifact> GetNativePluginArtifact(
+        BuildTarget target, SentryUnityOptions options, string executablePath, string buildOutputDir)
+    {
+        var pluginsPath = Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins");
+
         switch (target)
         {
             case BuildTarget.StandaloneWindows:
             case BuildTarget.StandaloneWindows64:
-                logger.LogDebug("Adding crashpad.");
-                CopyHandler(logger, buildOutputDir, Path.Combine("Windows", "Sentry", "crashpad_handler.exe"));
-                CopyHandler(logger, buildOutputDir, Path.Combine("Windows", "Sentry", "crashpad_wer.dll"));
+                // Crashpad must sit next to the player .exe so sentry-native can spawn it on crash
+                yield return new NativePluginArtifact(
+                    Path.Combine(pluginsPath, "Windows", "Sentry", "crashpad_handler.exe"),
+                    Path.Combine(buildOutputDir, "crashpad_handler.exe"));
+                yield return new NativePluginArtifact(
+                    Path.Combine(pluginsPath, "Windows", "Sentry", "crashpad_wer.dll"),
+                    Path.Combine(buildOutputDir, "crashpad_wer.dll"));
                 break;
-            case BuildTarget.StandaloneLinux64:
+
             case BuildTarget.StandaloneOSX:
-                // No standalone crash handler for Linux/macOS - uses built-in handlers.
-                return;
+                var backendSourcePath = options.Experimental.MacosBackend == MacosBackend.Native
+                    ? Path.Combine(pluginsPath, "macOS", "SentryNative~")
+                    : Path.Combine(pluginsPath, "macOS", "Sentry~");
+                var contents = Path.Combine(executablePath, "Contents");
+                foreach (var file in Directory.GetFiles(backendSourcePath))
+                {
+                    var name = Path.GetFileName(file);
+                    var isDylib = name.EndsWith(".dylib", StringComparison.OrdinalIgnoreCase);
+                    // The .dylibs need to go into the `*.app/Contents/Plugins` dirctory and will be picked
+                    // up by unity. The crash handler (sentry-native) needs to be next to the game's executable
+                    var desination = Path.Combine(contents, isDylib ? "PlugIns" : "MacOS", name);
+                    yield return new NativePluginArtifact(
+                        file,
+                        desination,
+                        isExecutable: !isDylib);
+                }
+                break;
+
+            case BuildTarget.StandaloneLinux64:
+                // No standalone crash handler for Linux - uses built-in handlers.
+                break;
             case BuildTarget.GameCoreXboxSeries:
             case BuildTarget.GameCoreXboxOne:
                 // No standalone crash handler for Xbox - comes with Breakpad
-                return;
+                break;
             case BuildTarget.PS5:
                 // No standalone crash handler for PlayStation
-                return;
+                break;
             case BuildTarget.Switch:
                 // No standalone crash handler for Switch - uses Nintendo's crash reporter
-                return;
+                break;
             default:
                 throw new ArgumentException($"Unsupported build target: {target}");
         }
     }
 
-    private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOptions options, string executablePath)
+    // On case-insensitive APFS, leftover artifacts from a prior build with
+    // the *other* macOS backend break DllImport("sentry") resolution
+    // (Sentry.dylib gets picked over libsentry.dylib, surfacing as
+    // `sentry_options_new` not found at runtime). Wipe both candidates
+    // before copying the current backend's files in.
+    private static void CleanupStaleMacOSArtifacts(IDiagnosticLogger logger, string executablePath)
     {
-        // executablePath on macOS is the .app bundle itself (e.g. /Build/MyGame.app).
-        var packagePluginsDir = Path.GetFullPath($"Packages/{SentryPackageInfo.GetName()}/Plugins/macOS");
-        var sourceDir = options.Experimental.MacosBackend == MacosBackend.Native
-            ? Path.Combine(packagePluginsDir, "SentryNative~")
-            : Path.Combine(packagePluginsDir, "Sentry~");
-
-        if (!Directory.Exists(sourceDir))
-        {
-            var target = options.Experimental.MacosBackend == MacosBackend.Native ? "BuildMacOSNativeSDK" : "BuildCocoaSDK";
-            throw new BuildFailedException(
-                $"Sentry macOS plugin directory not found: {sourceDir}\n" +
-                $"Run 'dotnet msbuild /t:{target} src/Sentry.Unity' (or 'dotnet msbuild /t:DownloadNativeSDKs src/Sentry.Unity') to populate it.");
-        }
-
-        // Files split by type:
-        //  - dylibs go to Contents/PlugIns/ — Unity's IL2CPP loader searches there for DllImport.
-        //  - executables (e.g. sentry-native's sentry-crash daemon) go to Contents/MacOS/
-        //    because sentry-native posix_spawns the daemon from @executable_path.
-        var contentsDir = Path.Combine(executablePath, "Contents");
-        var pluginsDest = Path.Combine(contentsDir, "PlugIns");
-        var macOSDest = Path.Combine(contentsDir, "MacOS");
-        Directory.CreateDirectory(pluginsDest);
-        Directory.CreateDirectory(macOSDest);
-
-        // Cleanup of previous runs
+        var contents = Path.Combine(executablePath, "Contents");
         foreach (var stale in new[]
         {
-            Path.Combine(pluginsDest, "Sentry.dylib"),
-            Path.Combine(pluginsDest, "libsentry.dylib"),
-            Path.Combine(macOSDest, "sentry-crash"),
+            Path.Combine(contents, "PlugIns", "Sentry.dylib"),
+            Path.Combine(contents, "PlugIns", "libsentry.dylib"),
+            Path.Combine(contents, "MacOS", "sentry-crash"),
         })
         {
             if (File.Exists(stale))
@@ -181,29 +207,6 @@ private static void CopyMacOSPlugins(IDiagnosticLogger logger, SentryUnityOption
                 File.Delete(stale);
             }
         }
-
-        foreach (var file in Directory.GetFiles(sourceDir))
-        {
-            var name = Path.GetFileName(file);
-            var isExecutable = !name.EndsWith(".dylib", StringComparison.OrdinalIgnoreCase);
-            var destFile = isExecutable
-                ? Path.Combine(macOSDest, name)
-                : Path.Combine(pluginsDest, name);
-            logger.LogDebug("Copying '{0}' to '{1}'", file, destFile);
-            File.Copy(file, destFile, overwrite: true);
-            if (isExecutable)
-            {
-                SentryCli.SetExecutePermission(destFile);
-            }
-        }
-    }
-
-    private static void CopyHandler(IDiagnosticLogger logger, string buildOutputDir, string handlerPath)
-    {
-        var fullHandlerPath = Path.GetFullPath(Path.Combine("Packages", SentryPackageInfo.GetName(), "Plugins", handlerPath));
-        var targetHandlerPath = Path.Combine(buildOutputDir, Path.GetFileName(fullHandlerPath));
-        logger.LogInfo("Copying handler '{0}' to {1}", Path.GetFileName(fullHandlerPath), targetHandlerPath);
-        File.Copy(fullHandlerPath, targetHandlerPath, true);
     }
 
     internal static void AddPath(List<string> paths, string path, IDiagnosticLogger logger, bool required = false)

From e1babe72b4e3d2be125f2fda7f4a025587a9860a Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 28 May 2026 13:26:24 +0200
Subject: [PATCH 14/17] floor the shutdown timeout

---
 .../ExperimentalSentryUnityOptions.cs             |  2 ++
 src/Sentry.Unity/ScriptableSentryUnityOptions.cs  | 15 +++++++++++++++
 .../Scripts/IntegrationOptionsConfiguration.cs    |  7 -------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Sentry.Unity/ExperimentalSentryUnityOptions.cs b/src/Sentry.Unity/ExperimentalSentryUnityOptions.cs
index 0e937e4ec..a864c0513 100644
--- a/src/Sentry.Unity/ExperimentalSentryUnityOptions.cs
+++ b/src/Sentry.Unity/ExperimentalSentryUnityOptions.cs
@@ -14,6 +14,8 @@ public class ExperimentalSentryUnityOptions
     /// Selects the native backend to use on macOS. Defaults to <see cref="Sentry.Unity.MacosBackend.Cocoa"/>,
     /// which requires IL2CPP. Use <see cref="Sentry.Unity.MacosBackend.Native"/> for the out-of-process
     /// sentry-native backend, which uploads crashes immediately and supports both IL2CPP and Mono.
+    /// When set to <see cref="Sentry.Unity.MacosBackend.Native"/>, <c>ShutdownTimeout</c> is raised to
+    /// a minimum of 10 seconds so the out-of-process handler has time to flush before the player exits.
     /// </summary>
     [field: SerializeField] public MacosBackend MacosBackend { get; set; } = MacosBackend.Cocoa;
 }
diff --git a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
index a9875b48e..b5a4dbd96 100644
--- a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
+++ b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs
@@ -266,6 +266,21 @@ internal SentryUnityOptions ToSentryUnityOptions(
             OptionsConfiguration.Configure(options);
         }
 
+        // The macOS Native backend hands crash uploads to an out-of-process handler that gets killed
+        // when the player exits. Enforce a floor so the handler has time to flush.
+        if (options.Experimental.MacosBackend == MacosBackend.Native)
+        {
+            var minimum = TimeSpan.FromSeconds(10);
+            if (options.ShutdownTimeout < minimum)
+            {
+                options.LogInfo(
+                    "Native macOS backend: raising ShutdownTimeout from {0}ms to the {1}ms floor.",
+                    (int)options.ShutdownTimeout.TotalMilliseconds,
+                    (int)minimum.TotalMilliseconds);
+                options.ShutdownTimeout = minimum;
+            }
+        }
+
         if (EnableErrorEventThrottling && options.Throttler is null)
         {
             options.Throttler = new ErrorEventThrottler(TimeSpan.FromMilliseconds(ThrottleDedupeWindow));
diff --git a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
index 0edb4ad9a..e647cedd3 100644
--- a/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
+++ b/test/Scripts.Integration.Test/Scripts/IntegrationOptionsConfiguration.cs
@@ -47,13 +47,6 @@ public override void Configure(SentryUnityOptions options)
 
         options.Experimental.MacosBackend = MacosBackend.Cocoa;
 
-        // sentry-native uploads crashes out-of-process on shutdown; give the native
-        // backend enough time to flush before the player exits.
-        if (options.Experimental.MacosBackend == MacosBackend.Native)
-        {
-            options.ShutdownTimeout = TimeSpan.FromSeconds(20);
-        }
-
         Debug.Log("Sentry: IntegrationOptionsConfig::Configure() finished");
     }
 }

From f20242ec733dd83a2d8d40b3d0edb8f2d6ab089e Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 28 May 2026 13:31:22 +0200
Subject: [PATCH 15/17] reverted change to samples

---
 .../Assets/Scripts/SentryOptionConfiguration.cs            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs b/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
index 89fa89a80..c38dbffae 100644
--- a/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
+++ b/samples/unity-of-bugs/Assets/Scripts/SentryOptionConfiguration.cs
@@ -54,13 +54,6 @@ public override void Configure(SentryUnityOptions options)
         options.AndroidNativeInitializationType = NativeInitializationType.Runtime;
 #elif UNITY_IOS
         options.IosNativeInitializationType = NativeInitializationType.Runtime;
-#elif UNITY_STANDALONE_OSX
-        // sentry-native uploads crashes out-of-process on shutdown; give the native
-        // backend enough time to flush before the player exits.
-        if (options.Experimental.MacosBackend == MacosBackend.Native)
-        {
-            options.ShutdownTimeout = TimeSpan.FromSeconds(20);
-        }
 #endif
 
         Debug.Log("SentryOptionConfigure finished.");

From 138641d4d3210b9c9a341c18d187dc604c42a676 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 28 May 2026 13:31:44 +0200
Subject: [PATCH 16/17] updated options .asset file

---
 .../Assets/Resources/Sentry/SentryOptions.asset           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset b/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset
index 94646d096..628209301 100644
--- a/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset
+++ b/samples/unity-of-bugs/Assets/Resources/Sentry/SentryOptions.asset
@@ -11,7 +11,7 @@ MonoBehaviour:
   m_EditorHideFlags: 0
   m_Script: {fileID: -668357930, guid: 43ec428a58422470fa764bdba9d9bc19, type: 3}
   m_Name: SentryOptions
-  m_EditorClassIdentifier:
+  m_EditorClassIdentifier: 
   <Enabled>k__BackingField: 1
   <Dsn>k__BackingField: https://e9ee299dbf554dfd930bc5f3c90d5d4b@o447951.ingest.us.sentry.io/4504604988538880
   <CaptureInEditor>k__BackingField: 1
@@ -27,8 +27,8 @@ MonoBehaviour:
   <AutoAwakeTraces>k__BackingField: 0
   <AutoSessionTracking>k__BackingField: 1
   <AutoSessionTrackingInterval>k__BackingField: 30000
-  <ReleaseOverride>k__BackingField:
-  <EnvironmentOverride>k__BackingField:
+  <ReleaseOverride>k__BackingField: 
+  <EnvironmentOverride>k__BackingField: 
   <AttachStacktrace>k__BackingField: 1
   <AttachScreenshot>k__BackingField: 1
   <ScreenshotQuality>k__BackingField: 1
@@ -79,6 +79,8 @@ MonoBehaviour:
   <SwitchNativeSupportEnabled>k__BackingField: 1
   <Il2CppLineNumberSupportEnabled>k__BackingField: 1
   <EnableMetrics>k__BackingField: 1
+  <Experimental>k__BackingField:
+    <MacosBackend>k__BackingField: 0
   <OptionsConfiguration>k__BackingField: {fileID: 11400000, guid: cea63afb7c75f429799422326f926abe, type: 2}
   <Debug>k__BackingField: 1
   <DebugOnlyInEditor>k__BackingField: 0

From ec2b25859bdda04172e74819c416ee8d181c75a6 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 28 May 2026 15:53:20 +0200
Subject: [PATCH 17/17] ismacos

---
 src/Sentry.Unity.Native/SentryNativeBridge.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Sentry.Unity.Native/SentryNativeBridge.cs b/src/Sentry.Unity.Native/SentryNativeBridge.cs
index a3803ecc8..26f331eea 100644
--- a/src/Sentry.Unity.Native/SentryNativeBridge.cs
+++ b/src/Sentry.Unity.Native/SentryNativeBridge.cs
@@ -23,7 +23,6 @@ internal static class SentryNativeBridge
     private static IDiagnosticLogger? Logger; // This is also the logger we're forwarding native messages to.
     private static bool UseLibC;
     private static bool IsWindows;
-    private static bool IsMacOS;
 
     public static bool Init(SentryUnityOptions options)
     {
@@ -31,12 +30,18 @@ public static bool Init(SentryUnityOptions options)
 
         UseLibC = Application.platform
             is RuntimePlatform.LinuxPlayer or RuntimePlatform.LinuxServer
-            or RuntimePlatform.PS5 or RuntimePlatform.Switch;
+            or RuntimePlatform.PS5
+            or RuntimePlatform.Switch;
+        if ((Application.platform
+            is RuntimePlatform.OSXPlayer or RuntimePlatform.OSXServer)
+            && RuntimeInformation.ProcessArchitecture == Architecture.X64)
+        {
+            UseLibC = true;
+        }
+
         IsWindows = Application.platform
             is RuntimePlatform.WindowsPlayer or RuntimePlatform.WindowsServer
             or RuntimePlatform.GameCoreXboxSeries or RuntimePlatform.GameCoreXboxOne;
-        IsMacOS = Application.platform
-            is RuntimePlatform.OSXPlayer or RuntimePlatform.OSXServer;
 
         var cOptions = sentry_options_new();