Skip to content

Commit 302cf7a

Browse files
jamescrosswelljamescrosswell
committed
Merge remote-tracking branch 'origin/main' into maven-references-net10
2 parents cb41e0c + ba47ffa commit 302cf7a

25 files changed

+187
-111
lines changed

‎.generated.NoMobile.sln‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A8A9
217217
scripts\build-sentry-cocoa.sh = scripts\build-sentry-cocoa.sh
218218
scripts\update-project-xml.ps1 = scripts\update-project-xml.ps1
219219
scripts\build-sentry-native.ps1 = scripts\build-sentry-native.ps1
220-
scripts\ios-simulator-utils.ps1 = scripts\ios-simulator-utils.ps1
221220
scripts\commit-formatted-code.sh = scripts\commit-formatted-code.sh
222221
scripts\accept-verifier-changes.ps1 = scripts\accept-verifier-changes.ps1
223222
scripts\generate-cocoa-bindings.ps1 = scripts\generate-cocoa-bindings.ps1
224223
scripts\generate-solution-filters.ps1 = scripts\generate-solution-filters.ps1
225224
scripts\generate-solution-filters-config.yaml = scripts\generate-solution-filters-config.yaml
225+
scripts\device-test-utils.ps1 = scripts\device-test-utils.ps1
226+
scripts\install-libssl1.sh = scripts\install-libssl1.sh
227+
scripts\patch-cocoa-bindings.cs = scripts\patch-cocoa-bindings.cs
226228
EndProjectSection
227229
EndProject
228230
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{EC6ADE8A-E557-4848-8F03-519039830B5F}"
@@ -239,6 +241,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
239241
.github\workflows\vulnerabilities.yml = .github\workflows\vulnerabilities.yml
240242
.github\workflows\device-tests-ios.yml = .github\workflows\device-tests-ios.yml
241243
.github\workflows\device-tests-android.yml = .github\workflows\device-tests-android.yml
244+
.github\workflows\changelog-preview.yml = .github\workflows\changelog-preview.yml
242245
EndProjectSection
243246
EndProject
244247
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "actions", "actions", "{5D50D425-244F-4B79-B9F5-21D26DD52DC1}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runs:
4848
- name: Pin the Xcode Version
4949
if: runner.os == 'macOS'
5050
shell: bash
51-
run: sudo xcode-select --switch /Applications/Xcode_26.0.1.app
51+
run: sudo xcode-select --switch /Applications/Xcode_26.2.app
5252

5353
# Java 17 is needed for Android SDK setup step
5454
- name: Install Java 17

‎.github/workflows/alpine.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727

28-
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
28+
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
2929
with:
3030
registry: ghcr.io
3131
username: ${{ github.actor }}

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
uses: ./.github/actions/install-zstd
5959

6060
- id: cache
61-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
61+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
6262
with:
6363
path: src/Sentry/Platforms/Native/sentry-native
6464
key: sentry-native-${{ matrix.rid }}-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -140,47 +140,47 @@ jobs:
140140

141141
- name: Download sentry-native (linux-x64)
142142
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-x64') }}
143-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
143+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
144144
with:
145145
path: src/Sentry/Platforms/Native/sentry-native
146146
key: sentry-native-linux-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
147147
fail-on-cache-miss: true
148148

149149
- name: Download sentry-native (linux-arm64)
150150
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-arm64') }}
151-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
151+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
152152
with:
153153
path: src/Sentry/Platforms/Native/sentry-native
154154
key: sentry-native-linux-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
155155
fail-on-cache-miss: true
156156

157157
- name: Download sentry-native (linux-musl-x64)
158158
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-musl-x64') }}
159-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
159+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
160160
with:
161161
path: src/Sentry/Platforms/Native/sentry-native
162162
key: sentry-native-linux-musl-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
163163
fail-on-cache-miss: true
164164

165165
- name: Download sentry-native (linux-musl-arm64)
166166
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-musl-arm64') }}
167-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
167+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
168168
with:
169169
path: src/Sentry/Platforms/Native/sentry-native
170170
key: sentry-native-linux-musl-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
171171
fail-on-cache-miss: true
172172

173173
- name: Download sentry-native (macos)
174174
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'macos') }}
175-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
175+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
176176
with:
177177
path: src/Sentry/Platforms/Native/sentry-native
178178
key: sentry-native-macos-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
179179
fail-on-cache-miss: true
180180

181181
- name: Download sentry-native (win-x64)
182182
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'win-x64') }}
183-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
183+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
184184
with:
185185
path: src/Sentry/Platforms/Native/sentry-native
186186
key: sentry-native-win-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -189,7 +189,7 @@ jobs:
189189

190190
- name: Download sentry-native (win-arm64)
191191
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'win-arm64') }}
192-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
192+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
193193
with:
194194
path: src/Sentry/Platforms/Native/sentry-native
195195
key: sentry-native-win-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -311,7 +311,7 @@ jobs:
311311
submodules: recursive
312312

