diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml index 455a2b0954..ff101a98f1 100644 --- a/.github/actions/environment/action.yml +++ b/.github/actions/environment/action.yml @@ -44,6 +44,6 @@ runs: dotnet workload install \ wasm-tools wasm-tools-net8 maui-android \ ${{ runner.os == 'macOS' && 'maui-ios maui-maccatalyst maui-windows macos' || '' }} \ - ${{ runner.os == 'Windows' && 'maui-windows' || '' }} \ + ${{ runner.os == 'Windows' && 'maui-ios maui-maccatalyst maui-windows' || '' }} \ --temp-dir "${{ runner.temp }}" \ --skip-sign-check diff --git a/CHANGELOG.md b/CHANGELOG.md index 21cbcbea0c..427f2cc820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ### Features - Added support for `.NET 9` (preview) ([#3699](https://github.com/getsentry/sentry-dotnet/pull/3699)) +- libsentrysupplemental.so now supports 16 KB page sizes on Android ([#3723](https://github.com/getsentry/sentry-dotnet/pull/3723)) ## Unreleased diff --git a/lib/sentrysupplemental/CMakeLists.txt b/lib/sentrysupplemental/CMakeLists.txt index 0db4750f18..a6fc90decc 100644 --- a/lib/sentrysupplemental/CMakeLists.txt +++ b/lib/sentrysupplemental/CMakeLists.txt @@ -3,4 +3,7 @@ project(sentrysupplemental LANGUAGES C) add_library(sentrysupplemental SHARED sentrysupplemental.c) +# Set alignment to 16 KB. See https://developer.android.com/guide/practices/page-sizes#cmake +target_link_options(sentrysupplemental PRIVATE "-Wl,-z,max-page-size=16384") + set(LIBRARY_OUTPUT_PATH ../../bin/${ANDROID_ABI}) diff --git a/lib/sentrysupplemental/bin/arm64-v8a/libsentrysupplemental.so b/lib/sentrysupplemental/bin/arm64-v8a/libsentrysupplemental.so index 9259ab7c87..f0c6ab28e5 100755 Binary files a/lib/sentrysupplemental/bin/arm64-v8a/libsentrysupplemental.so and b/lib/sentrysupplemental/bin/arm64-v8a/libsentrysupplemental.so differ diff --git a/lib/sentrysupplemental/bin/armeabi-v7a/libsentrysupplemental.so b/lib/sentrysupplemental/bin/armeabi-v7a/libsentrysupplemental.so index 200d6f929f..b9f0c81c17 100755 Binary files a/lib/sentrysupplemental/bin/armeabi-v7a/libsentrysupplemental.so and b/lib/sentrysupplemental/bin/armeabi-v7a/libsentrysupplemental.so differ diff --git a/lib/sentrysupplemental/bin/x86/libsentrysupplemental.so b/lib/sentrysupplemental/bin/x86/libsentrysupplemental.so index 7e698873f1..09819b1db0 100755 Binary files a/lib/sentrysupplemental/bin/x86/libsentrysupplemental.so and b/lib/sentrysupplemental/bin/x86/libsentrysupplemental.so differ diff --git a/lib/sentrysupplemental/bin/x86_64/libsentrysupplemental.so b/lib/sentrysupplemental/bin/x86_64/libsentrysupplemental.so index 4be4aeb764..c3a8db6fcf 100755 Binary files a/lib/sentrysupplemental/bin/x86_64/libsentrysupplemental.so and b/lib/sentrysupplemental/bin/x86_64/libsentrysupplemental.so differ diff --git a/samples/Sentry.Samples.Maui/App.xaml.cs b/samples/Sentry.Samples.Maui/App.xaml.cs index fd978a504e..c400ec6e5d 100644 --- a/samples/Sentry.Samples.Maui/App.xaml.cs +++ b/samples/Sentry.Samples.Maui/App.xaml.cs @@ -5,7 +5,11 @@ public partial class App public App() { InitializeComponent(); + } - MainPage = new AppShell(); + protected override Window CreateWindow(IActivationState activationState) + { + Windows[0].Page = new AppShell(); + return base.CreateWindow(activationState); } } diff --git a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj index 0fe2a399fb..a8df32a874 100644 --- a/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj +++ b/samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj @@ -6,9 +6,9 @@ On Mac, we'll also build for iOS and MacCatalyst. On Windows, we'll also build for Windows 10. --> - $(TargetFrameworks);net8.0-android - $(TargetFrameworks);net8.0-windows10.0.19041.0;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net9.0-android + $(TargetFrameworks);net9.0-windows10.0.19041.0;net9.0-ios;net9.0-maccatalyst + $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst Exe Sentry.Samples.Maui true @@ -29,8 +29,8 @@ 1.0 1 - 11.0 - 13.1 + 12.2 + 15.0 21.0 10.0.17763.0 10.0.17763.0