Skip to content

Commit 18d88eb

Browse files
jpnurmijpnurmi
committed
Merge remote-tracking branch 'upstream/main' into net10_integration_tests
2 parents ed8b558 + c8dd656 commit 18d88eb

File tree

108 files changed

+1421
-1344
lines changed

Some content is hidden

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

108 files changed

+1421
-1344
lines changed

‎.craft.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ targets:
1212
nuget:Sentry.AspNet:
1313
nuget:Sentry.DiagnosticSource:
1414
nuget:Sentry.EntityFramework:
15+
nuget:Sentry.Extensions.AI:
1516
nuget:Sentry.Extensions.Logging:
1617
nuget:Sentry.Google.Cloud.Functions:
18+
nuget:Sentry.Hangfire:
1719
nuget:Sentry.Log4Net:
1820
nuget:Sentry.Maui:
1921
nuget:Sentry.NLog:

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ body:
1515
- Sentry.AspNet
1616
- Sentry.DiagnosticSource
1717
- Sentry.EntityFramework
18+
- Sentry.Extensions.AI
1819
- Sentry.Extensions.Logging
1920
- Sentry.Google.Cloud.Functions
2021
- Sentry.Hangfire
@@ -48,7 +49,7 @@ body:
4849
attributes:
4950
label: .NET Version
5051
description: If using .NET Core, please copy the output of 'dotnet --version' here
51-
placeholder: 9.0.200 ← should look like this
52+
placeholder: 10.0.100 ← should look like this
5253
validations:
5354
required: true
5455

@@ -81,11 +82,13 @@ body:
8182
label: Development Environment
8283
description: What development environment are you using
8384
options:
84-
- Visual Studio v17.x
85+
- Visual Studio v18.x
8586
- Visual Studio Code (Windows)
86-
- Visual Studio Code (MacOS)
87-
- Rider 2024 (Windows)
88-
- Rider 2024 (MacOS)
87+
- Visual Studio Code (macOS)
88+
- Visual Studio Code (Linux)
89+
- Rider 2025.x (Windows)
90+
- Rider 2025.x (macOS)
91+
- Rider 2025.x (Linux)
8992
- Other
9093
validations:
9194
required: true

‎.github/actions/freediskspace/action.yml‎

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,44 @@ runs:
1515
docker-images: true
1616
swap-storage: true
1717

18-
# TODO: Do we need all of these or just one?
19-
# 514M /usr/lib/llvm-15
20-
# 486M /usr/lib/llvm-14
21-
# 448M /usr/lib/llvm-13
2218
- name: Remove unused applications
2319
if: runner.os == 'Linux'
2420
shell: bash
2521
run: |
26-
df -h /dev/root
27-
sudo rm -rf /usr/local/.ghcup
28-
sudo rm -rf /usr/local/julia1.10.5
29-
sudo rm -rf /usr/lib/heroku
30-
sudo rm -rf /opt/hostedtoolcache/go
31-
sudo rm -rf /opt/hostedtoolcache/Ruby
22+
echo "Disk usage before cleanup:"
23+
df -h /dev/root 2>/dev/null || df -h
24+
25+
# Remove language runtimes and tools
26+
sudo rm -rf /usr/local/.ghcup || echo "::warning::Failed to remove .ghcup"
27+
sudo rm -rf /usr/local/julia1.10.5 || echo "::warning::Failed to remove Julia"
28+
sudo rm -rf /usr/lib/heroku || echo "::warning::Failed to remove Heroku"
29+
sudo rm -rf /opt/hostedtoolcache/go || echo "::warning::Failed to remove Go"
30+
sudo rm -rf /opt/hostedtoolcache/Ruby || echo "::warning::Failed to remove Ruby"
31+
32+
# Remove multiple LLVM versions
33+
sudo rm -rf /usr/lib/llvm-13 || echo "::warning::Failed to remove LLVM 13"
34+
sudo rm -rf /usr/lib/llvm-14 || echo "::warning::Failed to remove LLVM 14"
35+
sudo rm -rf /usr/lib/llvm-15 || echo "::warning::Failed to remove LLVM 15"
36+
37+
# Remove Azure CLI
38+
sudo rm -rf /opt/az || echo "::warning::Failed to remove Azure CLI"
39+
40+
# Remove unnecessary .NET SDKs (keep only what we need)
41+
sudo rm -rf /usr/share/dotnet/sdk/6.* || echo "::warning::Failed to remove .NET SDK 6.x"
42+
sudo rm -rf /usr/share/dotnet/sdk/7.* || echo "::warning::Failed to remove .NET SDK 7.x"
43+
44+
# Remove other large tools
45+
sudo rm -rf /opt/hostedtoolcache/CodeQL || echo "::warning::Failed to remove CodeQL"
46+
sudo rm -rf /usr/local/share/chromium || echo "::warning::Failed to remove Chromium"
47+
sudo rm -rf /usr/local/share/chrome_driver || echo "::warning::Failed to remove Chrome Driver"
48+
sudo rm -rf /usr/local/share/gecko_driver || echo "::warning::Failed to remove Gecko Driver"
49+
50+
# Clean up apt packages
3251
sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed to complete successfully. Proceeding..."
52+
sudo apt-get remove -y '^postgresql-.*' --fix-missing || echo "::warning::PostgreSQL removal failed"
53+
sudo apt-get remove -y '^mongodb-.*' --fix-missing || echo "::warning::MongoDB removal failed"
3354
sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed to complete successfully. Proceeding..."
3455
sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
35-
df -h /dev/root
56+
57+
echo "Disk usage after cleanup:"
58+
df -h /dev/root 2>/dev/null || df -h

