Skip to content

Commit 194f4f6

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Make sure the feed url is available to msbuild devlooped/oss@931da83 - Publish builds should point to nuget.org not CI feed devlooped/oss@db918f0 - Move dotnet setup to composite action devlooped/oss@08c7077 - Switch to dotnet-env for .NET SDK setup devlooped/oss@56c2b85 - Switch to dnx retest shorthand devlooped/oss@fddfd89 - Ensure quiet confirmation of tool download/install devlooped/oss@e11b002 - Ensure dnx run succeeds even on Windows devlooped/oss@7f5f9ee - Support using current Version from CVM devlooped/oss@2fff747
1 parent 0056da4 commit 194f4f6

15 files changed

Lines changed: 553 additions & 151 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# normalize by default
22
* text=auto encoding=UTF-8
33
*.sh text eol=lf
4+
*.sbn eol=lf
45

56
# These are windows specific files which we may as well ensure are
67
# always crlf on checkout

‎.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/workflows/build.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- Release
1313
- Debug
1414
push:
15-
branches: [ main, dev, 'dev/*', 'feature/*', 'rel/*' ]
15+
branches: [ main, 'feature/*', 'rel/*' ]
1616
paths-ignore:
1717
- changelog.md
1818
- readme.md
@@ -28,6 +28,7 @@ env:
2828
GH_TOKEN: ${{ secrets.GH_TOKEN }}
2929
MSBUILDTERMINALLOGGER: auto
3030
Configuration: ${{ github.event.inputs.configuration || 'Release' }}
31+
SLEET_FEED_URL: ${{ vars.SLEET_FEED_URL }}
3132

3233
defaults:
3334
run:
@@ -65,20 +66,14 @@ jobs:
6566
fetch-depth: 0
6667

6768
- name: ⚙ dotnet
68-
uses: actions/setup-dotnet@v4
69-
with:
70-
dotnet-version: |
71-
6.x
72-
8.x
73-
9.x
69+
uses: devlooped/actions-dotnet-env@v1
7470

7571
- name: 🙏 build
7672
run: dotnet build -m:1 -bl:build.binlog
7773

7874
- name: 🧪 test
79-
run: |
80-
dotnet tool update -g dotnet-retest
81-
dotnet retest -- --no-build
75+
shell: pwsh
76+
run: dnx --yes retest -- --no-build
8277

8378
- name: 🐛 logs
8479
uses: actions/upload-artifact@v4
@@ -104,6 +99,9 @@ jobs:
10499
submodules: recursive
105100
fetch-depth: 0
106101

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

‎.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: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ on:
55
branches:
66
- 'main'
77
paths:
8-
- '**.md'
8+
- '**.md'
99
- '!changelog.md'
10+
- 'osmfeula.txt'
1011

1112
jobs:
1213
includes:
@@ -31,14 +32,33 @@ jobs:
3132
- name: +Mᐁ includes
3233
uses: devlooped/actions-includes@v1
3334

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+
3452
- name: ✍ pull request
35-
uses: peter-evans/create-pull-request@v6
53+
uses: peter-evans/create-pull-request@v8
3654
with:
37-
add-paths: '**.md'
55+
add-paths: |
56+
**.md
57+
*.txt
3858
base: main
3959
branch: markdown-includes
4060
delete-branch: true
41-
labels: docs
61+
labels: dependencies
4262
author: ${{ env.BOT_AUTHOR }}
4363
committer: ${{ env.BOT_AUTHOR }}
4464
commit-message: +Mᐁ includes

‎.github/workflows/publish.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ env:
1515
VersionLabel: ${{ github.ref }}
1616
GH_TOKEN: ${{ secrets.GH_TOKEN }}
1717
MSBUILDTERMINALLOGGER: auto
18-
18+
SLEET_FEED_URL: https://api.nuget.org/v3/index.json
19+
1920
jobs:
2021
publish:
2122
runs-on: ${{ vars.PUBLISH_AGENT || 'ubuntu-latest' }}
@@ -27,20 +28,14 @@ jobs:
2728
fetch-depth: 0
2829

2930
- name: ⚙ dotnet
30-
uses: actions/setup-dotnet@v4
31-
with:
32-
dotnet-version: |
33-
6.x
34-
8.x
35-
9.x
31+
uses: devlooped/actions-dotnet-env@v1
3632

3733
- name: 🙏 build
3834
run: dotnet build -m:1 -bl:build.binlog
3935

4036
- name: 🧪 test
41-
run: |
42-
dotnet tool update -g dotnet-retest
43-
dotnet retest -- --no-build
37+
shell: pwsh
38+
run: dnx --yes retest -- --no-build
4439

4540
- name: 🐛 logs
4641
uses: actions/upload-artifact@v4

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ BenchmarkDotNet.Artifacts
1111
.genaiscript
1212
.idea
1313
local.settings.json
14+
.env
15+
*.local
1416

