Skip to content

Commit 2351e5c

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Update nuget.config with new(ish?) MS certs devlooped/oss@032439d - Attempt to get necessary permissions for default token devlooped/oss@85829f2 - Enhance include workflow with OSMF EULA support devlooped/oss@f2050db - Trim whitespace in file content replacement devlooped/oss@e53557f - Fix path pattern for markdown files in workflow devlooped/oss@6a6de05 - Fix error message quotes in includes.yml devlooped/oss@26e8cb7 - Change label from 'docs' to 'dependencies' devlooped/oss@2d1fb4e - Avoid failure on PR creation if osmfeula.txt doesn't exist in repo devlooped/oss@8ff5178 - Update create-pull-request action to version 8 devlooped/oss@0662872 - Upgrade to supported artifact actions devlooped/oss@64141f1 - Ensure .NET9 SDK for --allow-downgrade switch on ubuntu devlooped/oss@cdeecc2 - Make sure all stable versions are available for build/test devlooped/oss@06e898c - 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 - Set severity of IDE1100 to none devlooped/oss@1ed9afe - Set explicit tab size and eol for code files devlooped/oss@5dba0d0 - Revert EOL change in editorconfig for C# files devlooped/oss@2d0e5a5 - Revert indent size for project files devlooped/oss@a62c459 - 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 - Group Spectre.Console updates devlooped/oss@917ff54 - Group MEAI packages together devlooped/oss@e733294 - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - Ignore .env files recursively devlooped/oss@3776526 - Add .NET 9.0 so format can succeed devlooped/oss@ec9d7cd - Ignore *.local recursively devlooped/oss@a225b7a - Update branches for push event in build.yml devlooped/oss@5da103c
1 parent d780d62 commit 2351e5c

File tree

15 files changed

+255
-88
lines changed

15 files changed

+255
-88
lines changed

‎.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: 11 additions & 5 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:
@@ -64,16 +65,18 @@ jobs:
6465
submodules: recursive
6566
fetch-depth: 0
6667

68+
- name: ⚙ dotnet
69+
uses: devlooped/actions-dotnet-env@v1
70+
6771
- name: 🙏 build
6872
run: dotnet build -m:1 -bl:build.binlog
6973

7074
- name: 🧪 test
71-
run: |
72-
dotnet tool update -g dotnet-retest
73-
dotnet retest -- --no-build
75+
shell: pwsh
76+
run: dnx --yes retest -- --no-build
7477

7578
- name: 🐛 logs
76-
uses: actions/upload-artifact@v3
79+
uses: actions/upload-artifact@v4
7780
if: runner.debug && always()
7881
with:
7982
name: logs
@@ -96,6 +99,9 @@ jobs:
9699
submodules: recursive
97100
fetch-depth: 0
98101

102+
- name: ⚙ dotnet
103+
uses: devlooped/actions-dotnet-env@v1
104+
99105
- name: ✓ ensure format
100106
run: |
101107
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: 27 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
@@ -28,14 +32,33 @@ jobs:
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@v6
53+
uses: peter-evans/create-pull-request@v8
3354
with:
34-
add-paths: '**.md'
55+
add-paths: |
56+
**.md
57+
*.txt
3558
base: main
3659
branch: markdown-includes
3760
delete-branch: true
38-
labels: docs
61+
labels: dependencies
3962
author: ${{ env.BOT_AUTHOR }}
4063
committer: ${{ env.BOT_AUTHOR }}
4164
commit-message: +Mᐁ includes

‎.github/workflows/publish.yml‎

Lines changed: 8 additions & 5 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' }}
@@ -26,16 +27,18 @@ jobs:
2627
submodules: recursive
2728
fetch-depth: 0
2829

30+
- name: ⚙ dotnet
31+
uses: devlooped/actions-dotnet-env@v1
32+
2933
- name: 🙏 build
3034
run: dotnet build -m:1 -bl:build.binlog
3135

3236
- name: 🧪 test
33-
run: |
34-
dotnet tool update -g dotnet-retest
35-
dotnet retest -- --no-build
37+
shell: pwsh
38+
run: dnx --yes retest -- --no-build
3639

3740
- name: 🐛 logs
38-
uses: actions/upload-artifact@v3
41+
uses: actions/upload-artifact@v4
3942
if: runner.debug && always()
4043
with:
4144
name: logs

‎.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: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
skip
1515
[file ".editorconfig"]
1616
url = https://github.com/devlooped/oss/blob/main/.editorconfig
17-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
17+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
1818

19-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
19+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
2020
weak
2121
[file ".gitattributes"]
2222
url = https://github.com/devlooped/oss/blob/main/.gitattributes
23-
sha = 5f92a68e302bae675b394ef343114139c075993e
23+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
2424

