Skip to content

Commit d91434a

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Enable package pruning in Directory.Build.props devlooped/oss@0ff8b7b - Ignore .env files recursively devlooped/oss@3776526 - Ensure dnx run succeeds even on Windows devlooped/oss@7f5f9ee - Update create-pull-request action to version 8 devlooped/oss@0662872 - Revert indent size for project files devlooped/oss@a62c459 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Update .netconfig to remove obsolete action reference devlooped/oss@4cb4765 - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - Upgrade create-pull-request action to version 8 devlooped/oss@d00364f - Ignore slnx file format too devlooped/oss@68b409c - Group MEAI packages together devlooped/oss@e733294
1 parent 4d6c62b commit d91434a

File tree

13 files changed

+140
-47
lines changed

13 files changed

+140
-47
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: 5 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*"

.github/workflows/build.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,14 @@ jobs:
6666
fetch-depth: 0
6767

6868
- name: ⚙ dotnet
69-
uses: ./.github/actions/dotnet
69+
uses: devlooped/actions-dotnet-env@v1
7070

7171
- name: 🙏 build
7272
run: dotnet build -m:1 -bl:build.binlog
7373

7474
- name: 🧪 test
75-
run: |
76-
dotnet tool update -g dotnet-retest
77-
dotnet retest -- --no-build
75+
shell: pwsh
76+
run: dnx --yes retest -- --no-build
7877

7978
- name: 🐛 logs
8079
uses: actions/upload-artifact@v4
@@ -101,12 +100,7 @@ jobs:
101100
fetch-depth: 0
102101

103102
- name: ⚙ dotnet
104-
uses: actions/setup-dotnet@v4
105-
with:
106-
dotnet-version: |
107-
6.x
108-
8.x
109-
9.x
103+
uses: devlooped/actions-dotnet-env@v1
110104

111105
- name: ✓ ensure format
112106
run: |

.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-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
validate: false
8080

8181
- name: ✍ pull request
82-
uses: peter-evans/create-pull-request@v7
82+
uses: peter-evans/create-pull-request@v8
8383
with:
8484
base: main
8585
branch: dotnet-file-sync

.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: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ jobs:
2828
fetch-depth: 0
2929

3030
- name: ⚙ dotnet
31-
uses: ./.github/actions/dotnet
31+
uses: devlooped/actions-dotnet-env@v1
3232

3333
- name: 🙏 build
3434
run: dotnet build -m:1 -bl:build.binlog
3535

3636
- name: 🧪 test
37-
run: |
38-
dotnet tool update -g dotnet-retest
39-
dotnet retest -- --no-build
37+
shell: pwsh
38+
run: dnx --yes retest -- --no-build
4039

4140
- name: 🐛 logs
4241
uses: actions/upload-artifact@v4

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ BenchmarkDotNet.Artifacts
1111
.genaiscript
1212
.idea
1313
local.settings.json
14+
.env
1415

1516
*.suo
1617
*.sdf

.netconfig

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
url = https://github.com/devlooped/oss
33
[file ".editorconfig"]
44
url = https://github.com/devlooped/oss/blob/main/.editorconfig
5-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
6-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
5+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
6+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
77
weak
88
[file ".gitattributes"]
99
url = https://github.com/devlooped/oss/blob/main/.gitattributes
10-
sha = 5f92a68e302bae675b394ef343114139c075993e
11-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
10+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
11+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
1212
weak
1313
[file ".github/dependabot.yml"]
1414
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
15-
sha = 917ff5486e25bec90038e7ab6d146fd82c61f846
16-
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
15+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
16+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
1717
weak
1818
[file ".github/release.yml"]
1919
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
@@ -22,8 +22,8 @@
2222
weak
2323
[file ".github/workflows/build.yml"]
2424
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
25-
sha = 08c70776943839f73dbea2e65355108747468508
26-
etag = fb2e91cdc9fb7a4d3e8f698e525816c5d8febb35b005c278eecca8056e78f809
25+
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
26+
etag = a04ce46114292f5c0e76bc1f260381b174c93d6f264749dfacbfc892238bec73
2727
weak
2828
[file ".github/workflows/changelog.config"]
2929
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -47,23 +47,23 @@
4747
weak
4848
[file ".github/workflows/includes.yml"]
4949
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
50-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
51-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
50+
sha = 06628725a6303bb8c4cf3076a384fc982a91bc0b
51+
etag = 478f91d4126230e57cc601382da1ba23f9daa054645b4af89800d8dd862e64fd
5252
weak
5353
[file ".github/workflows/publish.yml"]
5454
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
55-
sha = 08c70776943839f73dbea2e65355108747468508
56-
etag = 722a2c7cb3a42bc24ca7fb48d2e9a336641ed0599418239e24efbafccf64bd50
55+
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
56+
etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025
5757
weak
5858
[file ".gitignore"]
5959
url = https://github.com/devlooped/oss/blob/main/.gitignore
60-
sha = e0be248fff1d39133345283b8227372b36574b75
61-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
60+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
61+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
6262
weak
6363
[file ".netconfig"]
6464
url = https://github.com/devlooped/oss/blob/main/.netconfig
65-
sha = b84f84a2429b41805d18e022c57dd8542a1ab6be
66-
etag = 212908ebd75f6a4f810bf07ea291c2439066863d4a7e61257b7cb552775dffe8
65+
sha = 4cb47653344b9672c9e1754e02a3ad62ee251790
66+
etag = 75e0ecd751441f7ce889aa71c9c97f479b606e64b412438ee772b64cd66cb47f
6767
weak
6868
[file "Directory.Build.rsp"]
6969
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -72,8 +72,8 @@
7272
weak
7373
[file "_config.yml"]
7474
url = https://github.com/devlooped/oss/blob/main/_config.yml
75-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
76-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
75+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
76+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
7777
weak
7878
[file "assets/css/style.scss"]
7979
url = https://github.com/devlooped/oss/blob/main/assets/css/style.scss
@@ -89,13 +89,13 @@
8989
skip
9090
[file "src/Directory.Build.props"]
9191
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
92-
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
93-
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
92+
sha = 0ff8b7b79a82112678326d1dc5543ed890311366
93+
etag = 3ebde0a8630d526b80f15801179116e17a857ff880a4442e7db7b075efa4fd63
9494
weak
9595
[file "src/Directory.Build.targets"]
9696
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
97-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
98-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
97+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
98+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
9999
weak
100100
[file "src/kzu.snk"]
101101
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
@@ -112,11 +112,16 @@
112112
weak
113113
[file ".github/workflows/dotnet-file-core.yml"]
114114
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
115-
sha = af171b7a87382ee665ba6fbaeb5f38a3551e1c23
116-
etag = 5ce370f52933ab2a4cd50f2b410e842fc5eab23088db2bf98b6c4d4ccdc9022b
115+
sha = d00364faaa84c414b868c0758b9e1a5fc0520dcc
116+
etag = d3b7d8ca69e6d22066a2348f02b409e2d6fb900f5039f68940c14e4ce6021826
117117
weak
118118
[file ".github/workflows/triage.yml"]
119119
url = https://github.com/devlooped/oss/blob/main/.github/workflows/triage.yml
120120
sha = 33000c0c4ab4eb4e0e142fa54515b811a189d55c
121121
etag = 013a47739e348f06891f37c45164478cca149854e6cd5c5158e6f073f852b61a
122122
weak
123+
[file ".github/workflows/dotnet-env.yml"]
124+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
125+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
126+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
127+
weak

0 commit comments

Comments
 (0)