Skip to content

Commit b9aa140

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Switch to dnx retest shorthand devlooped/oss@fddfd89 - Ensure quiet confirmation of tool download/install devlooped/oss@e11b002 - Ignore *.local recursively devlooped/oss@a225b7a - Ensure dnx run succeeds even on Windows devlooped/oss@7f5f9ee - Enhance include workflow with OSMF EULA support devlooped/oss@f2050db - Trim whitespace in file content replacement devlooped/oss@e53557f - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Fix path pattern for markdown files in workflow devlooped/oss@6a6de05 - Fix error message quotes in includes.yml devlooped/oss@26e8cb7 - Change label from 'docs' to 'dependencies' devlooped/oss@2d1fb4e - Add AzuriteConfig to .gitignore devlooped/oss@12c18e7 - Avoid failure on PR creation if osmfeula.txt doesn't exist in repo devlooped/oss@8ff5178 - Update create-pull-request action to version 8 devlooped/oss@0662872 - Add new entries to .gitignore file devlooped/oss@c76f0cc
1 parent 8605470 commit b9aa140

10 files changed

Lines changed: 246 additions & 113 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ updates:
3232
Web:
3333
patterns:
3434
- "Microsoft.AspNetCore*"
35+
OpenTelemetry:
36+
patterns:
37+
- "OpenTelemetry*"
3538
Tests:
3639
patterns:
3740
- "Microsoft.NET.Test*"

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- Release
1313
- Debug
1414
push:
15-
branches: [ main, dev, 'dev/*', 'feature/*', 'rel/*' ]
15+
branches: [ main, 'feature/*', 'rel/*' ]
1616
paths-ignore:
1717
- changelog.md
1818
- readme.md
@@ -72,9 +72,8 @@ jobs:
7272
run: dotnet build -m:1 -bl:build.binlog
7373

7474
- name: 🧪 test
75-
run: |
76-
dotnet tool update -g dotnet-retest
77-
dotnet retest -- --no-build
75+
shell: pwsh
76+
run: dnx --yes retest -- --no-build
7877

7978
- name: 🐛 logs
8079
uses: actions/upload-artifact@v4

‎.github/workflows/dotnet-env.yml‎

Lines changed: 52 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
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 }}
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+
env:
14+
PR_TOKEN: ${{ secrets.DEVLOOPED_TOKEN || secrets.GH_TOKEN }}
15+
permissions:
16+
contents: write
17+
pull-requests: write
18+
19+
steps:
20+
- name: 🤖 defaults
21+
uses: devlooped/actions-bot@v1
22+
with:
23+
name: ${{ secrets.BOT_NAME }}
24+
email: ${{ secrets.BOT_EMAIL }}
25+
gh_token: ${{ env.PR_TOKEN }}
26+
github_token: ${{ secrets.GITHUB_TOKEN }}
27+
28+
- name: 🤘 checkout
29+
uses: actions/checkout@v4
30+
with:
31+
token: ${{ env.PR_TOKEN || github.token }}
32+
33+
- name: 🤌 dotnet
34+
uses: devlooped/actions-which-dotnet@v1
35+
36+
- name: ✍ pull request
37+
if: env.PR_TOKEN != ''
38+
uses: peter-evans/create-pull-request@v7
39+
with:
40+
base: main
41+
branch: which-dotnet
42+
delete-branch: true
43+
labels: dependencies
44+
title: "⚙ Update dotnet versions"
45+
body: "Update dotnet versions"
46+
commit-message: "Update dotnet versions"
47+
token: ${{ env.PR_TOKEN }}
48+
49+
- name: ⚠️ skip pull request
50+
if: env.PR_TOKEN == ''
51+
shell: bash
52+
run: echo "::warning::Skipping PR creation because neither DEVLOOPED_TOKEN nor GH_TOKEN is configured. GITHUB_TOKEN cannot create pull requests in this repository."

‎.github/workflows/includes.yml‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ on:
55
branches:
66
- 'main'
77
paths:
8-
- '**.md'
8+
- '**.md'
99
- '!changelog.md'
10+
- 'osmfeula.txt'
1011

1112
jobs:
1213
includes:
1314
runs-on: ubuntu-latest
15+
env:
16+
PR_TOKEN: ${{ secrets.DEVLOOPED_TOKEN || secrets.GH_TOKEN }}
1417
permissions:
1518
contents: write
1619
pull-requests: write
@@ -20,28 +23,53 @@ jobs:
2023
with:
2124
name: ${{ secrets.BOT_NAME }}
2225
email: ${{ secrets.BOT_EMAIL }}
23-
gh_token: ${{ secrets.GH_TOKEN }}
26+
gh_token: ${{ env.PR_TOKEN }}
2427
github_token: ${{ secrets.GITHUB_TOKEN }}
2528

