Skip to content

Commit 8ac3f1b

Browse files
Merge branch 'main' into reapply-4103
2 parents 399888e + f1e7e92 commit 8ac3f1b

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
- Reapply "Bump Cocoa SDK from v8.39.0 to v8.46.0 (#4103)" ([#4442](https://github.com/getsentry/sentry-dotnet/pull/4442))
1414
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8460)
1515
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.39.0...8.46.0)
16-
16+
- Bump Native SDK from v0.9.1 to v0.10.0 ([#4436](https://github.com/getsentry/sentry-dotnet/pull/4436))
17+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0100)
18+
- [diff](https://github.com/getsentry/sentry-native/compare/0.9.1...0.10.0)
19+
1720
## 5.14.1
1821

1922
### Fixes

modules/sentry-native

Submodule sentry-native updated 84 files

scripts/device-test.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ try
3737
'--app', "$buildDir/io.sentry.dotnet.maui.device.testapp-Signed.apk",
3838
'--package-name', 'io.sentry.dotnet.maui.device.testapp',
3939
'--launch-timeout', '00:10:00',
40+
'--timeout', '00:25:00',
4041
'--instrumentation', 'Sentry.Maui.Device.TestApp.SentryInstrumentation'
4142
)
4243

@@ -58,6 +59,7 @@ try
5859
'--app', "$buildDir/Sentry.Maui.Device.TestApp.app",
5960
'--target', 'ios-simulator-64',
6061
'--launch-timeout', '00:10:00',
62+
'--timeout', '00:25:00',
6163
'--set-env', "CI=$envValue"
6264
)
6365

src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@
66
<!-- This gets resolved by the DownloadSentryAndroidSdk target -->
77
<SentryNativeNdkVersion></SentryNativeNdkVersion>
88
<Description>.NET Bindings for the Sentry Android SDK</Description>
9+
10+
<!-- Android binding warnings - these are largely unavoidable due to Java interface circular dependencies -->
11+
<!-- Only suppress warnings that are confirmed to be expected/unavoidable -->
12+
<!-- BG8801: Invalid parameter types - caused by circular interface dependencies in Sentry Java SDK -->
13+
<!-- BG8C01: Invalid base interface - interfaces reference types removed by Metadata.xml -->
14+
<!-- BG8701: Invalid return types - return types reference unresolvable interfaces -->
15+
<!-- BG8800/BG8700: Unknown/Invalid types - types intentionally removed by Metadata.xml -->
16+
<!-- BG8605/BG8606: Missing Java types - Compose UI types not available in our binding context -->
17+
<!-- BG8604: Missing ancestor types - nested types whose parents are removed -->
18+
<!-- BG8502/BG8503: Interface invalidation - cascade effect from other binding issues -->
19+
<!-- BG8401/BG8400: Field/property conflicts - resolved individually in Metadata.xml where needed -->
20+
<!-- BG8C00: Base interface not found -->
21+
<NoWarn>$(NoWarn);BG8801;BG8C01;BG8701;BG8800;BG8700;BG8605;BG8606;BG8604;BG8502;BG8401;BG8400;BG8503;BG8C00</NoWarn>
922
</PropertyGroup>
1023

1124
<!-- Use a separate readme, and don't add the changelog to the nuget. -->

0 commit comments

Comments
 (0)