Skip to content

Commit bcfe5ed

Browse files
devlooped-botkzu
devlooped-bot
authored and
kzu
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Allow workflow to work cross-org devlooped/oss@af171b7 - Fix improper first / in gh api repos devlooped/oss@f2b690c - Move dotnet setup to composite action devlooped/oss@08c7077 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d - Group Spectre.Console updates devlooped/oss@917ff54 # devlooped/SponsorLink - Improve wording on editor usage requiring sponsorship devlooped/SponsorLink@21d8dac - Introduce standalone SponsorManifest for read/validate devlooped/SponsorLink@a755e4b
1 parent 21668b2 commit bcfe5ed

File tree

13 files changed

+290
-172
lines changed

13 files changed

+290
-172
lines changed

‎.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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ updates:
3838
ProtoBuf:
3939
patterns:
4040
- "protobuf-*"
41+
Spectre:
42+
patterns:
43+
- "Spectre.Console*"

‎.github/workflows/build.yml

Lines changed: 10 additions & 6 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,12 +66,7 @@ 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: ./.github/actions/dotnet
7470

7571
- name: 🙏 build
7672
run: dotnet build -m:1 -bl:build.binlog
@@ -104,6 +100,14 @@ jobs:
104100
submodules: recursive
105101
fetch-depth: 0
106102

103+
- name: ⚙ dotnet
104+
uses: actions/setup-dotnet@v4
105+
with:
106+
dotnet-version: |
107+
6.x
108+
8.x
109+
9.x
110+
107111
- name: ✓ ensure format
108112
run: |
109113
dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget

‎.github/workflows/dotnet-file-core.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
name: dotnet-file-core
33
on:
44
workflow_call:
5+
secrets:
6+
BOT_NAME:
7+
required: false
8+
BOT_EMAIL:
9+
required: false
10+
GH_TOKEN:
11+
required: false
512

613
env:
714
DOTNET_NOLOGO: true

‎.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 & 7 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,12 +28,7 @@ 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: ./.github/actions/dotnet
3632

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