2629
- name: 🤘 checkout
2730
uses: actions/checkout@v4
2831
with:
29-
token: ${{ env.GH_TOKEN }}
32+
token: ${{ env.PR_TOKEN || github.token }}
3033

3134
- name: +Mᐁ includes
32-
uses: devlooped/actions-includes@v1
35+
uses: devlooped/actions-includes@v2
36+
37+
- name: 📝 OSMF EULA
38+
shell: pwsh
39+
run: |
40+
$file = "osmfeula.txt"
41+
$props = "src/Directory.Build.props"
42+
if (-not (test-path $file) -or -not (test-path $props)) {
43+
exit 0
44+
}
45+
46+
$product = dotnet msbuild $props -getproperty:Product
47+
if (-not $product) {
48+
write-error 'To use OSMF EULA, ensure the $(Product) property is set in Directory.props'
49+
exit 1
50+
}
51+
52+
((get-content -raw $file) -replace '\$product\$',$product).trim() | set-content $file
3353
3454
- name: ✍ pull request
35-
uses: peter-evans/create-pull-request@v6
55+
if: env.PR_TOKEN != ''
56+
uses: peter-evans/create-pull-request@v8
3657
with:
37-
add-paths: '**.md'
58+
add-paths: |
59+
**.md
60+
*.txt
3861
base: main
3962
branch: markdown-includes
4063
delete-branch: true
41-
labels: docs
64+
labels: dependencies
4265
author: ${{ env.BOT_AUTHOR }}
4366
committer: ${{ env.BOT_AUTHOR }}
4467
commit-message: +Mᐁ includes
4568
title: +Mᐁ includes
4669
body: +Mᐁ includes
47-
token: ${{ env.GH_TOKEN }}
70+
token: ${{ env.PR_TOKEN }}
71+
72+
- name: ⚠️ skip pull request
73+
if: env.PR_TOKEN == ''
74+
shell: bash
75+
run: echo "::warning::Skipping PR creation because neither DEVLOOPED_TOKEN nor GH_TOKEN is configured. GITHUB_TOKEN cannot create pull requests in this repository."

‎.github/workflows/publish.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
Configuration: Release
1313
PackOnBuild: true
1414
GeneratePackageOnBuild: true
15-
VersionLabel: ${{ github.ref }}
15+
VersionLabel: refs/tags/${{ github.event.release.tag_name }}
1616
GH_TOKEN: ${{ secrets.GH_TOKEN }}
1717
MSBUILDTERMINALLOGGER: auto
1818
SLEET_FEED_URL: https://api.nuget.org/v3/index.json
@@ -34,9 +34,8 @@ jobs:
3434
run: dotnet build -m:1 -bl:build.binlog
3535

3636
- name: 🧪 test
37-
run: |
38-
dotnet tool update -g dotnet-retest
39-
dotnet retest -- --no-build
37+
shell: pwsh
38+
run: dnx --yes retest -- --no-build
4039

4140
- name: 🐛 logs
4241
uses: actions/upload-artifact@v4
@@ -45,6 +44,16 @@ jobs:
4544
name: logs
4645
path: '*.binlog'
4746

