final touches

Author: bitsandfoxes

.gitignore

@@ -46,6 +46,10 @@ modules/sentry-native-ndk
 # Android SDK files
 package-dev/Plugins/Android/Sentry~/*
 
+# Windows SDK files
+package-dev/Plugins/Windows/Sentry~/*
+package-dev/Plugins/Windows/SentryNative~/*
+
 # CLI
 package-dev/Editor/sentry-cli
 

build/native-sdks.targets

@@ -111,13 +111,13 @@
 
     <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake -B build -D SENTRY_BACKEND=crashpad -D SENTRY_SDK_NAME=sentry.native.unity -D SENTRY_BUILD_RUNTIMESTATIC=ON -S ." />
     <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake --build build --target sentry --config RelWithDebInfo --parallel" />
-    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake --build build --target crashpad_handler --config Release --parallel" />
+    <Exec WorkingDirectory="$(SentryNativeRoot)" Command="cmake --build build --target crashpad_handler --config RelWithDebInfo --parallel" />
 
     <MakeDir Directories="$(SentryWindowsArtifactsDestination)" />
 
     <ItemGroup>
-      <NativeSdkArtifacts Include="$(SentryNativeRoot)build/crashpad_build/handler/Release/crashpad_handler.exe" />
-      <NativeSdkArtifacts Include="$(SentryNativeRoot)build/crashpad_build/handler/Release/crashpad_handler.pdb" />
+      <NativeSdkArtifacts Include="$(SentryNativeRoot)build/crashpad_build/handler/RelWithDebInfo/crashpad_handler.exe" />
+      <NativeSdkArtifacts Include="$(SentryNativeRoot)build/crashpad_build/handler/RelWithDebInfo/crashpad_handler.pdb" />
       <NativeSdkArtifacts Include="$(SentryNativeRoot)build/crashpad_build/handler/RelWithDebInfo/crashpad_wer.dll" />
       <NativeSdkArtifacts Include="$(SentryNativeRoot)build/crashpad_build/handler/RelWithDebInfo/crashpad_wer.pdb" />
       <NativeSdkArtifacts Include="$(SentryNativeRoot)build/RelWithDebInfo/sentry.dll" />

src/Sentry.Unity.Native/SentryNativeBridge.cs

@@ -99,6 +99,10 @@ is RuntimePlatform.WindowsPlayer or RuntimePlatform.WindowsServer
         Logger?.LogDebug("Setting EnableMetrics: {0}", options.EnableMetrics);
         sentry_options_set_enable_metrics(cOptions, options.EnableMetrics ? 1 : 0);
 
+        var shutdownMs = (ulong)Math.Max(0, options.ShutdownTimeout.TotalMilliseconds);
+        Logger?.LogDebug("Setting ShutdownTimeout: {0} ms", shutdownMs);
+        sentry_options_set_shutdown_timeout(cOptions, shutdownMs);
+
         if (options.UnityInfo.IL2CPP)
         {
             Logger?.LogDebug("Setting the native logger");
@@ -178,6 +182,9 @@ internal static string GetDatabasePath(SentryUnityOptions options, IApplication?
     [DllImport(SentryLib)]
     private static extern void sentry_options_set_enable_metrics(IntPtr options, int enable_metrics);
 
+    [DllImport(SentryLib)]
+    private static extern void sentry_options_set_shutdown_timeout(IntPtr options, ulong shutdown_timeout);
+
     [UnmanagedFunctionPointer(CallingConvention.Cdecl, SetLastError = true)]
     private delegate void sentry_logger_function_t(int level, IntPtr message, IntPtr argsAddress, IntPtr userData);