Skip to content

Commit 82cfc5a

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Use GH_TOKEN if available for PR devlooped/oss@77e83f2 - Add Company MSBuild property by default devlooped/oss@c509be4 - Ignore .env files recursively devlooped/oss@3776526 - Switch to dotnet-env for .NET SDK setup devlooped/oss@56c2b85 - Improve default Product metadata, remove .git from user-facing URLs devlooped/oss@4339749 - Group MEAI packages together devlooped/oss@e733294 - Ignore slnx file format too devlooped/oss@68b409c
1 parent 7d3114f commit 82cfc5a

File tree

10 files changed

+83
-29
lines changed

10 files changed

+83
-29
lines changed

‎.github/dependabot.yml‎

Lines changed: 5 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*"

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ env:
2727
VersionLabel: ${{ github.ref }}
2828
GH_TOKEN: ${{ secrets.GH_TOKEN }}
2929
MSBUILDTERMINALLOGGER: auto
30-
Configuration: ${{ github.event.inputs.configuration || vars.CONFIGURATION || 'Release' }}
30+
Configuration: ${{ github.event.inputs.configuration || 'Release' }}
3131
SLEET_FEED_URL: ${{ vars.SLEET_FEED_URL }}
3232

3333
defaults:
@@ -66,7 +66,7 @@ jobs:
6666
fetch-depth: 0
6767

6868
- name: ⚙ dotnet
69-
uses: ./.github/actions/dotnet
69+
uses: devlooped/actions-dotnet-env@v1
7070

7171
- name: 🙏 build
7272
run: dotnet build -m:1 -bl:build.binlog
@@ -101,12 +101,7 @@ jobs:
101101
fetch-depth: 0
102102

103103
- name: ⚙ dotnet
104-
uses: actions/setup-dotnet@v4
105-
with:
106-
dotnet-version: |
107-
6.x
108-
8.x
109-
9.x
104+
uses: devlooped/actions-dotnet-env@v1
110105

111106
- name: ✓ ensure format
112107
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/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fetch-depth: 0
2929

3030
- name: ⚙ dotnet
31-
uses: ./.github/actions/dotnet
31+
uses: devlooped/actions-dotnet-env@v1
3232

3333
- name: 🙏 build
3434
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: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
weak
3030
[file ".github/dependabot.yml"]
3131
url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
32-
sha = 917ff5486e25bec90038e7ab6d146fd82c61f846
32+
sha = e733294084fb3e75d517a2e961e87df8faae7dc6
3333

34-
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
34+
etag = 3bf8d9214a15c049ca5cfe80d212a8cbe4753b8a638a9804ef73d34c7def9618
3535
weak
3636
[file ".github/release.yml"]
3737
url = https://github.com/devlooped/oss/blob/main/.github/release.yml
@@ -41,9 +41,9 @@
4141
weak
4242
[file ".github/workflows/build.yml"]
4343
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
44-
sha = 08c70776943839f73dbea2e65355108747468508
44+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
4545

46-
etag = fb2e91cdc9fb7a4d3e8f698e525816c5d8febb35b005c278eecca8056e78f809
46+
etag = bf99c19427f4372ecfe38ec56aa8c411058684fb717da5661f17ac00388b3602
4747
weak
4848
[file ".github/workflows/changelog.config"]
4949
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.config
@@ -71,9 +71,9 @@
7171
weak
7272
[file ".github/workflows/publish.yml"]
7373
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
74-
sha = 08c70776943839f73dbea2e65355108747468508
74+
sha = 56c2b8532c2f86235a0f5bd00ba6eba126f199cf
7575

76-
etag = 722a2c7cb3a42bc24ca7fb48d2e9a336641ed0599418239e24efbafccf64bd50
76+
etag = 2ef43521627aa3a91dd55bdc2856ec0c6a93b42485d4fe9d6b181f9ee42c8e18
7777
weak
7878
[file ".github/workflows/triage.yml"]
7979
url = https://github.com/devlooped/oss/blob/main/.github/workflows/triage.yml
@@ -83,9 +83,9 @@
8383
weak
8484
[file ".gitignore"]
8585
url = https://github.com/devlooped/oss/blob/main/.gitignore
86-
sha = e0be248fff1d39133345283b8227372b36574b75
86+
sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
8787

88-
etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
88+
etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
8989
weak
9090
[file "Directory.Build.rsp"]
9191
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
@@ -95,9 +95,9 @@
9595
weak
9696
[file "_config.yml"]
9797
url = https://github.com/devlooped/oss/blob/main/_config.yml
98-
sha = fa83a5161ba52bc5d510ce0ba75ee0b1f8d4bc63
98+
sha = 68b409c486842062e0de0e5b11e6fdb7cd12d6e2
9999

