Skip to content

Commit 0db3060

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Improve triage actions on issues devlooped/oss@33000c0 - Ignore sponsorlink sources in formatting devlooped/oss@f571a42 - Update to checkout@v4 devlooped/oss@5fb1723 - If we provide a docs category, don't exclude docs :) devlooped/oss@0c23e24 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d - Set explicit tab size and eol for code files devlooped/oss@5dba0d0 - Revert EOL change in editorconfig for C# files devlooped/oss@2d0e5a5
1 parent 7e21e4f commit 0db3060

21 files changed

Lines changed: 424 additions & 212 deletions

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ indent_size = 2
3030

3131
# Dotnet code style settings:
3232
[*.{cs,vb}]
33+
tab_width = 4
34+
3335
# Sort using and Import directives with System.* appearing first
3436
dotnet_sort_system_directives_first = true
3537
# Avoid "this." and "Me." if not necessary
@@ -57,6 +59,9 @@ dotnet_style_require_accessibility_modifiers = omit_if_default:error
5759
# IDE0040: Add accessibility modifiers
5860
dotnet_diagnostic.IDE0040.severity = error
5961

62+
# IDE1100: Error reading content of source file 'Project.TargetFrameworkMoniker' (i.e. from ThisAssembly)
63+
dotnet_diagnostic.IDE1100.severity = none
64+
6065
[*.cs]
6166
# Top-level files are definitely OK
6267
csharp_using_directive_placement = outside_namespace:silent

.gitattributes

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
1-
# sln, csproj files (and friends) are always CRLF, even on linux
2-
*.sln text eol=crlf
3-
*.proj text eol=crlf
4-
*.csproj text eol=crlf
1+
# normalize by default
2+
* text=auto encoding=UTF-8
3+
*.sh text eol=lf
4+
*.sbn eol=lf
55

66
# These are windows specific files which we may as well ensure are
77
# always crlf on checkout
88
*.bat text eol=crlf
99
*.cmd text eol=crlf
10-
11-
# Opt in known filetypes to always normalize line endings on checkin
12-
# and always use native endings on checkout
13-
*.c text
14-
*.config text
15-
*.h text
16-
*.cs text
17-
*.md text
18-
*.tt text
19-
*.txt text
20-
21-
# Some must always be checked out as lf so enforce that for those files
22-
# If these are not lf then bash/cygwin on windows will not be able to
23-
# excute the files
24-
*.sh text eol=lf

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ updates:
2424
Extensions:
2525
patterns:
2626
- "Microsoft.Extensions*"
27+
exclude-patterns:
28+
- "Microsoft.Extensions.AI*"
29+
ExtensionsAI:
30+
patterns:
31+
- "Microsoft.Extensions.AI*"
2732
Web:
2833
patterns:
2934
- "Microsoft.AspNetCore*"
@@ -38,3 +43,6 @@ updates:
3843
ProtoBuf:
3944
patterns:
4045
- "protobuf-*"
46+
Spectre:
47+
patterns:
48+
- "Spectre.Console*"

.github/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ changelog:
88
- invalid
99
- wontfix
1010
- need info
11-
- docs
1211
- techdebt
1312
authors:
1413
- devlooped-bot
@@ -24,6 +23,7 @@ changelog:
2423
- title: 📝 Documentation updates
2524
labels:
2625
- docs
26+
- documentation
2727
- title: 🔨 Other
2828
labels:
2929
- '*'

.github/workflows/build.yml

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,32 @@
44
name: build
55
on:
66
workflow_dispatch:
7+
inputs:
8+
configuration:
9+
type: choice
10+
description: Configuration
11+
options:
12+
- Release
13+
- Debug
714
push:
8-
branches: [ main, dev, 'dev/*', 'feature/*', 'rel/*' ]
15+
branches: [ main, 'feature/*', 'rel/*' ]
916
paths-ignore:
1017
- changelog.md
11-
- code-of-conduct.md
12-
- security.md
13-
- support.md
1418
- readme.md
1519
pull_request:
1620
types: [opened, synchronize, reopened]
1721

