Skip to content

Commit bce9f85

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Ignore slnx file format too devlooped/oss@68b409c - Group MEAI packages together devlooped/oss@e733294 - Switch to dotnet-env for .NET SDK setup devlooped/oss@56c2b85 - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Revert EOL change in editorconfig for C# files devlooped/oss@2d0e5a5 - Fix error message quotes in includes.yml devlooped/oss@26e8cb7 - Add Company MSBuild property by default devlooped/oss@c509be4 - Ignore .env files recursively devlooped/oss@3776526 - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749
1 parent dcd119c commit bce9f85

File tree

13 files changed

+123
-39
lines changed

13 files changed

+123
-39
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ indent_size = 4
1414

1515
# Xml project files
1616
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,msbuildproj,props,targets}]
17-
indent_size = 2
17+
indent_size = 4
1818

1919
# Xml config files
2020
[*.{ruleset,config,nuspec,resx,vsixmanifest,vsct}]
@@ -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: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@
1111
skip
1212
[file ".editorconfig"]
1313
url = https://github.com/devlooped/oss/blob/main/.editorconfig
14-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
14+
etag = 160587f1ec0a7d68f1e4bc49605f8c7033c5d7991776003d9f2bc916ea7aa817
1515
weak
16-
sha = c779d3d4e468358106dea03e93ba2cd35bb01ecb
16+
sha = 2d0e5a5e0bb259dfb00b2b27fe4af2dd5c58c693
1717
[file ".gitattributes"]
1818
url = https://github.com/devlooped/oss/blob/main/.gitattributes
19-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
19+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
2020
weak
21-
sha = 5f92a68e302bae675b394ef343114139c075993e
21+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
2222

2323
[file ".github/dependabot.yml"]
2424
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
25-
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
25+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
2626
weak
27-
sha = 917ff5486e25bec90038e7ab6d146fd82c61f846
27+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
2828

2929
[file ".github/workflows/build.yml"]
3030
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
3131
weak
32-
etag = fb2e91cdc9fb7a4d3e8f698e525816c5d8febb35b005c278eecca8056e78f809
33-
sha = 08c70776943839f73dbea2e65355108747468508
32+
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
33+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
3434

3535
[file ".gitignore"]
3636
url = https://github.com/devlooped/oss/blob/main/.gitignore
37-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
37+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
3838
weak
39-
sha = e0be248fff1d39133345283b8227372b36574b75
39+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
4040

4141
[file "Directory.Build.rsp"]
4242
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -46,25 +46,25 @@
4646

4747
[file "_config.yml"]
4848
url = https://github.com/devlooped/oss/blob/main/_config.yml
49-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
49+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
5050
weak
51-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
51+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
5252
[file "license.txt"]
5353
url = https://github.com/devlooped/oss/blob/main/license.txt
5454
etag = 2c6335b37e4ae05eea7c01f5d0c9d82b49c488f868a8b5ba7bff7c6ff01f3994
5555
weak
5656
sha = 0683ee777d7d878d4bf013d7deea352685135a05
5757
[file "src/Directory.Build.props"]
5858
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
59-
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
59+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
6060
weak
61-
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
61+
sha = c509be4378ff6789df4f66338cb88119453c0975
6262

6363
[file "src/Directory.Build.targets"]
6464
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
65-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
65+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
6666
weak
67-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
67+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
6868

6969
[file "src/kzu.snk"]
7070
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
@@ -84,9 +84,9 @@
8484

8585
[file ".github/workflows/publish.yml"]
8686
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
87-
etag = 722a2c7cb3a42bc24ca7fb48d2e9a336641ed0599418239e24efbafccf64bd50
87+
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
8888
weak
89-
sha = 08c70776943839f73dbea2e65355108747468508
89+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
9090

9191
[file ".github/workflows/release-artifacts.yml"]
9292
url = https://github.com/devlooped/oss/blob/main/.github/workflows/release-artifacts.yml
@@ -105,9 +105,9 @@
105105
weak
106106
[file ".github/workflows/includes.yml"]
107107
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
108-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
108+
sha = 26e8cb798ce72dec7072db826cc9694d456797bd
109109

110-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
110+
etag = df06492eeb2daaae4168d71bbb643f5da2693b67cdd58c42ffa44a191ee99b69
111111
weak
112112
[file ".github/release.yml"]
113113
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
@@ -141,3 +141,8 @@
141141
sha = f2b690ce307acb76c5b8d7faec1a5b971a93653e
142142
etag = 27ea11baa2397b3ec9e643a935832da97719c4e44215cfd135c49cad4c29373f
143143
weak
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

‎_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)