100-
etag = 9139148f845adf503fd3c3c140eb64421fc476a1f9c027fc50825c0efb05f557
100+
etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010
101101
weak
102102
[file "assets/css/style.scss"]
103103
url = https://github.com/devlooped/oss/blob/main/assets/css/style.scss
@@ -113,15 +113,15 @@
113113
weak
114114
[file "src/Directory.Build.props"]
115115
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
116-
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
116+
sha = c509be4378ff6789df4f66338cb88119453c0975
117117

118-
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
118+
etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
119119
weak
120120
[file "src/Directory.Build.targets"]
121121
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
122-
sha = a8b208093599263b7f2d1fe3854634c588ea5199
122+
sha = 4339749ef4b8f66def75931df09ef99c149f8421
123123

124-
etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
124+
etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
125125
weak
126126
[file "src/nuget.config"]
127127
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
@@ -146,3 +146,8 @@
146146

147147
etag = c77e7b435ce1df06fb60a3b0e15a0833d8e45d4d19f366c6184140ebb4814b1a
148148
weak
149+
[file ".github/workflows/dotnet-env.yml"]
150+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml
151+
sha = 77e83f238196d2723640abef0c7b6f43994f9747
152+
etag = fcb9759a96966df40dcd24906fd328ddec05953b7e747a6bb8d0d1e4c3865274
153+
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' ]

‎readme.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,6 @@ OPTIONS:
438438
[![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
439439
[![Toni Wenzel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
440440
[![Uno Platform](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
441-
[![Dan Siegel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dansiegel.png "Dan Siegel")](https://github.com/dansiegel)
442441
[![Reuben Swartz](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)
443442
[![Jacob Foshee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
444443
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Mrxx99.png "")](https://github.com/Mrxx99)
@@ -449,18 +448,17 @@ OPTIONS:
449448
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
450449
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
451450
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
452-
[![sorahex](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "sorahex")](https://github.com/sorahex)
453451
[![Zheyu Shen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
454452
[![Vezel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
455453
[![ChilliCream](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ChilliCream.png "ChilliCream")](https://github.com/ChilliCream)
456454
[![4OTC](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/4OTC.png "4OTC")](https://github.com/4OTC)
457455
[![Vincent Limo](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/v-limo.png "Vincent Limo")](https://github.com/v-limo)
458456
[![Jordan S. Jones](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jordansjones.png "Jordan S. Jones")](https://github.com/jordansjones)
459457
[![domischell](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/DominicSchell.png "domischell")](https://github.com/DominicSchell)
460-
[![Mauricio Scheffer](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mausch.png "Mauricio Scheffer")](https://github.com/mausch)
461458
[![Justin Wendlandt](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jwendl.png "Justin Wendlandt")](https://github.com/jwendl)
462459
[![Adrian Alonso](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/adalon.png "Adrian Alonso")](https://github.com/adalon)
463460
[![Michael Hagedorn](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Eule02.png "Michael Hagedorn")](https://github.com/Eule02)
461+
[![torutek](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/torutek.png "torutek")](https://github.com/torutek)
464462
465463
466464
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 3 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>

‎src/Directory.Build.targets‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@
165165

166166
<PropertyGroup>
167167
<RepositoryRoot>@(_GitSourceRoot)</RepositoryRoot>
168+
<!-- Only change if it wasn't just the default from Microsoft.NET.DefaultAssemblyInfo.targets -->
169+
<ProductFromUrl Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">$([System.IO.Path]::GetFileNameWithoutExtension($(PrivateRepositoryUrl)))</ProductFromUrl>
170+
<Product Condition="'$(Product)' == '$(AssemblyName)' and '$(ProductFromUrl)' != ''">$(ProductFromUrl)</Product>
168171
</PropertyGroup>
169172

170173
</Target>
@@ -175,9 +178,9 @@
175178
Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
176179
'$(IsPackable)' == 'true'">
177180
<PropertyGroup>
178-
<PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl)</PackageProjectUrl>
181+
<PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl.Replace('.git', ''))</PackageProjectUrl>
179182
<PackageDescription>$(Description)</PackageDescription>
180-
<PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl)/blob/main/changelog.md</PackageReleaseNotes>
183+
<PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl.Replace('.git', ''))/blob/main/changelog.md</PackageReleaseNotes>
181184
</PropertyGroup>
182185
</Target>
183186

0 commit comments

Comments
 (0)