313313
- name: Download sentry-native (win-x64)
314-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
314+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
315315
with:
316316
path: src/Sentry/Platforms/Native/sentry-native
317317
key: sentry-native-win-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -404,7 +404,7 @@ jobs:
404404
run: echo "CI_PUBLISHING_BUILD=true" >> $GITHUB_ENV
405405

406406
- name: Download sentry-native (macos)
407-
uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
407+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
408408
with:
409409
path: src/Sentry/Platforms/Native/sentry-native
410410
key: sentry-native-macos-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}

‎.github/workflows/changelog-preview.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Changelog Preview
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
- reopened
8+
- edited
9+
- labeled
10+
- unlabeled
11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
statuses: write
15+
16+
jobs:
17+
changelog-preview:
18+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@v2
19+
secrets: inherit

‎.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@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
38+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
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@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
52+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
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
@@ -91,7 +91,7 @@ jobs:
9191
path: bin
9292

9393
- name: Setup Gradle
94-
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
94+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
9595

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

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ on:
44
workflow_dispatch:
55
inputs:
66
version:
7-
description: Version to release
8-
required: true
7+
description: Version to release (or "auto")
8+
required: false
99
merge_target:
1010
description: Target branch to merge into. Uses the default branch as a fallback (optional)
1111
required: false
1212
force:
1313
description: Force a release even when there are release-blockers (optional)
1414
required: false
1515

16+
permissions:
17+
contents: write
18+
pull-requests: write
19+
1620
jobs:
1721
job_release:
1822
runs-on: ubuntu-latest
@@ -31,7 +35,7 @@ jobs:
3135
fetch-depth: 0
3236

3337
- name: Prepare release ${{ github.event.inputs.version }}
34-
uses: getsentry/action-prepare-release@c8e1c2009ab08259029170132c384f03c1064c0e # v1.6.6
38+
uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203 # v2
3539
env:
3640
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
3741
with:

‎CHANGELOG.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88

99
### Fixes
1010

11+
- Allow Sentry failures from the Sentry CLI when SENTRY_ALLOW_FAILURE is set ([#4852](https://github.com/getsentry/sentry-dotnet/pull/4852))
1112
- The SDK now logs a specific error message when envelopes are rejected due to size limits (HTTP 413) ([#4863](https://github.com/getsentry/sentry-dotnet/pull/4863))
1213
- Fixed thread-safety issue on Android when multiple events are captured concurrently ([#4814](https://github.com/getsentry/sentry-dotnet/pull/4814))
1314

1415
### Dependencies
1516

16-
- Bump Native SDK from v0.12.2 to v0.12.3 ([#4832](https://github.com/getsentry/sentry-dotnet/pull/4832))
17-
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0123)
18-
- [diff](https://github.com/getsentry/sentry-native/compare/0.12.2...0.12.3)
17+
- Bump Native SDK from v0.12.2 to v0.12.4 ([#4832](https://github.com/getsentry/sentry-dotnet/pull/4832), [#4875](https://github.com/getsentry/sentry-dotnet/pull/4875))
18+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0124)
19+
- [diff](https://github.com/getsentry/sentry-native/compare/0.12.2...0.12.4)
1920
- Bump Java SDK from v8.28.0 to v8.29.0 ([#4817](https://github.com/getsentry/sentry-dotnet/pull/4817))
2021
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8290)
2122
- [diff](https://github.com/getsentry/sentry-java/compare/8.28.0...8.29.0)

‎CONTRIBUTING.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,20 @@ and let the next build download the pre-built SDK again:
194194
$ rm -rf modules/sentry-cocoa
195195
$ dotnet build ... # downloads pre-built Cocoa SDK into modules/sentry-cocoa
196196
```
197+
198+
## Local Sentry Android SDK checkout
199+
200+
Similarly, by default, `Sentry.Bindings.Android` downloads a pre-built Sentry Android SDK from
201+
Maven. The version is specified in the `SentryAndroidSdkVersion` build property in `Sentry.Bindings.Android.csproj`.
202+
203+
If you want to build an unreleased Sentry Android SDK version from source instead,
204+
you'll need to clone both the sentry-java and the sentry-native repositories and publish these locally:
205+
```sh
206+
$ cd $(LocalSentryJavaRepoDir) && ./gradlew publishToMavenLocal
207+
$ cd $(LocalSentryNativeRepoDir)/ndk && ./gradlew publishToMavenLocal
208+
```
209+
210+
You'll also need to set `<UseLocalSentryMavenRepo>true</UseLocalSentryMavenRepo>` and `<SentryNativeNdkVersion>{whatever_version_you_checked_out}</SentryNativeNdkVersion>`
211+
in the `Sentry.Bindings.Android.csproj`file.
212+
213+
To switch back again, simply revert those two build properties to their original values.

0 commit comments

Comments
 (0)