1822
env:
1923
DOTNET_NOLOGO: true
20-
VersionPrefix: 42.42.${{ github.run_number }}
21-
VersionLabel: ${{ github.ref }}
2224
PackOnBuild: true
2325
GeneratePackageOnBuild: true
24-
26+
VersionPrefix: 42.42.${{ github.run_number }}
27+
VersionLabel: ${{ github.ref }}
28+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
29+
MSBUILDTERMINALLOGGER: auto
30+
Configuration: ${{ github.event.inputs.configuration || 'Release' }}
31+
SLEET_FEED_URL: ${{ vars.SLEET_FEED_URL }}
32+
2533
defaults:
2634
run:
2735
shell: bash
@@ -33,7 +41,7 @@ jobs:
3341
matrix: ${{ steps.lookup.outputs.matrix }}
3442
steps:
3543
- name: 🤘 checkout
36-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
3745

3846
- name: 🔎 lookup
3947
id: lookup
@@ -52,41 +60,48 @@ jobs:
5260
os: ${{ fromJSON(needs.os-matrix.outputs.matrix) }}
5361
steps:
5462
- name: 🤘 checkout
55-
uses: actions/checkout@v2
63+
uses: actions/checkout@v4
5664
with:
5765
submodules: recursive
5866
fetch-depth: 0
5967

60-
- name: 🙏 build
61-
run: dotnet build -m:1
68+
- name: ⚙ dotnet
69+
uses: devlooped/actions-dotnet-env@v1
6270

63-
- name: ⚙ GNU grep
64-
if: matrix.os == 'macOS-latest'
65-
run: |
66-
brew install grep
67-
echo 'export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"' >> .bash_profile
71+
- name: 🙏 build
72+
run: dotnet build -m:1 -bl:build.binlog
6873

6974
- name: 🧪 test
70-
uses: ./.github/workflows/test
75+
shell: pwsh
76+
run: dnx --yes retest -- --no-build
77+
78+
- name: 🐛 logs
79+
uses: actions/upload-artifact@v4
80+
if: runner.debug && always()
81+
with:
82+
name: logs
83+
path: '*.binlog'
7184

72-
# Only push CI package to sleet feed if building on ubuntu (fastest)
7385
- name: 🚀 sleet
7486
env:
7587
SLEET_CONNECTION: ${{ secrets.SLEET_CONNECTION }}
7688
if: env.SLEET_CONNECTION != ''
7789
run: |
78-
dotnet tool install -g --version 4.0.18 sleet
90+
dotnet tool update sleet -g --allow-downgrade --version $(curl -s --compressed ${{ vars.SLEET_FEED_URL }} | jq '.["sleet:version"]' -r)
7991
sleet push bin --config none -f --verbose -p "SLEET_FEED_CONTAINER=nuget" -p "SLEET_FEED_CONNECTIONSTRING=${{ secrets.SLEET_CONNECTION }}" -p "SLEET_FEED_TYPE=azure" || echo "No packages found"
8092
8193
dotnet-format:
8294
runs-on: ubuntu-latest
8395
steps:
8496
- name: 🤘 checkout
85-
uses: actions/checkout@v2
97+
uses: actions/checkout@v4
8698
with:
8799
submodules: recursive
88100
fetch-depth: 0
89101

102+
- name: ⚙ dotnet
103+
uses: devlooped/actions-dotnet-env@v1
104+
90105
- name: ✓ ensure format
91106
run: |
92107
dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget

.github/workflows/changelog.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
usernames-as-github-logins=true
22
issues_wo_labels=true
33
pr_wo_labels=true
4-
exclude-labels=bydesign,dependencies,duplicate,question,invalid,wontfix,need info,docs
4+
exclude-labels=bydesign,dependencies,duplicate,discussion,question,invalid,wontfix,need info,docs
55
enhancement-label=:sparkles: Implemented enhancements:
66
bugs-label=:bug: Fixed bugs:
77
issues-label=:hammer: Other:

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
github_token: ${{ secrets.GITHUB_TOKEN }}
1818

