Skip to content

Commit a773aa5

Browse files
jamescrosswelljamescrosswell
authored
Merge branch 'main' into net10_integration_tests
2 parents 241a908 + ac97aef commit a773aa5

File tree

67 files changed

+2896
-319
lines changed

Some content is hidden

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

67 files changed

+2896
-319
lines changed

‎.generated.NoMobile.sln‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integration-test", "integra
276276
EndProject
277277
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net4-console", "net4-console", "{33793113-C7B5-434D-B5C1-6CA1A9587842}"
278278
EndProject
279+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.ME.AI.Console", "samples\Sentry.Samples.ME.AI.Console\Sentry.Samples.ME.AI.Console.csproj", "{CE591593-E51C-498E-BC0D-5083C8197544}"
280+
EndProject
281+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.ME.AI.AspNetCore", "samples\Sentry.Samples.ME.AI.AspNetCore\Sentry.Samples.ME.AI.AspNetCore.csproj", "{3D91128A-5695-4BAE-B939-5F5F7C56A679}"
282+
EndProject
283+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Extensions.AI", "src\Sentry.Extensions.AI\Sentry.Extensions.AI.csproj", "{AE461926-00B8-4FDD-A41D-3C83C2D9A045}"
284+
EndProject
285+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Extensions.AI.Tests", "test\Sentry.Extensions.AI.Tests\Sentry.Extensions.AI.Tests.csproj", "{28D6E004-DC64-464F-91BE-BC0B3A8E543F}"
286+
EndProject
279287
Global
280288
GlobalSection(SolutionConfigurationPlatforms) = preSolution
281289
Debug|Any CPU = Debug|Any CPU
@@ -1295,6 +1303,54 @@ Global
12951303
{ADC91A84-6054-42EC-8241-0D717E4C7194}.Release|x64.Build.0 = Release|Any CPU
12961304
{ADC91A84-6054-42EC-8241-0D717E4C7194}.Release|x86.ActiveCfg = Release|Any CPU
12971305
{ADC91A84-6054-42EC-8241-0D717E4C7194}.Release|x86.Build.0 = Release|Any CPU
1306+
{CE591593-E51C-498E-BC0D-5083C8197544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1307+
{CE591593-E51C-498E-BC0D-5083C8197544}.Debug|Any CPU.Build.0 = Debug|Any CPU
1308+
{CE591593-E51C-498E-BC0D-5083C8197544}.Debug|x64.ActiveCfg = Debug|Any CPU
1309+
{CE591593-E51C-498E-BC0D-5083C8197544}.Debug|x64.Build.0 = Debug|Any CPU
1310+
{CE591593-E51C-498E-BC0D-5083C8197544}.Debug|x86.ActiveCfg = Debug|Any CPU
1311+
{CE591593-E51C-498E-BC0D-5083C8197544}.Debug|x86.Build.0 = Debug|Any CPU
1312+
{CE591593-E51C-498E-BC0D-5083C8197544}.Release|Any CPU.ActiveCfg = Release|Any CPU
1313+
{CE591593-E51C-498E-BC0D-5083C8197544}.Release|Any CPU.Build.0 = Release|Any CPU
1314+
{CE591593-E51C-498E-BC0D-5083C8197544}.Release|x64.ActiveCfg = Release|Any CPU
1315+
{CE591593-E51C-498E-BC0D-5083C8197544}.Release|x64.Build.0 = Release|Any CPU
1316+
{CE591593-E51C-498E-BC0D-5083C8197544}.Release|x86.ActiveCfg = Release|Any CPU
1317+
{CE591593-E51C-498E-BC0D-5083C8197544}.Release|x86.Build.0 = Release|Any CPU
1318+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1319+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Debug|Any CPU.Build.0 = Debug|Any CPU
1320+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Debug|x64.ActiveCfg = Debug|Any CPU
1321+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Debug|x64.Build.0 = Debug|Any CPU
1322+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Debug|x86.ActiveCfg = Debug|Any CPU
1323+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Debug|x86.Build.0 = Debug|Any CPU
1324+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Release|Any CPU.ActiveCfg = Release|Any CPU
1325+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Release|Any CPU.Build.0 = Release|Any CPU
1326+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Release|x64.ActiveCfg = Release|Any CPU
1327+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Release|x64.Build.0 = Release|Any CPU
1328+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Release|x86.ActiveCfg = Release|Any CPU
1329+
{3D91128A-5695-4BAE-B939-5F5F7C56A679}.Release|x86.Build.0 = Release|Any CPU
1330+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1331+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Debug|Any CPU.Build.0 = Debug|Any CPU
1332+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Debug|x64.ActiveCfg = Debug|Any CPU
1333+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Debug|x64.Build.0 = Debug|Any CPU
1334+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Debug|x86.ActiveCfg = Debug|Any CPU
1335+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Debug|x86.Build.0 = Debug|Any CPU
1336+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Release|Any CPU.ActiveCfg = Release|Any CPU
1337+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Release|Any CPU.Build.0 = Release|Any CPU
1338+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Release|x64.ActiveCfg = Release|Any CPU
1339+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Release|x64.Build.0 = Release|Any CPU
1340+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Release|x86.ActiveCfg = Release|Any CPU
1341+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045}.Release|x86.Build.0 = Release|Any CPU
1342+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1343+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Debug|Any CPU.Build.0 = Debug|Any CPU
1344+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Debug|x64.ActiveCfg = Debug|Any CPU
1345+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Debug|x64.Build.0 = Debug|Any CPU
1346+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Debug|x86.ActiveCfg = Debug|Any CPU
1347+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Debug|x86.Build.0 = Debug|Any CPU
1348+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Release|Any CPU.ActiveCfg = Release|Any CPU
1349+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Release|Any CPU.Build.0 = Release|Any CPU
1350+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Release|x64.ActiveCfg = Release|Any CPU
1351+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Release|x64.Build.0 = Release|Any CPU
1352+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Release|x86.ActiveCfg = Release|Any CPU
1353+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F}.Release|x86.Build.0 = Release|Any CPU
12981354
EndGlobalSection
12991355
GlobalSection(SolutionProperties) = preSolution
13001356
HideSolutionNode = FALSE
@@ -1391,5 +1447,9 @@ Global
13911447
{E34AA22F-B42E-4D4C-B96E-426AEBC2F367} = {5D50D425-244F-4B79-B9F5-21D26DD52DC1}
13921448
{94A2DCA5-F298-41FB-913A-476668EF5786} = {5D50D425-244F-4B79-B9F5-21D26DD52DC1}
13931449
{33793113-C7B5-434D-B5C1-6CA1A9587842} = {94CCDBEF-5867-4C24-A305-0C2AE738AF42}
1450+
{CE591593-E51C-498E-BC0D-5083C8197544} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
1451+
{3D91128A-5695-4BAE-B939-5F5F7C56A679} = {21B42F60-5802-404E-90F0-AEBCC56760C0}
1452+
{AE461926-00B8-4FDD-A41D-3C83C2D9A045} = {230B9384-90FD-4551-A5DE-1A5C197F25B6}
1453+
{28D6E004-DC64-464F-91BE-BC0B3A8E543F} = {6987A1CC-608E-4868-A02C-09D30C8B7B2D}
13941454
EndGlobalSection
13951455
EndGlobal

