Skip to content

Commit aa2b8c3

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Group MEAI packages together devlooped/oss@e733294 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Ignore .env files recursively devlooped/oss@3776526 - Ignore slnx file format too devlooped/oss@68b409c - Fix error message quotes in includes.yml devlooped/oss@26e8cb7 - Revert indent size for project files devlooped/oss@a62c459 - Switch to dotnet-env for .NET SDK setup devlooped/oss@56c2b85 - Add Company MSBuild property by default devlooped/oss@c509be4 - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 # devlooped/SponsorLink - Bump JWT also in samples devlooped/SponsorLink@e8ec200 - Fix version/override for CPV devlooped/SponsorLink@8a40822
1 parent 5b9d995 commit aa2b8c3

17 files changed

+161
-81
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: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ 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
@@ -101,12 +101,7 @@ jobs:
101101
fetch-depth: 0
102102

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

111106
- name: ✓ ensure format
112107
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/includes.yml

Lines changed: 22 additions & 2 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,10 +32,29 @@ 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
3553
uses: peter-evans/create-pull-request@v6
3654
with:
37-
add-paths: '**.md'
55+
add-paths: |
56+
**.md
57+
osmfeula.txt
3858
base: main
3959
branch: markdown-includes
4060
delete-branch: true

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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

.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: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
skip
2424
[file ".editorconfig"]
2525
url = https://github.com/devlooped/oss/blob/main/.editorconfig
26-
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
27-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
26+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
27+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
2828
weak
2929
[file ".gitattributes"]
3030
url = https://github.com/devlooped/oss/blob/main/.gitattributes
31-
sha = 5f92a68e302bae675b394ef343114139c075993e
32-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
31+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
32+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
3333
weak
3434
[file ".github/dependabot.yml"]
3535
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
36-
sha = 917ff5486e25bec90038e7ab6d146fd82c61f846
37-
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
36+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
37+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
3838
weak
3939
[file ".github/workflows/build.yml"]
4040
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
41-
sha = 08c70776943839f73dbea2e65355108747468508
42-
etag = fb2e91cdc9fb7a4d3e8f698e525816c5d8febb35b005c278eecca8056e78f809
41+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
42+
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
4343
weak
4444
[file ".github/workflows/changelog.yml"]
4545
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -53,13 +53,13 @@
5353
weak
5454
[file ".github/workflows/publish.yml"]
5555
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
56-
sha = 08c70776943839f73dbea2e65355108747468508
57-
etag = 722a2c7cb3a42bc24ca7fb48d2e9a336641ed0599418239e24efbafccf64bd50
56+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
57+
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
5858
weak
5959
[file ".gitignore"]
6060
url = https://github.com/devlooped/oss/blob/main/.gitignore
61-
sha = e0be248fff1d39133345283b8227372b36574b75
62-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
61+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
62+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
6363
weak
6464
[file "Directory.Build.rsp"]
6565
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -68,8 +68,8 @@
6868
weak
6969
[file "_config.yml"]
7070
url = https://github.com/devlooped/oss/blob/main/_config.yml
71-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
72-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
71+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
72+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
7373
weak
7474
[file "assets/css/style.scss"]
7575
url = https://github.com/devlooped/oss/blob/main/assets/css/style.scss
@@ -83,13 +83,13 @@
8383
weak
8484
[file "src/Directory.Build.props"]
8585
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
86-
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
87-
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
86+
sha = c509be4378ff6789df4f66338cb88119453c0975
87+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
8888
weak
8989
[file "src/Directory.Build.targets"]
9090
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
91-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
92-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
91+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
92+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
9393
weak
9494
[file "src/kzu.snk"]
9595
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
@@ -110,8 +110,8 @@
110110
skip
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 = 26e8cb798ce72dec7072db826cc9694d456797bd
114+
etag = df06492eeb2daaae4168d71bbb643f5da2693b67cdd58c42ffa44a191ee99b69
115115
weak
116116
[file "src/nuget.config"]
117117
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
@@ -195,15 +195,15 @@
195195
weak
196196
[file "src/SponsorLink/SponsorLink.Analyzer.Tests.targets"]
197197
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.Tests.targets
198-
sha = 1454a8f481610a6cf33adfc6082a19421bbed43c
198+
sha = 8a4082211918b604ad95ef0f3da3cd414747c46a
199199

200-
etag = a06c8e06228a859eb15ba9ffad88c15874048a2ee23e515029fc36a78df1349c
200+
etag = ac4e82c24d5a812eb7a1ad20d2d076b7aeedddd90c8196eaea0c227693a2ede6
201201
weak
202202
[file "src/SponsorLink/SponsorLink.Analyzer.targets"]
203203
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.targets
204-
sha = 1454a8f481610a6cf33adfc6082a19421bbed43c
204+
sha = 8a4082211918b604ad95ef0f3da3cd414747c46a
205205

206-
etag = 0b4028f3cbc6463257b741106186689bdc7d1b20af5d1d0075e81e6d4fbe8d7b
206+
etag = b75dd01945453c3ccd9eb96f65959ff1607a2cf11226fac5014b01b7cb6314d7
207207
weak
208208
[file "src/SponsorLink/SponsorLink/AnalyzerOptionsExtensions.cs"]
209209
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/AnalyzerOptionsExtensions.cs
@@ -249,9 +249,9 @@
249249
weak
250250
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
251251
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.csproj
252-
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
252+
sha = e8ec200934a3b3788c2e31d7022c717f5fd152fa
253253

254-
etag = 0d1ba307ebf2ffa53af749afc408c738566cf1a334eb7df16dc64cb243f6233d
254+
etag = 1a58baf82b1813f68610272aa6161a18a70d5c619154734039a0d48fce6d735a
255255
weak
256256
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
257257
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLinkAnalyzer.cs
@@ -345,9 +345,9 @@
345345
weak
346346
[file "src/SponsorLink/Tests/Tests.csproj"]
347347
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Tests.csproj
348-
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
348+
sha = e8ec200934a3b3788c2e31d7022c717f5fd152fa
349349

350-
etag = 3fc99ed4d45124df055e60a0b89aedc46286c973c05859a5cada0daa0457efbd
350+
etag = eb34fc9fe25b0169f069ff692379a19c59673727d8abb6f45816012661329df5
351351
weak
352352
[file "src/SponsorLink/Tests/keys/kzu.key"]
353353
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/keys/kzu.key
@@ -425,3 +425,8 @@
425425
sha = a755e4be0f7cb73cfde208857e28f7cfeba2dcc3
426426
etag = 82ae1c417265f2e136544980b4f687a1cc2c1bfb24df93d354c259053550f4a3
427427
weak
428+
[file ".github/workflows/dotnet-env.yml"]
429+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
430+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
431+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
432+
weak

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
theme: jekyll-theme-slate
22

3-
exclude: [ 'src/', '*.sln', 'Gemfile*', '*.rsp' ]
3+
exclude: [ 'src/', '*.sln', '*.slnx', 'Gemfile*', '*.rsp' ]

0 commit comments

Comments
 (0)