‎.netconfig

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
sha = 5f92a68e302bae675b394ef343114139c075993e
2626
[file ".github/dependabot.yml"]
2727
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
28-
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
28+
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
2929
weak
30-
sha = 49661dbf0720cde93eb5569be7523b5912351560
30+
sha = 917ff5486e25bec90038e7ab6d146fd82c61f846
3131
[file ".github/workflows/build.yml"]
3232
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
33-
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
33+
etag = fb2e91cdc9fb7a4d3e8f698e525816c5d8febb35b005c278eecca8056e78f809
3434
weak
35-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
35+
sha = 08c70776943839f73dbea2e65355108747468508
3636
[file ".gitignore"]
3737
url = https://github.com/devlooped/oss/blob/main/.gitignore
3838
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
@@ -86,13 +86,13 @@
8686
sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9
8787
[file ".github/workflows/publish.yml"]
8888
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
89-
etag = 2f64f75ad01f735fd05290370fb8a826111ac8dd7e74ce04226bb627a54a62ba
89+
etag = 722a2c7cb3a42bc24ca7fb48d2e9a336641ed0599418239e24efbafccf64bd50
9090
weak
91-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
91+
sha = 08c70776943839f73dbea2e65355108747468508
9292
[file ".github/workflows/dotnet-file.yml"]
9393
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
94-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
95-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
94+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
95+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
9696
weak
9797
[file "src/nuget.config"]
9898
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
@@ -194,25 +194,20 @@
194194
sha = 29921560c73bb91c2a21a21800daf0b250773598
195195
etag = a5d79dbc0ed9fac4fb1879fb3790b9ebab18e47c14c454554ce9f53f21487bb5
196196
weak
197-
[file "src/SponsorLink/SponsorLink/ManifestStatus.cs"]
198-
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/ManifestStatus.cs
199-
sha = f47528874a6d9192b5546f84b455f5ccc474a707
200-
etag = e46848f83c0436ba33a1c09a4060ad627a74db41bab66bb37ca40fce8a6532a7
201-
weak
202197
[file "src/SponsorLink/SponsorLink/Resources.es.resx"]
203198
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/Resources.es.resx
204-
sha = 29921560c73bb91c2a21a21800daf0b250773598
205-
etag = feb9dc86e4d9c0c4a294cd6e03c5b914943e8d206b88a125abd1b0f882ddb247
199+
sha = 21d8dac3077c75cd07d7cc7f9e10f2620afce834
200+
etag = 89a7bb797aeacca43e043196a00eea91f282df4caf9bbe937749026a03f707ad
206201
weak
207202
[file "src/SponsorLink/SponsorLink/Resources.resx"]
208203
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/Resources.resx
209-
sha = 29921560c73bb91c2a21a21800daf0b250773598
210-
etag = 7665a3be17cd224b1c413ade6a9c1c5a822dace1e7f9daae33a2e52d8bca15bb
204+
sha = 21d8dac3077c75cd07d7cc7f9e10f2620afce834
205+
etag = 8902652b8907de2fbccf73f3738d0fce503fc667a084171d6b88bf3373e559e7
211206
weak
212207
[file "src/SponsorLink/SponsorLink/SponsorLink.cs"]
213208
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.cs
214-
sha = 3f72a9fd35274a659dd380a7d5b747d71b9732a1
215-
etag = 616598e0ecb6d2ce97660aa6ac049e2a31a1c953669743b7b612b61d40c37706
209+
sha = a755e4be0f7cb73cfde208857e28f7cfeba2dcc3
210+
etag = 402e2beb11cf64c07be3d0fc3e89115fd09fc24133c08a8951bf0e784909c510
216211
weak
217212
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
218213
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.csproj
@@ -289,11 +284,6 @@
289284
sha = ca82a9d6298a933192c5dfd2c5881ebadb85d0fe
290285
etag = 1875555adb7eab21acf1e730b6baeb8c095d9f6f9f07303a87ad9c16e0f6490d
291286
weak
292-
[file "src/SponsorLink/Tests/SponsorLinkTests.cs"]
293-
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/SponsorLinkTests.cs
294-
sha = f47528874a6d9192b5546f84b455f5ccc474a707
295-
etag = 1fa41250bd984e8aa840a966d34ce0e94f2111d1422d7f50b864c38364fcf4a4
296-
weak
297287
[file "src/SponsorLink/Tests/SponsorableManifest.cs"]
298288
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/SponsorableManifest.cs
299289
sha = f47528874a6d9192b5546f84b455f5ccc474a707
@@ -381,6 +371,21 @@
381371
weak
382372
[file ".github/workflows/dotnet-file-core.yml"]
383373
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
384-
sha = 875284ba5d565f529aba2f5d24ab8ed27c1d1c79
385-
etag = 8de1d974bf73b1945b5c8be684c3a0b7364114a0d795c9d68837aed9b3aff331
374+
sha = af171b7a87382ee665ba6fbaeb5f38a3551e1c23
375+
etag = 5ce370f52933ab2a4cd50f2b410e842fc5eab23088db2bf98b6c4d4ccdc9022b
376+
weak
377+
[file ".github/actions/dotnet/action.yml"]
378+
url = https://github.com/devlooped/oss/blob/main/.github/actions/dotnet/action.yml
379+
sha = f2b690ce307acb76c5b8d7faec1a5b971a93653e
380+
etag = 27ea11baa2397b3ec9e643a935832da97719c4e44215cfd135c49cad4c29373f
381+
weak
382+
[file "src/SponsorLink/SponsorLink/SponsorManifest.cs"]
383+
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorManifest.cs
384+
sha = a755e4be0f7cb73cfde208857e28f7cfeba2dcc3
385+
etag = 55ef89e8441156541c1c74a50675b7f56633b56493031f0ffa877460839e3536
386+
weak
387+
[file "src/SponsorLink/Tests/SponsorManifestTests.cs"]
388+
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/SponsorManifestTests.cs
389+
sha = a755e4be0f7cb73cfde208857e28f7cfeba2dcc3
390+
etag = 82ae1c417265f2e136544980b4f687a1cc2c1bfb24df93d354c259053550f4a3
386391
weak

‎src/SponsorLink/SponsorLink/ManifestStatus.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/SponsorLink/SponsorLink/Resources.es.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ Por favor considera apoyar el proyecto patrocinando en {0} y ejecutando posterio
169169
<data name="Contributor_Title" xml:space="preserve">
170170
<value>Eres un contribuidor al proyecto, eres lo máximo 💟!</value>
171171
</data>
172+
<data name="Editor_Disabled" xml:space="preserve">
173+
<value>El uso de {0} sin warnings en el editor requiere un patrocinio activo. Ver mas en {1}.</value>
174+
</data>
172175
<data name="Grace_Description" xml:space="preserve">
173176
<value>Patrocinar los proyectos en que dependes asegura que se mantengan activos, y que recibas el apoyo que necesitas. También es muy económico y está disponible en todo el mundo!
174177
Por favor considera apoyar el proyecto patrocinando en {0} y ejecutando posteriormente 'sponsor sync {1}'.</value>

‎src/SponsorLink/SponsorLink/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Please consider supporting the project by sponsoring at {0} and running 'sponsor
171171
<value>You are a contributor to the project, you rock 💟!</value>
172172
</data>
173173
<data name="Editor_Disabled" xml:space="preserve">
174-
<value>Editor usage of {0} requires an active sponsorship. Learn more at {1}.</value>
174+
<value>Editor usage of {0} without warnings requires an active sponsorship. Learn more at {1}.</value>
175175
</data>
176176
<data name="Grace_Description" xml:space="preserve">
177177
<value>Sponsoring projects you depend on ensures they remain active, and that you get the support you need. It's also super affordable and available worldwide!

0 commit comments

Comments
 (0)