47+
- name: ✅ validate
48+
shell: pwsh
49+
working-directory: bin
50+
run: |
51+
$invalid = Get-ChildItem -File -Filter "*.42.42*.nupkg"
52+
if ($invalid) {
53+
Write-Error "Found dev/local packages with disallowed 42.42* version prefix:`n$($invalid.Name -join "`n")"
54+
exit 1
55+
}
56+
4857
- name: 🚀 nuget
4958
env:
5059
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
bin
22
obj
3+
out
34
artifacts
45
pack
6+
agent-tools
7+
terminals
58
TestResults
69
results
710
BenchmarkDotNet.Artifacts
11+
mcps
812
/app
13+
/temp
914
.vs
1015
.vscode
1116
.genaiscript
1217
.idea
1318
local.settings.json
1419
.env
20+
.next
21+
*.local
1522

1623
*.suo
1724
*.sdf
@@ -25,6 +32,7 @@ local.settings.json
2532
*.binlog
2633
*.zip
2734
__azurite*.*
35+
AzuriteConfig
2836
__*__
2937

3038
.nuget

‎.netconfig‎

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[file ".gitignore"]
22
url = https://github.com/devlooped/oss/blob/main/.gitignore
3-
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
3+
sha = ff61659751374b95c7a8a0477c908a8119f756f0
44

5-
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
5+
etag = e5865f083db45081a7b4eaa518018971b34e6ef93f917ac510dea96d27f792b3
66
weak
77
[file "license.txt"]
88
url = https://github.com/devlooped/oss/blob/main/license.txt
@@ -12,21 +12,21 @@
1212
weak
1313
[file "src/Directory.Build.props"]
1414
url = https://github.com/devlooped/oss/tree/main/src/Directory.Build.props
15-
sha = 81d972fd0760c244d134dae7f4b17d6c43cb004a
15+
sha = 6e2438919e108aeb75106dc0737c45f5e55d5f42
1616

17-
etag = 1368697c1521e465a1dea88b93787b1c7def441c37d62afc903fb8d07179e4f6
17+
etag = f1d6384abf18d8d891ce5e835a10c73fe029c42151374be96d7e4af43d189c65
1818
weak
1919
[file "src/Directory.Build.targets"]
2020
url = https://github.com/devlooped/oss/tree/main/src/Directory.Build.targets
21-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
21+
sha = 3a758f47e8955c15a016b3db08f383781cbdee26
2222

23-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
23+
etag = 22005ab28676aa6d790171003057c81fe4ceec01251626385a3dcef3417ae3cd
2424
weak
2525
[file ".github/dependabot.yml"]
2626
url = https://github.com/devlooped/oss/tree/main/.github/dependabot.yml
27-
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
27+
sha = 387f0616b2c56adc4f33f2858da818f7e0d92ef3
2828

29-
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
29+
etag = a1aaba1440e5ee2a7b7f93fc0fb004d4e1d4d9780350c753f7c429e37241345a
3030
weak
3131
[file ".github/release.yml"]
3232
url = https://github.com/devlooped/oss/tree/main/.github/release.yml
@@ -42,30 +42,57 @@
4242
weak
4343
[file ".github/workflows/includes.yml"]
4444
url = https://github.com/devlooped/oss/tree/main/.github/workflows/includes.yml
45-
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
45+
sha = d571412f07b0fb3c40023dc906f64906d7ed2b46
4646

47-
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
47+
etag = ab627107749577bb619b024aff93027359b66b4c3f5a85a36b235e428387cd17
4848
weak
4949
[file ".github/workflows/build.yml"]
5050
url = https://github.com/devlooped/oss/tree/main/.github/workflows/build.yml
51-
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
51+
sha = 5da103cfbc1c4f9b5f59cfa698d2afbd744a7525
5252

53-
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
53+
etag = 851af098748f7cfa5bc3cfd4cc404a6de930532b59ceb2b3b535282c41226f3a
5454
weak
5555
[file ".github/workflows/publish.yml"]
5656
url = https://github.com/devlooped/oss/tree/main/.github/workflows/publish.yml
57-
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
57+
sha = 0ca5fd11125cd10c51b4433a86917c06ff1ae839
5858

59-
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
59+
etag = ac46ffdcef820bbc6bd32378aef25ff79713196e0a5696791abb3a804e06e4d8
6060
weak
6161
[file ".github/workflows/dotnet-env.yml"]
6262
url = https://github.com/devlooped/oss/tree/main/.github/workflows/dotnet-env.yml
63-
sha = 77e83f238196d2723640abef0c7b6f43994f9747
63+
sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff
6464

65-
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
65+
etag = 68c1e28f475ff9d05f985bf53a51fce6e64b24a8b75bd8e47119ff57309281f1
6666
weak
6767
[file "src/Smith/Extensions/System/Throw.cs"]
6868
url = https://github.com/devlooped/catbag/blob/main/System/Throw.cs
6969
sha = 3012d56be7554c483e5c5d277144c063969cada9
7070
etag = 43c81c6c6dcdf5baee40a9e3edc5e871e473e6c954c901b82bb87a3a48888ea0
7171
weak
72+
[file ".netconfig"]
73+
url = https://github.com/devlooped/oss/blob/main/.netconfig
74+
skip
75+
[file "readme.md"]
76+
url = https://github.com/devlooped/oss/blob/main/readme.md
77+
skip
78+
[file "readme.tmp.md"]
79+
url = https://github.com/devlooped/oss/blob/main/readme.tmp.md
80+
skip
81+
[file "oss.cs"]
82+
url = https://github.com/devlooped/oss/blob/main/oss.cs
83+
skip
84+
[file "Directory.Build.rsp"]
85+
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
86+
skip
87+
[file "src/kzu.snk"]
88+
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
89+
skip
90+
[file ".github/workflows/combine-prs.yml"]
91+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml
92+
skip
93+
[file ".github/workflows/dotnet-file-core.yml"]
94+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
95+
skip
96+
[file ".github/actions/dotnet/action.yml"]
97+
url = https://github.com/devlooped/oss/blob/main/.github/actions/dotnet/action.yml
98+
skip

0 commit comments

Comments
 (0)