1517
*.suo
1618
*.sdf

‎.netconfig‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@
2727
skip
2828
[file ".editorconfig"]
2929
url = https://github.com/devlooped/oss/blob/main/.editorconfig
30-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
31-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
30+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
31+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
3232
weak
3333
[file ".gitattributes"]
3434
url = https://github.com/devlooped/oss/blob/main/.gitattributes
35-
sha = 5f92a68e302bae675b394ef343114139c075993e
36-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
35+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
36+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
3737
weak
3838
[file ".github/FUNDING.yml"]
3939
url = https://github.com/devlooped/.github/blob/main/.github/FUNDING.yml
4040
skip
4141
[file ".github/dependabot.yml"]
4242
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
43-
sha = 49661dbf0720cde93eb5569be7523b5912351560
44-
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
43+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
44+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
4545
weak
4646
[file ".github/workflows/build.yml"]
4747
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
48-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
49-
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
48+
sha = 5da103cfbc1c4f9b5f59cfa698d2afbd744a7525
49+
etag = 851af098748f7cfa5bc3cfd4cc404a6de930532b59ceb2b3b535282c41226f3a
5050
weak
5151
[file ".github/workflows/changelog.yml"]
5252
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -55,18 +55,18 @@
5555
weak
5656
[file ".github/workflows/dotnet-file.yml"]
5757
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
58-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
59-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
58+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
59+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
6060
weak
6161
[file ".github/workflows/publish.yml"]
6262
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
63-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
64-
etag = 2f64f75ad01f735fd05290370fb8a826111ac8dd7e74ce04226bb627a54a62ba
63+
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
64+
etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025
6565
weak
6666
[file ".gitignore"]
6767
url = https://github.com/devlooped/oss/blob/main/.gitignore
68-
sha = e0be248fff1d39133345283b8227372b36574b75
69-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
68+
sha = a225b7a9f609f26bcc24e0d84f663387be251a7d
69+
etag = 20a8b49d57024abbd85aac5b0020c30e5eb68e0384b2761e93727c8780c4a991
7070
weak
7171
[file "Directory.Build.rsp"]
7272
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -75,8 +75,8 @@
7575
weak
7676
[file "_config.yml"]
7777
url = https://github.com/devlooped/oss/blob/main/_config.yml
78-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
79-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
78+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
79+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
8080
weak
8181
[file "assets/css/style.scss"]
8282
url = https://github.com/devlooped/oss/blob/main/assets/css/style.scss
@@ -90,13 +90,13 @@
9090
weak
9191
[file "src/Directory.Build.props"]
9292
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
93-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
94-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
93+
sha = dd13ed3334135c30dcb1e3b2295dc7622de298d9
94+
etag = bd05f9f240823c0ac79ddfefe654061550c36f82dd94fa513b82900e92686a5f
9595
weak
9696
[file "src/Directory.Build.targets"]
9797
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
98-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
99-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
98+
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
99+
etag = 09ce6b3f9521f8eedc44b77e7b7eaf90bf5df36e1ffb7f78ca27658812180977
100100
weak
101101
[file "src/kzu.snk"]
102102
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
@@ -106,12 +106,12 @@
106106
[file "src/ISBN/groups.js"]
107107
url = https://github.com/inventaire/isbn3/blob/master/lib/groups.js
108108
sha = 469a46f5b93875349cb7fae88aea25101910c179
109-
etag = 8e0bf213916abd3e148bb825e0ba4b6131c24c18b3a518f7656f9e976142c7b2
109+
etag = 2ef8cc17f45fb9f32250fdb34af9e571bb3b362df71c991c37b5a585571966f5
110110
weak
111111
[file ".github/workflows/includes.yml"]
112112
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
113-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
114-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
113+
sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b
114+
etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd
115115
weak
116116
[file ".github/workflows/combine-prs.yml"]
117117
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml
@@ -149,3 +149,17 @@
149149
sha = 032439dbf180fca0539a5bd3a019f18ab3484b76
150150
etag = da7c0104131bd474b52fc9bc9f9bda6470e24ae38d4fb9f5c4f719bc01370ab5
151151
weak
152+
[file "readme.tmp.md"]
153+
url = https://github.com/devlooped/oss/blob/main/readme.tmp.md
154+
skip
155+
[file "oss.cs"]
156+
url = https://github.com/devlooped/oss/blob/main/oss.cs
157+
skip
158+
[file ".github/actions/dotnet/action.yml"]
159+
url = https://github.com/devlooped/oss/blob/main/.github/actions/dotnet/action.yml
160+
skip
161+
[file ".github/workflows/dotnet-env.yml"]
162+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
163+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
164+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
165+
weak

0 commit comments

Comments
 (0)