‎.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2727

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

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 7 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
51+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
5252

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

@@ -121,7 +121,7 @@ jobs:
121121
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
122122

123123
- name: Checkout
124-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
124+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
125125
with:
126126
submodules: recursive
127127
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -247,7 +247,7 @@ jobs:
247247
248248
- name: Sparse checkout
249249
if: env.CI_PUBLISHING_BUILD == 'true'
250-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
250+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
251251
with:
252252
# We only check out what is absolutely necessary to reduce a chance of local files impacting
253253
# integration tests (nuget.config etc.)... But we need the root Directory.Build.props calculate
@@ -289,7 +289,7 @@ jobs:
289289

290290
steps:
291291
- name: Checkout
292-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
292+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
293293
with:
294294
submodules: recursive
295295

@@ -347,7 +347,7 @@ jobs:
347347

348348
steps:
349349
- name: Checkout
350-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
350+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
351351
with:
352352
submodules: recursive
353353

@@ -377,7 +377,7 @@ jobs:
377377

378378
steps:
379379
- name: Checkout
380-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
380+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
381381
with:
382382
submodules: recursive
383383
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -416,7 +416,7 @@ jobs:
416416
if: ${{ !startsWith(github.ref_name, 'release/') }}
417417

418418
steps:
419-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
419+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
420420
with:
421421
submodules: recursive
422422

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
name: "CodeQL"
22

