Skip to content

Commit 5e3031c

Browse files
committed
Merge branch 'main' of github.com:getsentry/sentry-dotnet into release/2.1.8
2 parents 08059fd + 1e769e1 commit 5e3031c

File tree

403 files changed

+11592
-4442
lines changed

Some content is hidden

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

403 files changed

+11592
-4442
lines changed

.appveyor.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ environment:
44
global:
55
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "1" # Used by the dotnet SDK prior to v3.0
66
DOTNET_CLI_TELEMETRY_OPTOUT: "1"
7-
ZEUS_HOOK_BASE:
8-
secure: dcqtt6sxxBV0tDkXmPZOy0iOx17uW6ZfrPOivyLDzHaS9JeWUES653Lly9ZHQm7qZn1qbs4hL4BYaNSrhD5kraY9FXBkwtNmUC9eAxL/n8QtRFJu5uXrkSpewn+UAqbghVXAKCxOhD9WJYG72g+QcqmEBTZiO1RxRJhwsLBR5YY=
7+
PREVIEW_DOTNET: "5.0.100"
98
branches:
109
only:
1110
- main
1211
- /^release\/.*$/
12+
1313
install:
14-
# Push job information to Zeus
15-
- npm install -g @zeus-ci/cli
16-
- bash scripts\zeus.sh report_pending
14+
- ps: New-Item -Path '.tmp' -ItemType Directory
15+
- ps: "[Net.ServicePointManager]::SecurityProtocol = 'Tls12'"
16+
- ps: Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -OutFile .tmp\dotnet-install.ps1
17+
- ps: if ((-Not (Test-Path .tmp\dotnet\dotnet.exe)) -or (((.tmp\dotnet\dotnet.exe --version) -Join '') -ne $Env:PREVIEW_DOTNET)) { .tmp\dotnet-install.ps1 -Version $Env:PREVIEW_DOTNET -InstallDir .tmp\dotnet } else { $Env:path = $Env:APPVEYOR_BUILD_FOLDER + "\.tmp\dotnet\dotnet.exe;" + $Env:path }
1718
test: off
1819
build_script:
1920
- ps: ./build.ps1
@@ -23,14 +24,5 @@ dotnet_csproj:
2324
version: "{version}"
2425
package_version: "{version}"
2526
artifacts:
26-
- path: '**\*.nupkg'
27-
on_success:
28-
- ps: |
29-
$env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
30-
Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
31-
bash codecov.sh -f "**\coverage.xml"
32-
33-
# Upload *.nupkg files to Zeus
34-
bash scripts/zeus.sh upload_artifacts
35-
on_failure:
36-
- bash scripts\zeus.sh report_failed
27+
- path: 'src\**\Release\*.nupkg'
28+
- path: 'src\**\Release\*.snupkg'

.codecov.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ coverage:
22
status:
33
patch: false
44
changes: false
5+
ignore:
6+
- "test/**/*"

.craft.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
minVersion: '0.13.2'
12
github:
23
owner: getsentry
34
repo: sentry-dotnet
5+
changelogPolicy: simple
6+
statusProvider:
7+
name: github
8+
artifactProvider:
9+
name: github
410
targets:
511
- name: nuget
612
- name: github
@@ -16,6 +22,14 @@ targets:
1622
type: sdk
1723
config:
1824
canonical: "nuget:Sentry.AspNetCore"
25+
- name: registry
26+
type: sdk
27+
config:
28+
canonical: "nuget:Sentry.AspNetCore.Grpc"
29+
- name: registry
30+
type: sdk
31+
config:
32+
canonical: "nuget:Sentry.AspNet"
1933
- name: registry
2034
type: sdk
2135
config:

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
*.cs text=auto diff=csharp
1+
*.cs text=auto diff=csharp
22
*.csproj text=auto
33
*.sln text=auto eol=crlf
44
*.sh eol=lf
5+
CHANGELOG.md merge=union

.github/release-drafter.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/build.yaml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- release/*
8+
pull_request:
9+
10+
jobs:
11+
build:
12+
name: ${{ matrix.os }}
13+
runs-on: ${{ matrix.os }}
14+
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
os: [ubuntu-latest, windows-latest, macos-latest]
19+
include:
20+
- os: windows-latest
21+
build_script: .\build.ps1
22+
- os: ubuntu-latest
23+
build_script: ./build.sh
24+
- os: macos-latest
25+
build_script: ./build.sh
26+
27+
steps:
28+
- name: Checkout
29+
uses: actions/[email protected]
30+
31+
- name: Setup .NET SDK (v2.1)
32+
uses: actions/[email protected]
33+
with:
34+
dotnet-version: '2.1.809'
35+
36+
- name: Setup .NET SDK (v3.1)
37+
uses: actions/[email protected]
38+
with:
39+
dotnet-version: '3.1.401'
40+
41+
- name: Setup .NET SDK (v5.0)
42+
uses: actions/[email protected]
43+
with:
44+
dotnet-version: '5.0.100'
45+
46+
- name: Run build script
47+
run: ${{ matrix.build_script }}
48+
49+
- name: Publish coverage report
50+
uses: codecov/codecov-action@v1
51+
52+
- name: Archive Artifacts
53+
uses: actions/upload-artifact@v2
54+
with:
55+
name: ${{ github.sha }}
56+
path: |
57+
${{ github.workspace }}/src/**/Release/*.snupkg
58+
${{ github.workspace }}/src/**/Release/*.nupkg

.github/workflows/changelog.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: changelog
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
check:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v2
12+
with:
13+
fetch-depth: 0
14+
15+
- name: Ensure Changelog.md was modified
16+
shell: pwsh
17+
run: |
18+
$merge_base = git merge-base HEAD origin/${{ github.base_ref }}
19+
$changes = git --no-pager diff --name-only HEAD $merge_base
20+
21+
echo 'Changed files:'
22+
echo $changes
23+
24+
$contains_changelog = $changes -split '\n' -contains 'CHANGELOG.md'
25+
26+
if (-not $contains_changelog) {
27+
echo '::error::Changelog has not been modified!'
28+
exit 1
29+
}
30+
31+
exit 0

.github/workflows/docs.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: API Docs
2+
3+
on:
4+
create:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
docs:
10+
name: DocFX
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v1
14+
- uses: nikeee/[email protected]
15+
name: Build Documentation
16+
with:
17+
args: docs/docfx.json
18+
- uses: peaceiris/actions-gh-pages@v3
19+
name: Publish to GitHub Pages
20+
with:
21+
github_token: ${{ secrets.GITHUB_TOKEN }}
22+
publish_dir: docs/_site
23+
force_orphan: true
24+
- name: Archive Docs
25+
uses: actions/upload-artifact@v2
26+
with:
27+
name: docs
28+
path: docs/_site
29+

.travis.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,11 @@ matrix:
1919
script:
2020
- curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 2.1.507
2121
- curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 3.1.200
22+
- curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 5.0.100
2223
- export PATH=$PATH:~/.dotnet
2324
- dotnet --info
2425
- ./build.sh
2526
after_success:
2627
- curl -s https://codecov.io/bash > codecov
2728
- chmod +x codecov
2829
- ./codecov -f "*opencover.xml"
29-
notifications:
30-
webhooks:
31-
urls:
32-
- https://zeus.ci/hooks/b6bbaf86-c598-11e8-aa19-0a580a280112/public/provider/travis/webhook
33-
on_success: always
34-
on_failure: always
35-
on_start: always
36-
on_cancel: always
37-
on_error: always

0 commit comments

Comments
 (0)