Skip to content

Commit 9a402ef

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Fix improper first / in gh api repos devlooped/oss@f2b690c - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - Add Company MSBuild property by default devlooped/oss@c509be4 - Switch to dotnet-env for .NET SDK setup devlooped/oss@56c2b85 - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Group MEAI packages together devlooped/oss@e733294 - Ignore .env files recursively devlooped/oss@3776526 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Revert indent size for project files devlooped/oss@a62c459 - Ignore slnx file format too devlooped/oss@68b409c - Fix error message quotes in includes.yml devlooped/oss@26e8cb7
1 parent 0be592e commit 9a402ef

File tree

14 files changed

+165
-49
lines changed

14 files changed

+165
-49
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/actions/dotnet/action.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: ⚙ dotnet
2+
description: Configures dotnet if the repo/org defines the DOTNET custom property
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: 🔎 dotnet
8+
id: dotnet
9+
shell: bash
10+
run: |
11+
VERSIONS=$(gh api repos/${{ github.repository }}/properties/values | jq -r '.[] | select(.property_name == "DOTNET") | .value')
12+
# Remove extra whitespace from VERSIONS
13+
VERSIONS=$(echo "$VERSIONS" | tr -s ' ' | tr -d ' ')
14+
# Convert comma-separated to newline-separated
15+
NEWLINE_VERSIONS=$(echo "$VERSIONS" | tr ',' '\n')
16+
# Validate versions
17+
while IFS= read -r version; do
18+
if ! [[ $version =~ ^[0-9]+(\.[0-9]+(\.[0-9]+)?)?(\.x)?$ ]]; then
19+
echo "Error: Invalid version format: $version"
20+
exit 1
21+
fi
22+
done <<< "$NEWLINE_VERSIONS"
23+
# Write multiline output to $GITHUB_OUTPUT
24+
{
25+
echo 'versions<<EOF'
26+
echo "$NEWLINE_VERSIONS"
27+
echo 'EOF'
28+
} >> $GITHUB_OUTPUT
29+
30+
- name: ⚙ dotnet
31+
if: steps.dotnet.outputs.versions != ''
32+
uses: actions/setup-dotnet@v4
33+
with:
34+
dotnet-version: |
35+
${{ steps.dotnet.outputs.versions }}

‎.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: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,7 @@ jobs:
6666
fetch-depth: 0
6767

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

7671
- name: 🙏 build
7772
run: dotnet build -m:1 -bl:build.binlog
@@ -106,12 +101,7 @@ jobs:
106101
fetch-depth: 0
107102

108103
- name: ⚙ dotnet
109-
uses: actions/setup-dotnet@v4
110-
with:
111-
dotnet-version: |
112-
6.x
113-
8.x
114-
9.x
104+
uses: devlooped/actions-dotnet-env@v1
115105

116106
- name: ✓ ensure format
117107
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: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
VersionLabel: ${{ github.ref }}
1616
GH_TOKEN: ${{ secrets.GH_TOKEN }}
1717
MSBUILDTERMINALLOGGER: auto
18-
SLEET_FEED_URL: ${{ vars.SLEET_FEED_URL }}
18+
SLEET_FEED_URL: https://api.nuget.org/v3/index.json
1919

2020
jobs:
2121
publish:
@@ -28,12 +28,7 @@ jobs:
2828
fetch-depth: 0
2929

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

3833
- name: 🙏 build
3934
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: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@
3232
skip
3333
[file ".editorconfig"]
3434
url = https://github.com/devlooped/oss/blob/main/.editorconfig
35-
sha = c779d3d4e468358106dea03e93ba2cd35bb01ecb
36-
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
35+
sha = a62c45934ac2952f2f5d54d8aea4a7ebc1babaff
36+
etag = b5e919b472a52d4b522f86494f0f2c0ba74a6d9601454e20e4cbaf744317ff62
3737
weak
3838
[file ".gitattributes"]
3939
url = https://github.com/devlooped/oss/blob/main/.gitattributes
40-
sha = 5f92a68e302bae675b394ef343114139c075993e
41-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
40+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
41+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
4242
weak
4343
[file ".github/dependabot.yml"]
4444
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
45-
sha = 49661dbf0720cde93eb5569be7523b5912351560
46-
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
45+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
46+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
4747
weak
4848
[file ".github/workflows/build.yml"]
4949
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
50-
sha = 931da830a361d69b419887a0edbb424517ca75fc
51-
etag = ea785d08ab67abc57629649b0a418a515dc58248de12668f3616908873f8ecc6
50+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
51+
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
5252
weak
5353
[file ".github/workflows/changelog.yml"]
5454
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -62,13 +62,13 @@
6262
weak
6363
[file ".github/workflows/publish.yml"]
6464
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
65-
sha = 931da830a361d69b419887a0edbb424517ca75fc
66-
etag = 62a13b8b34b1b265cdc045bf7ea001dee7bdc184cba7abfea5fe77283cf419a6
65+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
66+
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
6767
weak
6868
[file ".gitignore"]
6969
url = https://github.com/devlooped/oss/blob/main/.gitignore
70-
sha = e0be248fff1d39133345283b8227372b36574b75
71-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
70+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
71+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
7272
weak
7373
[file "Directory.Build.rsp"]
7474
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -77,8 +77,8 @@
7777
weak
7878
[file "_config.yml"]
7979
url = https://github.com/devlooped/oss/blob/main/_config.yml
80-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
81-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
80+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
81+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
8282
weak
8383
[file "license.txt"]
8484
url = https://github.com/devlooped/oss/blob/main/license.txt
@@ -87,18 +87,18 @@
8787
weak
8888
[file "src/Directory.Build.props"]
8989
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
90-
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
91-
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
90+
sha = c509be4378ff6789df4f66338cb88119453c0975
91+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
9292
weak
9393
[file "src/Directory.Build.targets"]
9494
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
95-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
96-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
95+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
96+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
9797
weak
9898
[file ".github/workflows/includes.yml"]
9999
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
100-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
101-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
100+
sha = 26e8cb798ce72dec7072db826cc9694d456797bd
101+
etag = df06492eeb2daaae4168d71bbb643f5da2693b67cdd58c42ffa44a191ee99b69
102102
weak
103103
[file ".github/workflows/combine-prs.yml"]
104104
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml
@@ -130,3 +130,13 @@
130130
sha = 032439dbf180fca0539a5bd3a019f18ab3484b76
131131
etag = da7c0104131bd474b52fc9bc9f9bda6470e24ae38d4fb9f5c4f719bc01370ab5
132132
weak
133+
[file ".github/actions/dotnet/action.yml"]
134+
url = https://github.com/devlooped/oss/blob/main/.github/actions/dotnet/action.yml
135+
sha = f2b690ce307acb76c5b8d7faec1a5b971a93653e
136+
etag = 27ea11baa2397b3ec9e643a935832da97719c4e44215cfd135c49cad4c29373f
137+
weak
138+
[file ".github/workflows/dotnet-env.yml"]
139+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
140+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
141+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
142+
weak

0 commit comments

Comments
 (0)