Skip to content

Commit 6dca957

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Group MEAI packages together devlooped/oss@e733294 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d - Ignore slnx file format too devlooped/oss@68b409c - Fix improper first / in gh api repos devlooped/oss@f2b690c - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Update Directory.Build.props with support for underscores in branch name devlooped/oss@81d972f - Switch to dotnet-env for .NET SDK setup devlooped/oss@56c2b85 - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 # devlooped/SponsorLink - Improve wording on editor usage requiring sponsorship devlooped/SponsorLink@21d8dac - Introduce standalone SponsorManifest for read/validate devlooped/SponsorLink@a755e4b - Bump JWT also in samples devlooped/SponsorLink@e8ec200 - Fix version/override for CPV devlooped/SponsorLink@8a40822
1 parent 73ac578 commit 6dca957

21 files changed

+372
-205
lines changed

.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: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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:
@@ -65,19 +66,12 @@ jobs:
6566
fetch-depth: 0
6667

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

7571
- name: 🙏 build
7672
run: dotnet build -m:1 -bl:build.binlog
7773

7874
- name: 🧪 test
79-
env:
80-
AZURE_WEBPUBSUB: ${{ secrets.AZURE_WEBPUBSUB }}
8175
run: |
8276
dotnet tool update -g dotnet-retest
8377
dotnet retest -- --no-build
@@ -106,6 +100,9 @@ jobs:
106100
submodules: recursive
107101
fetch-depth: 0
108102

103+
- name: ⚙ dotnet
104+
uses: devlooped/actions-dotnet-env@v1
105+
109106
- name: ✓ ensure format
110107
run: |
111108
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/publish.yml

Lines changed: 3 additions & 9 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' }}
@@ -27,19 +28,12 @@ jobs:
2728
fetch-depth: 0
2829

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

3733
- name: 🙏 build
3834
run: dotnet build -m:1 -bl:build.binlog
3935

4036
- name: 🧪 test
41-
env:
42-
AZURE_WEBPUBSUB: ${{ secrets.AZURE_WEBPUBSUB }}
4337
run: |
4438
dotnet tool update -g dotnet-retest
4539
dotnet retest -- --no-build

.netconfig

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
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 = 49661dbf0720cde93eb5569be7523b5912351560
37-
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
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 = 06e898ccba692566ebf845fa7c8833ac6c318c0a
42-
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
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
@@ -48,13 +48,13 @@
4848
weak
4949
[file ".github/workflows/dotnet-file.yml"]
5050
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
51-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
52-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
51+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
52+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
5353
weak
5454
[file ".github/workflows/publish.yml"]
5555
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
56-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
57-
etag = 2f64f75ad01f735fd05290370fb8a826111ac8dd7e74ce04226bb627a54a62ba
56+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
57+
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
5858
weak
5959
[file ".gitignore"]
6060
url = https://github.com/devlooped/oss/blob/main/.gitignore
@@ -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,8 +83,8 @@
8383
weak
8484
[file "src/Directory.Build.props"]
8585
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
86-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
87-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
86+
sha = 81d972fd0760c244d134dae7f4b17d6c43cb004a
87+
etag = 1368697c1521e465a1dea88b93787b1c7def441c37d62afc903fb8d07179e4f6
8888
weak
8989
[file "src/Directory.Build.targets"]
9090
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -198,15 +198,15 @@
198198
weak
199199
[file "src/SponsorLink/SponsorLink.Analyzer.Tests.targets"]
200200
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.Tests.targets
201-
sha = df44ccc14cc11b5674c55aca9ba8596bdbcf8438
201+
sha = 8a4082211918b604ad95ef0f3da3cd414747c46a
202202

203-
etag = a3e9cbcc227dd56a7bed236eaded136f1b80f9f36a4fabce8be695ee844bf881
203+
etag = ac4e82c24d5a812eb7a1ad20d2d076b7aeedddd90c8196eaea0c227693a2ede6
204204
weak
205205
[file "src/SponsorLink/SponsorLink.Analyzer.targets"]
206206
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.targets
207-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
207+
sha = 8a4082211918b604ad95ef0f3da3cd414747c46a
208208

209-
etag = 7276d81830e29f8d5f3e27ee62cadaf7aef02a0162b9a05c88e1daef9cc4875e
209+
etag = b75dd01945453c3ccd9eb96f65959ff1607a2cf11226fac5014b01b7cb6314d7
210210
weak
211211
[file "src/SponsorLink/SponsorLink/AnalyzerOptionsExtensions.cs"]
212212
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/AnalyzerOptionsExtensions.cs
@@ -226,12 +226,6 @@
226226

227227
etag = a5d79dbc0ed9fac4fb1879fb3790b9ebab18e47c14c454554ce9f53f21487bb5
228228
weak
229-
[file "src/SponsorLink/SponsorLink/ManifestStatus.cs"]
230-
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/ManifestStatus.cs
231-
sha = f47528874a6d9192b5546f84b455f5ccc474a707
232-
233-
etag = e46848f83c0436ba33a1c09a4060ad627a74db41bab66bb37ca40fce8a6532a7
234-
weak
235229
[file "src/SponsorLink/SponsorLink/Resources.es-AR.resx"]
236230
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/Resources.es-AR.resx
237231
sha = 586398c3e650495f36601ecc8983a14ed745e058
@@ -240,27 +234,27 @@
240234
weak
241235
[file "src/SponsorLink/SponsorLink/Resources.es.resx"]
242236
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/Resources.es.resx
243-
sha = 29921560c73bb91c2a21a21800daf0b250773598
237+
sha = 21d8dac3077c75cd07d7cc7f9e10f2620afce834
244238