33
on:
4-
workflow_dispatch:
5-
# # Temporarily disabled. See https://github.com/getsentry/sentry-dotnet/issues/4736
6-
# push:
7-
# branches: [ main ]
8-
# pull_request:
9-
# # The branches below must be a subset of the branches above
10-
# branches: [ main ]
11-
# schedule:
12-
# - cron: '22 5 * * 1'
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [ main ]
9+
schedule:
10+
- cron: '22 5 * * 1'
1311

1412
jobs:
1513
analyze:
@@ -29,15 +27,15 @@ jobs:
2927
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
3028

3129
- name: Checkout repository
32-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
30+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3331
with:
3432
submodules: recursive
3533

3634
- name: Setup Environment
3735
uses: ./.github/actions/environment
3836

3937
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
38+
uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
4139
with:
4240
languages: csharp
4341

@@ -51,6 +49,6 @@ jobs:
5149
run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
5250

5351
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
52+
uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
5553
with:
5654
category: '/language:csharp'

‎.github/workflows/danger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
danger:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: getsentry/github-workflows/danger@v3
11+
- uses: getsentry/github-workflows/danger@13be9bec4ec5cd67061b747972b996e9c80f4f3b # 3.1.0

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

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

2929
- name: Checkout
30-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
30+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3131
with:
3232
submodules: recursive
3333

@@ -79,7 +79,7 @@ jobs:
7979
sudo udevadm trigger --name-match=kvm
8080
8181
- name: Checkout
82-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
82+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
8383
with:
8484
submodules: recursive
8585

@@ -126,7 +126,7 @@ jobs:
126126
java-version: '17'
127127

128128
- name: Checkout github-workflows
129-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
129+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
130130
with:
131131
repository: getsentry/github-workflows
132132
ref: a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2525

2626
- name: Checkout
27-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
27+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2828
with:
2929
submodules: recursive
3030

‎.github/workflows/format-code.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: macos-15
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
18+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
1919
with:
2020
submodules: recursive
2121

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
steps:
2121
- name: Get auth token
2222
id: token
23-
uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
23+
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
2424
with:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
2727
- name: Check out current commit (${{ github.sha }})
28-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2929
with:
3030
token: ${{ steps.token.outputs.token }}
3131
fetch-depth: 0

‎.github/workflows/update-deps.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
jobs:
1111
deps:
1212
name: ${{ matrix.name }}
13+
runs-on: ubuntu-latest
1314
strategy:
1415
fail-fast: false
1516
matrix:
@@ -22,10 +23,9 @@ jobs:
2223
path: modules/sentry-native
2324
- name: CLI
2425
path: scripts/update-cli.ps1
25-
uses: getsentry/github-workflows/.github/workflows/updater.yml@1949ea01ec2da6139d1bcc306c372e6aea76fb72 # v2.13.1
26-
with:
27-
name: ${{ matrix.name }}
28-
path: ${{ matrix.path }}
29-
pr-strategy: update
30-
secrets:
31-
api-token: ${{ secrets.CI_DEPLOY_KEY }}
26+
steps:
27+
- uses: getsentry/github-workflows/updater@13be9bec4ec5cd67061b747972b996e9c80f4f3b # v3.1.0
28+
with:
29+
name: ${{ matrix.name }}
30+
path: ${{ matrix.path }}
31+
ssh-key: ${{ secrets.CI_DEPLOY_KEY }}

0 commit comments

Comments
 (0)