Skip to content

Commit 60ea6ee

Browse files
jamescrosswelljamescrosswell
authored
Merge branch 'main' into disable-ndk
2 parents 179d173 + 81452c1 commit 60ea6ee

File tree

34 files changed

+95
-87
lines changed

34 files changed

+95
-87
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
run: dotnet test Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}" --collect "XPlat Code Coverage"
124124

125125
- name: Upload code coverage
126-
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303
126+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3
127127

128128
- name: Upload build and test outputs
129129
if: failure()
@@ -220,10 +220,17 @@ jobs:
220220
uses: ./.github/actions/buildnative
221221

222222
- name: Install Android SDKs
223+
id: installandroidsdks
224+
continue-on-error: true
223225
if: runner.os == 'macOS'
224226
run: |
225227
dotnet build src/Sentry/Sentry.csproj -t:InstallAndroidDependencies -f:net8.0-android34.0 -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"
226228
229+
- name: Install Android SDKs (retry)
230+
if: steps.installandroidsdks.outcome=='failure' && runner.os == 'macOS'
231+
run: |
232+
dotnet build src/Sentry/Sentry.csproj -t:InstallAndroidDependencies -f:net8.0-android34.0 -p:AcceptAndroidSDKLicenses=True -p:AndroidSdkPath="/usr/local/lib/android/sdk/"
233+
227234
- name: Publish Test app (macOS)
228235
run: dotnet publish test/Sentry.TrimTest/Sentry.TrimTest.csproj -c Release -r osx-arm64
229236

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: ./.github/actions/environment
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # pin@v2
38+
uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # pin@v2
3939
with:
4040
languages: csharp
4141

@@ -49,6 +49,6 @@ jobs:
4949
run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
5050

5151
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # pin@v2
52+
uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # pin@v2
5353
with:
5454
category: '/language:csharp'

‎CHANGELOG.md‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,28 @@
44

55
### Significant change in behavior
66
- The NDK is now disabled by default on Android, to prevent SIGSEGV errors resulting from managed NullReferenceExceptions ([#3903](https://github.com/getsentry/sentry-dotnet/pull/3903))
7+
- The User.IpAddress is now only set to `{{auto}}` when `SendDefaultPii` is enabled. This change gives you control over IP address collection directly on the client ([#3893](https://github.com/getsentry/sentry-dotnet/pull/3893))
78

89
### Features
910

1011
- .NET on iOS: Add experimental EnableAppHangTrackingV2 configuration flag to the options binding SDK ([#3877](https://github.com/getsentry/sentry-dotnet/pull/3877))
1112
- Added `SentryOptions.DisableSentryHttpMessageHandler`. Useful if you're using `OpenTelemetry.Instrumentation.Http` and ending up with duplicate spans. ([#3879](https://github.com/getsentry/sentry-dotnet/pull/3879))
1213

14+
### Fixes
15+
16+
- Fixed duplicate SentryMauiEventProcessors ([#3905](https://github.com/getsentry/sentry-dotnet/pull/3905))
17+
1318
### Dependencies
1419

15-
- Bump Native SDK from v0.7.17 to v0.7.18 ([#3891](https://github.com/getsentry/sentry-dotnet/pull/3891))
16-
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0718)
17-
- [diff](https://github.com/getsentry/sentry-native/compare/0.7.17...0.7.18)
20+
- Bump Native SDK from v0.7.17 to v0.7.19 ([#3891](https://github.com/getsentry/sentry-dotnet/pull/3891), [#3908](https://github.com/getsentry/sentry-dotnet/pull/3908))
21+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0719)
22+
- [diff](https://github.com/getsentry/sentry-native/compare/0.7.17...0.7.19)
23+
- Bump Java SDK from v7.20.0 to v7.20.1 ([#3907](https://github.com/getsentry/sentry-dotnet/pull/3907))
24+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7201)
25+
- [diff](https://github.com/getsentry/sentry-java/compare/7.20.0...7.20.1)
26+
- Bump CLI from v2.40.0 to v2.41.1 ([#3910](https://github.com/getsentry/sentry-dotnet/pull/3910))
27+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2411)
28+
- [diff](https://github.com/getsentry/sentry-cli/compare/2.40.0...2.41.1)
1829

1930
## 5.0.1
2031

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
<!-- Set the version and local path for Sentry CLI (downloaded in the restore phase of Sentry.csproj) -->
8585
<PropertyGroup Condition="'$(SolutionName)' != 'Sentry.Unity'">
86-
<SentryCLIVersion>2.40.0</SentryCLIVersion>
86+
<SentryCLIVersion>2.41.1</SentryCLIVersion>
8787
<SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
8888
</PropertyGroup>
8989

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018-2024 Sentry
3+
Copyright (c) 2018 Sentry
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Sentry.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Hangfire", "src\Sent
170170
EndProject
171171
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Hangfire.Tests", "test\Sentry.Hangfire.Tests\Sentry.Hangfire.Tests.csproj", "{46E40BE8-1AB0-4846-B0A2-A40AD0272C64}"
172172
EndProject
173-
Project("{00000000-0000-0000-0000-000000000000}") = "Sentry.Samples.AspNetCore.WebAPI.Profiling", "samples\Sentry.Samples.AspNetCore.WebAPI.Profiling\Sentry.Samples.AspNetCore.WebAPI.Profiling.csproj", "{A5B26C14-7313-4EDC-91E3-287F9374AB75}"
173+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.AspNetCore.WebAPI.Profiling", "samples\Sentry.Samples.AspNetCore.WebAPI.Profiling\Sentry.Samples.AspNetCore.WebAPI.Profiling.csproj", "{A5B26C14-7313-4EDC-91E3-287F9374AB75}"
174174
EndProject
175175
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{233D34AB-970E-4913-AA1E-172E833FB5B2}"
176176
ProjectSection(SolutionItems) = preProject

‎modules/sentry-native‎

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>net8.0-android34.0</TargetFrameworks>
44
<!-- BG8605 and BG8606 happen because there's a missing androidx.lifecycle dependency, but we don't need it here. (The native Android Sentry SDK will use it if it exists.) -->
55
<NoWarn>$(NoWarn);BG8605;BG8606</NoWarn>
6-
<SentryAndroidSdkVersion>7.20.0</SentryAndroidSdkVersion>
6+
<SentryAndroidSdkVersion>7.20.1</SentryAndroidSdkVersion>
77
<SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
88
<Description>.NET Bindings for the Sentry Android SDK</Description>
99
</PropertyGroup>

‎src/Sentry.Maui/Internal/SentryMauiOptionsSetup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal class SentryMauiOptionsSetup : IConfigureOptions<SentryMauiOptions>
1515
public SentryMauiOptionsSetup(IConfiguration config)
1616
{
1717
ArgumentNullException.ThrowIfNull(config);
18-
_config = config;
18+
_config = config.GetSection("Sentry");
1919
}
2020

2121
public void Configure(SentryMauiOptions options)

‎src/Sentry.Maui/SentryMauiAppBuilderExtensions.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ public static MauiAppBuilder UseSentry(this MauiAppBuilder builder,
4444
{
4545
var services = builder.Services;
4646

47-
var section = builder.Configuration.GetSection("Sentry");
48-
services.AddSingleton<IConfigureOptions<SentryMauiOptions>>(_ => new SentryMauiOptionsSetup(section));
49-
5047
if (configureOptions != null)
5148
{
5249
services.Configure(configureOptions);

0 commit comments

Comments
 (0)