‎.github/workflows/alpine.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
packages: write
2424

2525
steps:
26-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
26+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2727

2828
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2929
with:

‎.github/workflows/build.yml‎

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
curl -sSL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/.github/alpine/setup-node.sh | sudo bash /dev/stdin
4949
5050
- name: Checkout
51-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
51+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5252

5353
- run: git submodule update --init modules/sentry-native
5454

@@ -58,7 +58,7 @@ jobs:
5858
uses: ./.github/actions/install-zstd
5959

6060
- id: cache
61-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
61+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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') }}
@@ -121,7 +121,7 @@ jobs:
121121
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
122122

123123
- name: Checkout
124-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
124+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
125125
with:
126126
submodules: recursive
127127
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
143+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
151+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
159+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
167+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
175+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
183+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
192+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
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') }}
@@ -209,25 +209,40 @@ jobs:
209209

210210
- name: Upload build logs
211211
if: ${{ always() }}
212-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
212+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
213213
with:
214214
name: ${{ matrix.rid }}-build-logs
215215
path: |
216216
build.log
217217
build.binlog
218218
if-no-files-found: ignore
219219

220+
- name: Free disk space before tests
221+
if: ${{ contains(matrix.container.image, 'alpine') }}
222+
run: |
223+
echo "Disk usage before cleanup:"
224+
df -h
225+
226+
# Remove build binlog (can be large, often 100MB+)
227+
rm -f build.binlog || true
228+
229+
# Clean up NuGet HTTP cache (not the packages cache which is needed for pack)
230+
dotnet nuget locals http-cache --clear || true
231+
232+
echo "Disk usage after cleanup:"
233+
df -h
234+
220235
- name: Test
221236
run: dotnet test ${{ matrix.slnf }} -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}" --collect "XPlat Code Coverage"
222237

223238
- name: Upload code coverage
224-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
239+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
225240
with:
226241
token: ${{ secrets.CODECOV_TOKEN }}
227242

228243
- name: Upload build and test outputs
229244
if: failure()
230-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
245+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
231246
with:
232247
name: ${{ matrix.rid }}-verify-test-results
233248
path: "**/*.received.*"
@@ -237,7 +252,7 @@ jobs:
237252

238253
- name: Archive NuGet Packages
239254
if: env.CI_PUBLISHING_BUILD == 'true'
240-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
255+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
241256
with:
242257
name: ${{ github.sha }}
243258
if-no-files-found: error
@@ -247,7 +262,7 @@ jobs:
247262
248263
- name: Sparse checkout
249264
if: env.CI_PUBLISHING_BUILD == 'true'
250-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
265+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
251266
with:
252267
# We only check out what is absolutely necessary to reduce a chance of local files impacting
253268
# integration tests (nuget.config etc.)... But we need the root Directory.Build.props calculate
@@ -265,8 +280,10 @@ jobs:
265280
path: src
266281

267282
- name: Integration test
268-
# # Note that when upgsading .NET versions, linux-musl may need special handling... see comments below
283+
# # Note that when upgrading .NET versions, linux-musl may need special handling... see comments below
269284
# if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
285+
# TODO: Re-enable once we have resolved https://github.com/getsentry/sentry-dotnet/issues/4788
286+
if: ${{ (matrix.rid != 'linux-musl-x64') }}
270287
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
271288
with:
272289
path: integration-test
@@ -289,12 +306,12 @@ jobs:
289306

290307
steps:
291308
- name: Checkout
292-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
309+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
293310
with:
294311
submodules: recursive
295312

296313
- name: Download sentry-native (win-x64)
297-
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
314+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
298315
with:
299316
path: src/Sentry/Platforms/Native/sentry-native
300317
key: sentry-native-win-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -321,7 +338,7 @@ jobs:
321338

322339
- name: Upload logs
323340
if: ${{ always() }}
324-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
341+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
325342
with:
326343
name: ${{ runner.os }}-msbuild-logs
327344
path: |
@@ -347,7 +364,7 @@ jobs:
347364

348365
steps:
349366
- name: Checkout
350-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
367+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
351368
with:
352369
submodules: recursive
353370

@@ -377,7 +394,7 @@ jobs:
377394

378395
steps:
379396
- name: Checkout
380-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
397+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
381398
with:
382399
submodules: recursive
383400
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -387,7 +404,7 @@ jobs:
387404
run: echo "CI_PUBLISHING_BUILD=true" >> $GITHUB_ENV
388405

389406
- name: Download sentry-native (macos)
390-
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
407+
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
391408
with:
392409
path: src/Sentry/Platforms/Native/sentry-native
393410
key: sentry-native-macos-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -416,7 +433,7 @@ jobs:
416433
if: ${{ !startsWith(github.ref_name, 'release/') }}
417434

418435
steps:
419-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
436+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
420437
with:
421438
submodules: recursive
422439

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2828

2929
- name: Checkout repository
30-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
30+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3131
with:
3232
submodules: recursive
3333

3434
- name: Setup Environment
3535
uses: ./.github/actions/environment
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
38+
uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
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@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
52+
uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
5353
with:
5454
category: '/language:csharp'

0 commit comments

Comments
 (0)