245-
etag = feb9dc86e4d9c0c4a294cd6e03c5b914943e8d206b88a125abd1b0f882ddb247
239+
etag = 89a7bb797aeacca43e043196a00eea91f282df4caf9bbe937749026a03f707ad
246240
weak
247241
[file "src/SponsorLink/SponsorLink/Resources.resx"]
248242
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/Resources.resx
249-
sha = 29921560c73bb91c2a21a21800daf0b250773598
243+
sha = 21d8dac3077c75cd07d7cc7f9e10f2620afce834
250244

251-
etag = 7665a3be17cd224b1c413ade6a9c1c5a822dace1e7f9daae33a2e52d8bca15bb
245+
etag = 8902652b8907de2fbccf73f3738d0fce503fc667a084171d6b88bf3373e559e7
252246
weak
253247
[file "src/SponsorLink/SponsorLink/SponsorLink.cs"]
254248
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.cs
255-
sha = 3f72a9fd35274a659dd380a7d5b747d71b9732a1
249+
sha = a755e4be0f7cb73cfde208857e28f7cfeba2dcc3
256250

257-
etag = 616598e0ecb6d2ce97660aa6ac049e2a31a1c953669743b7b612b61d40c37706
251+
etag = 402e2beb11cf64c07be3d0fc3e89115fd09fc24133c08a8951bf0e784909c510
258252
weak
259253
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
260254
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.csproj
261-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
255+
sha = e8ec200934a3b3788c2e31d7022c717f5fd152fa
262256

263-
etag = 27db7c8288b721804b52a719a9218ab1198f4db5b7a7d06bce4e1770def2d4a0
257+
etag = 1a58baf82b1813f68610272aa6161a18a70d5c619154734039a0d48fce6d735a
264258
weak
265259
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
266260
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLinkAnalyzer.cs
@@ -346,12 +340,6 @@
346340

347341
etag = 1875555adb7eab21acf1e730b6baeb8c095d9f6f9f07303a87ad9c16e0f6490d
348342
weak
349-
[file "src/SponsorLink/Tests/SponsorLinkTests.cs"]
350-
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/SponsorLinkTests.cs
351-
sha = f47528874a6d9192b5546f84b455f5ccc474a707
352-
353-
etag = 1fa41250bd984e8aa840a966d34ce0e94f2111d1422d7f50b864c38364fcf4a4
354-
weak
355343
[file "src/SponsorLink/Tests/SponsorableManifest.cs"]
356344
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/SponsorableManifest.cs
357345
sha = f47528874a6d9192b5546f84b455f5ccc474a707
@@ -360,9 +348,9 @@
360348
weak
361349
[file "src/SponsorLink/Tests/Tests.csproj"]
362350
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Tests.csproj
363-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
351+
sha = e8ec200934a3b3788c2e31d7022c717f5fd152fa
364352

365-
etag = 7d27c17944c61da196f11f904383b25b3f40579fbeb0cacb367bf05ec184ad7f
353+
etag = eb34fc9fe25b0169f069ff692379a19c59673727d8abb6f45816012661329df5
366354
weak
367355
[file "src/SponsorLink/Tests/keys/kzu.key"]
368356
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/keys/kzu.key
@@ -423,3 +411,23 @@
423411
sha = 032439dbf180fca0539a5bd3a019f18ab3484b76
424412
etag = da7c0104131bd474b52fc9bc9f9bda6470e24ae38d4fb9f5c4f719bc01370ab5
425413
weak
414+
[file ".github/actions/dotnet/action.yml"]
415+
url = https://github.com/devlooped/oss/blob/main/.github/actions/dotnet/action.yml
416+
sha = f2b690ce307acb76c5b8d7faec1a5b971a93653e
417+
etag = 27ea11baa2397b3ec9e643a935832da97719c4e44215cfd135c49cad4c29373f
418+
weak
419+
[file ".github/workflows/dotnet-env.yml"]
420+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
421+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
422+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
423+
weak
424+
[file "src/SponsorLink/SponsorLink/SponsorManifest.cs"]
425+
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorManifest.cs
426+
sha = a755e4be0f7cb73cfde208857e28f7cfeba2dcc3
427+
etag = 55ef89e8441156541c1c74a50675b7f56633b56493031f0ffa877460839e3536
428+
weak
429+
[file "src/SponsorLink/Tests/SponsorManifestTests.cs"]
430+
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/SponsorManifestTests.cs
431+
sha = a755e4be0f7cb73cfde208857e28f7cfeba2dcc3
432+
etag = 82ae1c417265f2e136544980b4f687a1cc2c1bfb24df93d354c259053550f4a3
433+
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)