diff --git a/modules/sentry-native b/modules/sentry-native
index 5bae413975..8351ec22db 160000
--- a/modules/sentry-native
+++ b/modules/sentry-native
@@ -1 +1 @@
-Subproject commit 5bae413975dc010d8e2d5646316e35141ae2ebb7
+Subproject commit 8351ec22dbb6ea61b400d285072ad30b47f2723a
diff --git a/scripts/build-sentry-native.ps1 b/scripts/build-sentry-native.ps1
index ee1d9a99ca..cc4f686798 100644
--- a/scripts/build-sentry-native.ps1
+++ b/scripts/build-sentry-native.ps1
@@ -84,17 +84,23 @@ try
--config RelWithDebInfo `
--parallel
- $srcFile = "$actualBuildDir/${libPrefix}sentry$libExtension"
- $outFile = "$outDir/${libPrefix}sentry-native$libExtension"
+ function Deploy-Library($srcFile, $outFile)
+ {
+ # New-Item creates the directory if it doesn't exist.
+ New-Item -ItemType File -Path $outFile -Force | Out-Null
- # New-Item creates the directory if it doesn't exist.
- New-Item -ItemType File -Path $outFile -Force | Out-Null
+ Write-Host "Copying $srcFile to $outFile"
+ Copy-Item -Force -Path $srcFile -Destination $outFile
- Write-Host "Copying $srcFile to $outFile"
- Copy-Item -Force -Path $srcFile -Destination $outFile
+ # Touch the file to mark it as up-to-date for MSBuild
+ (Get-Item $outFile).LastWriteTime = Get-Date
+ }
- # Touch the file to mark it as up-to-date for MSBuild
- (Get-Item $outFile).LastWriteTime = Get-Date
+ Deploy-Library "$actualBuildDir/${libPrefix}sentry$libExtension" "$outDir/${libPrefix}sentry-native$libExtension"
+ if ($IsLinux)
+ {
+ Deploy-Library "$actualBuildDir/vendor/libunwind/${libPrefix}unwind$libExtension" "$outDir/${libPrefix}unwind$libExtension"
+ }
}
finally
{
diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index d79ec6e414..7f588af17c 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -23,10 +23,10 @@
$(SentryNativeOutputDirectory)$(NativeLibRelativePath-osx)\
$(SentryNativeOutputDirectory-win-x64)lib$(SentryNativeLibraryName).lib
$(SentryNativeOutputDirectory-win-arm64)lib$(SentryNativeLibraryName).lib
- $(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a
- $(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a
- $(SentryNativeOutputDirectory-linux-arm64)lib$(SentryNativeLibraryName).a
- $(SentryNativeOutputDirectory-linux-musl-arm64)lib$(SentryNativeLibraryName).a
+ $(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a
+ $(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a
+ $(SentryNativeOutputDirectory-linux-arm64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a
+ $(SentryNativeOutputDirectory-linux-musl-arm64)lib$(SentryNativeLibraryName).a;$(SentryNativeOutputDirectory)$(RuntimeIdentifier)\libunwind.a
$(SentryNativeOutputDirectory-osx)lib$(SentryNativeLibraryName).a
@@ -56,6 +56,10 @@
true
\sentry-native\$(NativeLibRelativePath-linux-x64)
+
+ true
+ \sentry-native\$(NativeLibRelativePath-linux-x64)
+
@@ -63,6 +67,10 @@
true
\sentry-native\$(NativeLibRelativePath-linux-musl-x64)
+
+ true
+ \sentry-native\$(NativeLibRelativePath-linux-musl-x64)
+
@@ -70,6 +78,10 @@
true
\sentry-native\$(NativeLibRelativePath-linux-arm64)
+
+ true
+ \sentry-native\$(NativeLibRelativePath-linux-arm64)
+
@@ -77,6 +89,10 @@
true
\sentry-native\$(NativeLibRelativePath-linux-musl-arm64)
+
+ true
+ \sentry-native\$(NativeLibRelativePath-linux-musl-arm64)
+
diff --git a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
index 69578bb60a..5844b8af38 100644
--- a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
@@ -51,16 +51,11 @@
-
+
-
-
-
-
-
-
-
+