25-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
25+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
2626
weak
2727
[file ".github/dependabot.yml"]
2828
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
29-
sha = 49661dbf0720cde93eb5569be7523b5912351560
29+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
3030

31-
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
31+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
3232
weak
3333
[file ".github/release.yml"]
3434
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
@@ -38,9 +38,9 @@
3838
weak
3939
[file ".github/workflows/build.yml"]
4040
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
41-
sha = 5e17ad62ebb5241555a7a4d29e3ab15e5ba120d2
41+
sha = 5da103cfbc1c4f9b5f59cfa698d2afbd744a7525
4242

43-
etag = f358acb1e45596bf0aad49996017da44939de30b805289c4ad205a7ccb6f99cb
43+
etag = 851af098748f7cfa5bc3cfd4cc404a6de930532b59ceb2b3b535282c41226f3a
4444
weak
4545
[file ".github/workflows/changelog.config"]
4646
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -56,21 +56,21 @@
5656
weak
5757
[file ".github/workflows/dotnet-file.yml"]
5858
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
59-
sha = 7afe350f7e80a230e922db026d4e1198ba15cae1
59+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
6060

61-
etag = 65e9794df6caff779eb989c8f71ddf4d4109b24a75af79e4f8d0fe6ba7bd9702
61+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
6262
weak
6363
[file ".github/workflows/includes.yml"]
6464
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
65-
sha = d152e7437fd0d6f6d9363d23cb3b78c07335ea49
65+
sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b
6666

67-
etag = ec40db34f379d0c6d83b2ec15624f330318a172cc4f85b5417c63e86eaf601df
67+
etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd
6868
weak
6969
[file ".github/workflows/publish.yml"]
7070
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
71-
sha = 5e17ad62ebb5241555a7a4d29e3ab15e5ba120d2
71+
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
7272

73-
etag = 2cc96046d8f28e7cbcde89ed56d3d89e1a70fb0de7846ee1827bee66b7dfbcf1
73+
etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025
7474
weak
7575
[file ".github/workflows/triage.yml"]
7676
url = https://github.com/devlooped/oss/blob/main/.github/workflows/triage.yml
@@ -80,18 +80,18 @@
8080
weak
8181
[file ".gitignore"]
8282
url = https://github.com/devlooped/oss/blob/main/.gitignore
83-
sha = e0be248fff1d39133345283b8227372b36574b75
83+
sha = a225b7a9f609f26bcc24e0d84f663387be251a7d
8484

85-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
85+
etag = 20a8b49d57024abbd85aac5b0020c30e5eb68e0384b2761e93727c8780c4a991
8686
weak
8787
[file "Directory.Build.rsp"]
8888
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
8989
skip
9090
[file "_config.yml"]
9191
url = https://github.com/devlooped/oss/blob/main/_config.yml
92-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
92+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
9393

94-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
94+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
9595
weak
9696
[file "assets/css/style.scss"]
9797
url = https://github.com/devlooped/oss/blob/main/assets/css/style.scss
@@ -107,15 +107,15 @@
107107
weak
108108
[file "src/Directory.Build.props"]
109109
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
110-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
110+
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
111111

112-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
112+
etag = bca64456d4e2cd05375a72b6de376b2c51edf6ad49029aa9a729f4a349a54656
113113
weak
114114
[file "src/Directory.Build.targets"]
115115
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
116-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
116+
sha = 4b84c540df6f37c30fb38df7947d79871c34f036
117117

118-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
118+
etag = 09ce6b3f9521f8eedc44b77e7b7eaf90bf5df36e1ffb7f78ca27658812180977
119119
weak
120120
[file "src/Sample/MinimalApi/Ipsum.cs"]
121121
url = https://github.com/devlooped/catbag/blob/main/System/Ipsum.cs
@@ -129,3 +129,25 @@
129129

130130
etag = 7a210949b41605c0bdaf13fb1d47339a274b8b941c27321950a32d7d4c63a049
131131
weak
132+
[file "readme.tmp.md"]
133+
url = https://github.com/devlooped/oss/blob/main/readme.tmp.md
134+
skip
135+
[file "oss.cs"]
136+
url = https://github.com/devlooped/oss/blob/main/oss.cs
137+
skip
138+
[file ".github/workflows/dotnet-file-core.yml"]
139+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
140+
skip
141+
[file ".github/actions/dotnet/action.yml"]
142+
url = https://github.com/devlooped/oss/blob/main/.github/actions/dotnet/action.yml
143+
skip
144+
[file ".github/workflows/dotnet-env.yml"]
145+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
146+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
147+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
148+
weak
149+
[file "src/nuget.config"]
150+
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
151+
sha = 032439dbf180fca0539a5bd3a019f18ab3484b76
152+
etag = da7c0104131bd474b52fc9bc9f9bda6470e24ae38d4fb9f5c4f719bc01370ab5
153+
weak

0 commit comments

Comments
 (0)