1919
- name: 🤘 checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323
ref: main

.github/workflows/dotnet-env.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: dotnet-env
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- '**/*.*proj'
9+
10+
jobs:
11+
which-dotnet:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write
15+
pull-requests: write
16+
17+
steps:
18+
- name: 🤖 defaults
19+
uses: devlooped/actions-bot@v1
20+
with:
21+
name: ${{ secrets.BOT_NAME }}
22+
email: ${{ secrets.BOT_EMAIL }}
23+
gh_token: ${{ secrets.GH_TOKEN }}
24+
github_token: ${{ secrets.GITHUB_TOKEN }}
25+
26+
- name: 🤘 checkout
27+
uses: actions/checkout@v4
28+
with:
29+
token: ${{ env.GH_TOKEN }}
30+
31+
- name: 🤌 dotnet
32+
uses: devlooped/actions-which-dotnet@v1
33+
34+
- name: ✍ pull request
35+
uses: peter-evans/create-pull-request@v7
36+
with:
37+
base: main
38+
branch: which-dotnet
39+
delete-branch: true
40+
labels: dependencies
41+
title: "⚙ Update dotnet versions"
42+
body: "Update dotnet versions"
43+
commit-message: "Update dotnet versions"
44+
token: ${{ env.GH_TOKEN }}

.github/workflows/dotnet-file.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ env:
1212

1313
jobs:
1414
run:
15+
permissions:
16+
contents: write
1517
uses: devlooped/oss/.github/workflows/dotnet-file-core.yml@main
16-
secrets: inherit
18+
secrets:
19+
BOT_NAME: ${{ secrets.BOT_NAME }}
20+
BOT_EMAIL: ${{ secrets.BOT_EMAIL }}
21+
GH_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/includes.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ on:
55
branches:
66
- 'main'
77
paths:
8-
- '**.md'
8+
- '**.md'
99
- '!changelog.md'
10+
- 'osmfeula.txt'
1011

1112
jobs:
1213
includes:
1314
runs-on: ubuntu-latest
15+
permissions:
16+
contents: write
17+
pull-requests: write
1418
steps:
1519
- name: 🤖 defaults
1620
uses: devlooped/actions-bot@v1
@@ -21,20 +25,40 @@ jobs:
2125
github_token: ${{ secrets.GITHUB_TOKEN }}
2226

2327
- name: 🤘 checkout
24-
uses: actions/checkout@v2
28+
uses: actions/checkout@v4
2529
with:
2630
token: ${{ env.GH_TOKEN }}
2731

2832
- name: +Mᐁ includes
2933
uses: devlooped/actions-includes@v1
3034

35+
- name: 📝 OSMF EULA
36+
shell: pwsh
37+
run: |
38+
$file = "osmfeula.txt"
39+
$props = "src/Directory.Build.props"
40+
if (-not (test-path $file) -or -not (test-path $props)) {
41+
exit 0
42+
}
43+
44+
$product = dotnet msbuild $props -getproperty:Product
45+
if (-not $product) {
46+
write-error 'To use OSMF EULA, ensure the $(Product) property is set in Directory.props'
47+
exit 1
48+
}
49+
50+
((get-content -raw $file) -replace '\$product\$',$product).trim() | set-content $file
51+
3152
- name: ✍ pull request
32-
uses: peter-evans/create-pull-request@v4
53+
uses: peter-evans/create-pull-request@v8
3354
with:
55+
add-paths: |
56+
**.md
57+
*.txt
3458
base: main
3559
branch: markdown-includes
3660
delete-branch: true
37-
labels: docs
61+
labels: dependencies
3862
author: ${{ env.BOT_AUTHOR }}
3963
committer: ${{ env.BOT_AUTHOR }}
4064
commit-message: +Mᐁ includes

0 commit comments

Comments
 (0)