Skip to content

Commit 7d5aa96

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Move dotnet setup to composite action devlooped/oss@08c7077 - Support using current Version from CVM devlooped/oss@2fff747 - Group Spectre.Console updates devlooped/oss@917ff54 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d # devlooped/SponsorLink - Bump Microsoft.IdentityModel.JsonWebTokens devlooped/SponsorLink@2de6c98 - Bump dependency in analyzer targets too devlooped/SponsorLink@1454a8f
1 parent 73ac578 commit 7d5aa96

File tree

12 files changed

+84
-48
lines changed

12 files changed

+84
-48
lines changed

‎.github/actions/dotnet/action.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
echo "versions=$VERSIONS" >> $GITHUB_OUTPUT
13+
14+
- name: ⚙ dotnet
15+
if: steps.dotnet.outputs.versions != ''
16+
uses: actions/setup-dotnet@v4
17+
with:
18+
dotnet-version: ${{ 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 & 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: ./.github/actions/dotnet
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,14 @@ jobs:
106100
submodules: recursive
107101
fetch-depth: 0
108102

103+
- name: ⚙ dotnet
104+
uses: actions/setup-dotnet@v4
105+
with:
106+
dotnet-version: |
107+
6.x
108+
8.x
109+
9.x
110+
109111
- name: ✓ ensure format
110112
run: |
111113
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 & 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: ./.github/actions/dotnet
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: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
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 = 917ff5486e25bec90038e7ab6d146fd82c61f846
37+
etag = 50bf50df5a6eeb1705baea50f4c6e06d167a89cb5a590887ff939bd4120bd442
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 = 08c70776943839f73dbea2e65355108747468508
42+
etag = fb2e91cdc9fb7a4d3e8f698e525816c5d8febb35b005c278eecca8056e78f809
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 = 08c70776943839f73dbea2e65355108747468508
57+
etag = 722a2c7cb3a42bc24ca7fb48d2e9a336641ed0599418239e24efbafccf64bd50
5858
weak
5959
[file ".gitignore"]
6060
url = https://github.com/devlooped/oss/blob/main/.gitignore
@@ -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 = 2fff747a9673b499c99f2da183cdd5263fdc9333
87+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
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 = 1454a8f481610a6cf33adfc6082a19421bbed43c
202202

203-
etag = a3e9cbcc227dd56a7bed236eaded136f1b80f9f36a4fabce8be695ee844bf881
203+
etag = a06c8e06228a859eb15ba9ffad88c15874048a2ee23e515029fc36a78df1349c
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 = 1454a8f481610a6cf33adfc6082a19421bbed43c
208208

209-
etag = 7276d81830e29f8d5f3e27ee62cadaf7aef02a0162b9a05c88e1daef9cc4875e
209+
etag = 0b4028f3cbc6463257b741106186689bdc7d1b20af5d1d0075e81e6d4fbe8d7b
210210
weak
211211
[file "src/SponsorLink/SponsorLink/AnalyzerOptionsExtensions.cs"]
212212
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/AnalyzerOptionsExtensions.cs
@@ -258,9 +258,9 @@
258258
weak
259259
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
260260
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.csproj
261-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
261+
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
262262

263-
etag = 27db7c8288b721804b52a719a9218ab1198f4db5b7a7d06bce4e1770def2d4a0
263+
etag = 0d1ba307ebf2ffa53af749afc408c738566cf1a334eb7df16dc64cb243f6233d
264264
weak
265265
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
266266
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLinkAnalyzer.cs
@@ -360,9 +360,9 @@
360360
weak
361361
[file "src/SponsorLink/Tests/Tests.csproj"]
362362
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Tests.csproj
363-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
363+
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
364364

365-
etag = 7d27c17944c61da196f11f904383b25b3f40579fbeb0cacb367bf05ec184ad7f
365+
etag = 3fc99ed4d45124df055e60a0b89aedc46286c973c05859a5cada0daa0457efbd
366366
weak
367367
[file "src/SponsorLink/Tests/keys/kzu.key"]
368368
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/keys/kzu.key
@@ -423,3 +423,8 @@
423423
sha = 032439dbf180fca0539a5bd3a019f18ab3484b76
424424
etag = da7c0104131bd474b52fc9bc9f9bda6470e24ae38d4fb9f5c4f719bc01370ab5
425425
weak
426+
[file ".github/actions/dotnet/action.yml"]
427+
url = https://github.com/devlooped/oss/blob/main/.github/actions/dotnet/action.yml
428+
sha = 08c70776943839f73dbea2e65355108747468508
429+
etag = a5f1fa7f652cc2c2e13b7c236e5f8403aea26667d6a040c84ef976af267af6ab
430+
weak

‎readme.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ await serverChannel.SendAsync(request);
225225
[![David JENNI](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davidjenni.png "David JENNI")](https://github.com/davidjenni)
226226
[![Jonathan ](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
227227
[![Charley Wu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/akunzai.png "Charley Wu")](https://github.com/akunzai)
228-
[![Jakob Tikjøb Andersen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jakobt.png "Jakob Tikjøb Andersen")](https://github.com/jakobt)
229-
[![Tino Hager](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tinohager.png "Tino Hager")](https://github.com/tinohager)
230228
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
231229
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
232230
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
@@ -238,7 +236,6 @@ await serverChannel.SendAsync(request);
238236
[![Vincent Limo](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/v-limo.png "Vincent Limo")](https://github.com/v-limo)
239237
[![Jordan S. Jones](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jordansjones.png "Jordan S. Jones")](https://github.com/jordansjones)
240238
[![domischell](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/DominicSchell.png "domischell")](https://github.com/DominicSchell)
241-
[![Joseph Kingry](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jkingry.png "Joseph Kingry")](https://github.com/jkingry)
242239

243240

244241
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,18 @@
153153
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
154154
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
155155

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

‎src/SponsorLink/SponsorLink.Analyzer.Tests.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
<ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
99
<PackageReference Include="Humanizer.Core" VersionOverride="2.14.1" PrivateAssets="all" Pack="false" />
10-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" PrivateAssets="all" Pack="false" />
10+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.5.0" PrivateAssets="all" Pack="false" />
1111
</ItemGroup>
1212

1313
<ItemGroup Condition="'$(ManagePackageVersionsCentrally)' != 'true'">
1414
<PackageReference Include="Humanizer.Core" Version="2.14.1" PrivateAssets="all" Pack="false" />
15-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" PrivateAssets="all" Pack="false" />
15+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.5.0" PrivateAssets="all" Pack="false" />
1616
</ItemGroup>
1717

1818
<Target Name="AddSponsorLinkAnalyzerDependencies" BeforeTargets="CoreCompile" DependsOnTargets="ResolveLockFileCopyLocalFiles">

‎src/SponsorLink/SponsorLink.Analyzer.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@
8484
<ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
8585
<PackageReference Include="Humanizer.Core" VersionOverride="2.14.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
8686
<PackageReference Include="Humanizer.Core.es" VersionOverride="2.14.1" PrivateAssets="all" />
87-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" VersionOverride="8.4.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
88-
<PackageReference Include="ILRepack" Version="2.0.40" VersionOverride="all" PrivateAssets="all" Pack="false" />
87+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" VersionOverride="8.5.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
88+
<PackageReference Include="ILRepack" Version="2.0.37" VersionOverride="all" PrivateAssets="all" Pack="false" />
8989
</ItemGroup>
9090

9191
<ItemGroup Condition="'$(ManagePackageVersionsCentrally)' != 'true'">
9292
<PackageReference Include="Humanizer.Core" Version="2.14.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
9393
<PackageReference Include="Humanizer.Core.es" Version="2.14.1" PrivateAssets="all" />
94-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
95-
<PackageReference Include="ILRepack" Version="2.0.40" PrivateAssets="all" Pack="false" />
94+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.5.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
95+
<PackageReference Include="ILRepack" Version="2.0.37" PrivateAssets="all" Pack="false" />
9696
</ItemGroup>
9797

9898
<Target Name="EmitFunding" BeforeTargets="CompileDesignTime;CoreCompile" Inputs="$(MSBuildAllProjects)" Outputs="$(IntermediateOutputPath)SponsorLink.g.cs">

0 commit comments

Comments
 (0)