Skip to content

Commit d9ce523

Browse files
Flash0verFlash0ver
committed
Merge branch 'main' into feat/logs-microsoft-extensions-logging
2 parents 476cbc3 + 4821fe7 commit d9ce523

File tree

56 files changed

+2175
-670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2175
-670
lines changed

‎.generated.NoMobile.sln‎

Lines changed: 712 additions & 6 deletions
Large diffs are not rendered by default.

‎.github/actions/environment/action.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ runs:
2828
with:
2929
log-accepted-android-sdk-licenses: false
3030

31-
# https://github.com/actions/runner-images/issues/10814
32-
- name: Workaround build-tools issue
33-
if: runner.os == 'macOS'
34-
shell: bash
35-
run: |
36-
curl https://dl.google.com/android/repository/build-tools_r35_macosx.zip > $ANDROID_HOME/build-tools_r35_macosx.zip
37-
cd $ANDROID_HOME
38-
mkdir -p build-tools
39-
unzip build-tools_r35_macosx.zip
40-
mv android-15 build-tools/35.0.0
41-
cd -
42-
4331
- name: Set Java Version
4432
uses: actions/setup-java@v3
4533
with:

‎.github/alpine/Dockerfile‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# docker build --build-arg BASE=alpine:3.21
2+
ARG BASE=alpine:latest
3+
FROM ${BASE}
4+
5+
RUN apk update
6+
7+
# common
8+
RUN apk add bash build-base cmake curl git icu lsb-release-minimal sudo tar wget
9+
10+
# sentry-native
11+
RUN apk add curl-dev libunwind-dev libunwind-static linux-headers openssl-dev zlib-dev xz-dev
12+
13+
# sentry-dotnet
14+
RUN apk add grpc-plugins openjdk11 powershell
15+
ENV PROTOBUF_PROTOC=/usr/bin/protoc
16+
ENV GRPC_PROTOC_PLUGIN=/usr/bin/grpc_csharp_plugin
17+
RUN pwsh -Command Install-Module Pester -Scope AllUsers -Force
18+
19+
# mono (3.22+)
20+
RUN if ! apk add mono; then \
21+
sed -i.bak 's|/v3\.[0-9]\+|/edge|g' /etc/apk/repositories && \
22+
cat /etc/apk/repositories && \
23+
apk update && \
24+
apk add --no-cache mono && \
25+
mv /etc/apk/repositories.bak /etc/apk/repositories && \
26+
apk update; \
27+
fi
28+
RUN mono --version
29+
30+
# runner
31+
RUN addgroup runner
32+
RUN adduser -S -u 1001 -h /home/runner -G runner runner
33+
RUN mkdir -p /home/runner /__e /__w /__w/_temp /__w/_actions /__w/_tool
34+
RUN chown -R runner:runner /home/runner /__e /__w
35+
RUN ln -s /__w /home/runner/work
36+
RUN echo "runner ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/runner
37+
RUN chmod 0440 /etc/sudoers.d/runner
38+
RUN chmod -R 777 /opt
39+
RUN chmod -R 777 /usr/share
40+
USER runner
41+
WORKDIR /__w
42+
ENTRYPOINT ["/bin/bash"]

‎.github/workflows/alpine.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Build Alpine Linux Docker image
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- '.github/alpine/*'
8+
9+
jobs:
10+
build:
11+
name: Build sentry-dotnet-alpine:${{ matrix.version }}
12+
runs-on: ubuntu-latest
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
version:
17+
- "3.21"
18+
19+
permissions:
20+
contents: read
21+
packages: write
22+
23+
steps:
24+
- uses: actions/checkout@v4
25+
26+
- uses: docker/login-action@v3
27+
with:
28+
registry: ghcr.io
29+
username: ${{ github.actor }}
30+
password: ${{ secrets.GITHUB_TOKEN }}
31+
32+
- name: Build ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }}
33+
run: docker build --build-arg BASE=alpine:${{ matrix.version }} -t ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }} .
34+
working-directory: .github/alpine
35+
36+
- name: Push ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }}
37+
run: docker push ghcr.io/${{ github.repository_owner }}/sentry-dotnet-alpine:${{ matrix.version }}
38+
working-directory: .github/alpine

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
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"
127127

128128
- name: Upload code coverage
129-
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d
129+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24
130130

131131
- name: Upload build and test outputs
132132
if: failure()

‎.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@60168efe1c415ce0f5521ea06d5c2062adbeed1b # pin@v2
38+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # 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@60168efe1c415ce0f5521ea06d5c2062adbeed1b # pin@v2
52+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v2
5353
with:
5454
category: '/language:csharp'

‎.github/workflows/device-tests-android.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
path: bin
9090

9191
- name: Setup Gradle
92-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
92+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # pin@v3
9393

9494
# Cached AVD setup per https://github.com/ReactiveCircus/android-emulator-runner/blob/main/README.md
9595

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,22 @@
99
- `Sentry.AspNetCore`, enabled via `SentryAspNetCoreOptions.EnableLogs`
1010
- `Sentry.Extensions.Logging`, enabled via `SentryLoggingOptions.EnableLogs`
1111
- `Sentry.Maui`, enabled via `SentryMauiOptions.EnableLogs`
12+
## 5.8.0
13+
14+
### Features
15+
16+
- .NET MAUI integration with CommunityToolkit.Mvvm Async Relay Commands can now be auto spanned with the new package Sentry.Maui.CommunityToolkit.Mvvm ([#4125](https://github.com/getsentry/sentry-dotnet/pull/4125))
17+
18+
### Fixes
19+
20+
- Revert "Bump Cocoa SDK from v8.39.0 to v8.46.0 (#4103)" ([#4202](https://github.com/getsentry/sentry-dotnet/pull/4202))
21+
- IMPORTANT: Fixes multiple issues running versions 5.6.x and 5.7.x of the Sentry SDK for .NET on iOS (initialising the SDK and sending data to Sentry)
22+
23+
### Dependencies
24+
25+
- Bump Native SDK from v0.8.4 to v0.8.5 ([#4189](https://github.com/getsentry/sentry-dotnet/pull/4189))
26+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#085)
27+
- [diff](https://github.com/getsentry/sentry-native/compare/0.8.4...0.8.5)
1228

1329
## 5.7.0
1430

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<VersionPrefix>5.7.0</VersionPrefix>
4+
<VersionPrefix>5.8.0</VersionPrefix>
55
<LangVersion>13</LangVersion>
66
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
5050
-->
5151
<PropertyGroup>
5252
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
53-
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">13.0</SupportedOSPlatformVersion>
53+
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">12.2</SupportedOSPlatformVersion>
5454
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
5555
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'android'">21.0</SupportedOSPlatformVersion>
5656
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
-->
1111
<PropertyGroup>
1212
<TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
13-
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">13.0</SupportedOSPlatformVersion>
13+
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'ios'">12.2</SupportedOSPlatformVersion>
1414
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
1515
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'android'">21.0</SupportedOSPlatformVersion>
1616
<SupportedOSPlatformVersion Condition="'$(TargetPlatformIdentifier)' == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>

0 commit comments

Comments
 (0)