Skip to content

Commit 65b7f8c

Browse files
devlooped-botkzu
authored andcommitted
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Attempt to get necessary permissions for default token devlooped/oss@85829f2 - Switch back to latest stable includes devlooped/oss@875284b - Make sure all stable versions are available for build/test devlooped/oss@06e898c - Update nuget.config with new(ish?) MS certs devlooped/oss@032439d - Point to main for dotnet-file sync workflow devlooped/oss@59aaf43 # devlooped/SponsorLink - Bump nuget dependencies for the dotnet analyzer sample devlooped/SponsorLink@0f551e3 - Remove workaround for previous buggy targets from TA devlooped/SponsorLink@8f0e621 - Fix overwriting of $(FundingPackageId) in targets devlooped/SponsorLink@697e210
1 parent b3fffdb commit 65b7f8c

File tree

15 files changed

+199
-50
lines changed

15 files changed

+199
-50
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ jobs:
6464
submodules: recursive
6565
fetch-depth: 0
6666

67+
- name: ⚙ dotnet
68+
uses: actions/setup-dotnet@v4
69+
with:
70+
dotnet-version: |
71+
6.x
72+
8.x
73+
9.x
74+
6775
- name: 🙏 build
6876
run: dotnet build -m:1 -bl:build.binlog
6977

@@ -73,7 +81,7 @@ jobs:
7381
dotnet retest -- --no-build
7482
7583
- name: 🐛 logs
76-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
7785
if: runner.debug && always()
7886
with:
7987
name: logs
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# Synchronizes .netconfig-configured files with dotnet-file
2+
name: dotnet-file-core
3+
on:
4+
workflow_call:
5+
6+
env:
7+
DOTNET_NOLOGO: true
8+
9+
defaults:
10+
run:
11+
shell: pwsh
12+
13+
jobs:
14+
sync:
15+
runs-on: ubuntu-latest
16+
continue-on-error: true
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+
fetch-depth: 0
30+
ref: main
31+
token: ${{ env.GH_TOKEN }}
32+
33+
- name: ⌛ rate
34+
if: github.event_name != 'workflow_dispatch'
35+
run: |
36+
# add random sleep since we run on fixed schedule
37+
sleep (get-random -max 60)
38+
# get currently authenticated user rate limit info
39+
$rate = gh api rate_limit | convertfrom-json | select -expandproperty rate
40+
# if we don't have at least 100 requests left, wait until reset
41+
if ($rate.remaining -lt 10) {
42+
$wait = ($rate.reset - (Get-Date (Get-Date).ToUniversalTime() -UFormat %s))
43+
echo "Rate limit remaining is $($rate.remaining), waiting for $($wait / 1000) seconds to reset"
44+
sleep $wait
45+
$rate = gh api rate_limit | convertfrom-json | select -expandproperty rate
46+
echo "Rate limit has reset to $($rate.remaining) requests"
47+
}
48+
49+
- name: 🔄 sync
50+
run: |
51+
dotnet tool update -g dotnet-gcm
52+
# store credentials in plaintext for linux compat
53+
git config --local credential.credentialStore plaintext
54+
dotnet gcm store --protocol=https --host=github.com --username=$env:GITHUB_ACTOR --password=$env:GH_TOKEN
55+
gh auth status
56+
57+
dotnet tool update -g dotnet-file
58+
$changelog = "$([System.IO.Path]::GetTempPath())dotnet-file.md"
59+
dotnet file sync -c:$changelog
60+
if (test-path $changelog) {
61+
echo 'CHANGES<<EOF' >> $env:GITHUB_ENV
62+
cat $changelog >> $env:GITHUB_ENV
63+
echo 'EOF' >> $env:GITHUB_ENV
64+
cat $changelog
65+
} else {
66+
echo 'No changelog was generated'
67+
}
68+
69+
- name: +Mᐁ includes
70+
uses: devlooped/actions-includes@v1
71+
with:
72+
validate: false
73+
74+
- name: ✍ pull request
75+
uses: peter-evans/create-pull-request@v7
76+
with:
77+
base: main
78+
branch: dotnet-file-sync
79+
delete-branch: true
80+
labels: dependencies
81+
author: ${{ env.BOT_AUTHOR }}
82+
committer: ${{ env.BOT_AUTHOR }}
83+
commit-message: ⬆️ Bump files with dotnet-file sync
84+
85+
${{ env.CHANGES }}
86+
title: "⬆️ Bump files with dotnet-file sync"
87+
body: ${{ env.CHANGES }}
88+
token: ${{ env.GH_TOKEN }}

.github/workflows/includes.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
jobs:
1212
includes:
1313
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
pull-requests: write
1417
steps:
1518
- name: 🤖 defaults
1619
uses: devlooped/actions-bot@v1

.github/workflows/publish.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ jobs:
2626
submodules: recursive
2727
fetch-depth: 0
2828

29+
- name: ⚙ dotnet
30+
uses: actions/setup-dotnet@v4
31+
with:
32+
dotnet-version: |
33+
6.x
34+
8.x
35+
9.x
36+
2937
- name: 🙏 build
3038
run: dotnet build -m:1 -bl:build.binlog
3139

@@ -35,7 +43,7 @@ jobs:
3543
dotnet retest -- --no-build
3644
3745
- name: 🐛 logs
38-
uses: actions/upload-artifact@v3
46+
uses: actions/upload-artifact@v4
3947
if: runner.debug && always()
4048
with:
4149
name: logs

.netconfig

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
weak
4343
[file ".github/workflows/build.yml"]
4444
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
45-
sha = 5e17ad62ebb5241555a7a4d29e3ab15e5ba120d2
45+
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
4646

47-
etag = f358acb1e45596bf0aad49996017da44939de30b805289c4ad205a7ccb6f99cb
47+
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
4848
weak
4949
[file ".github/workflows/changelog.yml"]
5050
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -54,21 +54,21 @@
5454
weak
5555
[file ".github/workflows/dotnet-file.yml"]
5656
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
57-
sha = 7afe350f7e80a230e922db026d4e1198ba15cae1
57+
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
5858

59-
etag = 65e9794df6caff779eb989c8f71ddf4d4109b24a75af79e4f8d0fe6ba7bd9702
59+
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
6060
weak
6161
[file ".github/workflows/includes.yml"]
6262
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
63-
sha = d152e7437fd0d6f6d9363d23cb3b78c07335ea49
63+
sha = 85829f2510f335f4a411867f3dbaaa116c3ab3de
6464

65-
etag = ec40db34f379d0c6d83b2ec15624f330318a172cc4f85b5417c63e86eaf601df
65+
etag = 086f6b6316cc6ea7089c0dcc6980be519e6ed6e6201e65042ef41b82634ec0ee
6666
weak
6767
[file ".github/workflows/publish.yml"]
6868
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
69-
sha = 5e17ad62ebb5241555a7a4d29e3ab15e5ba120d2
69+
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
7070

71-
etag = 2cc96046d8f28e7cbcde89ed56d3d89e1a70fb0de7846ee1827bee66b7dfbcf1
71+
etag = 2f64f75ad01f735fd05290370fb8a826111ac8dd7e74ce04226bb627a54a62ba
7272
weak
7373
[file ".gitignore"]
7474
url = https://github.com/devlooped/oss/blob/main/.gitignore
@@ -141,9 +141,9 @@
141141
url = https://github.com/devlooped/SponsorLink/tree/main/samples/dotnet/
142142
[file "src/SponsorLink/Analyzer/Analyzer.csproj"]
143143
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Analyzer/Analyzer.csproj
144-
sha = e55425333883c4470d745f8fee70bdf204c292ee
144+
sha = 8f0e6216360f3f8700b4845f3ec2310aabd996f3
145145

146-
etag = 8aa140018fcfbd889c11da36c8c21b5cfb5730c07aa3317d734b118cfa60b416
146+
etag = 671a82f0f6770a990f9364ecf321eeea75bd6092f98c009039af02df172152df
147147
weak
148148
[file "src/SponsorLink/Analyzer/GraceApiAnalyzer.cs"]
149149
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Analyzer/GraceApiAnalyzer.cs
@@ -189,9 +189,9 @@
189189
weak
190190
[file "src/SponsorLink/Library/Library.csproj"]
191191
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Library/Library.csproj
192-
sha = f74ea7a8c7f81c5bceefb3ed7ef4249b1d8574a3
192+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
193193

194-
etag = 592707adba548606ec50ced6e424be4cbfe34f18bf01555a19b29fa61efa416a
194+
etag = 1ba2df85e2aae342f575b9ea08c38b2117f43c131b24d38082d1d4394716f3d0
195195
weak
196196
[file "src/SponsorLink/Library/MyClass.cs"]
197197
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Library/MyClass.cs
@@ -221,11 +221,11 @@
221221
weak
222222
[file "src/SponsorLink/SponsorLink.Analyzer.targets"]
223223
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.targets
224-
sha = fb82cf346cea86140a51ae49b9bc730d72f7c7ac
224+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
225225

226226

227227

228-
etag = 284f794d03adabf10ac5e25ef87d257821a82eac112efe65d6fe23d675f9af7f
228+
etag = 7276d81830e29f8d5f3e27ee62cadaf7aef02a0162b9a05c88e1daef9cc4875e
229229
weak
230230
[file "src/SponsorLink/SponsorLink/AnalyzerOptionsExtensions.cs"]
231231
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/AnalyzerOptionsExtensions.cs
@@ -278,10 +278,10 @@
278278
weak
279279
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
280280
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.csproj
281-
sha = 0d22f1ee7d7afc93e11060887de0e1773884978e
281+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
282282

283283

284-
etag = dbf30ffb9baa63e45a4c821bc1433e4289b9af84855c2a306eaa116874a1c9f2
284+
etag = 27db7c8288b721804b52a719a9218ab1198f4db5b7a7d06bce4e1770def2d4a0
285285
weak
286286
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
287287
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLinkAnalyzer.cs
@@ -309,9 +309,9 @@
309309
weak
310310
[file "src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets"]
311311
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/buildTransitive/Devlooped.Sponsors.targets
312-
sha = d7090c1dbcb20c68b99486a6dc53d86b8d9b06bb
312+
sha = 697e210b68c7d6f0ececca7673d13f4309df6cd7
313313

314-
etag = e992b97517c9bcc6c9e927832bc13fac3036fa6d4ecaad893caf320b3c582aee
314+
etag = e2cb4d1bbf4096f4b3fcfa0b20abccb33520442b656f19e01e5da928fd927da8
315315
weak
316316
[file "src/SponsorLink/SponsorLink/sponsorable.md"]
317317
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/sponsorable.md
@@ -333,9 +333,9 @@
333333
weak
334334
[file "src/SponsorLink/Tests/AnalyzerTests.cs"]
335335
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/AnalyzerTests.cs
336-
sha = 29921560c73bb91c2a21a21800daf0b250773598
336+
sha = 697e210b68c7d6f0ececca7673d13f4309df6cd7
337337

338-
etag = 219df696a47a58d9de377166c87fbb199c84c33d3b7a0f7ae349543df050a583
338+
etag = 44ef3022d2ebe1251896542b697baa9dcef9b9805b68845ccc9d0ff0181ba9d1
339339
weak
340340
[file "src/SponsorLink/Tests/Attributes.cs"]
341341
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Attributes.cs
@@ -381,10 +381,10 @@
381381
weak
382382
[file "src/SponsorLink/Tests/Tests.csproj"]
383383
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Tests.csproj
384-
sha = 0d22f1ee7d7afc93e11060887de0e1773884978e
384+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
385385

386386

387-
etag = 5db4da024e4ecfb90be14feb4db952efa2109ee2ec84e715921291808d57b749
387+
etag = 7d27c17944c61da196f11f904383b25b3f40579fbeb0cacb367bf05ec184ad7f
388388
weak
389389
[file "src/SponsorLink/Tests/keys/kzu.key"]
390390
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/keys/kzu.key
@@ -436,7 +436,17 @@
436436
weak
437437
[file "src/SponsorLink/readme.md"]
438438
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/readme.md
439-
sha = 7407f5b3461213ae764f53ee93651a34487e458c
439+
sha = 697e210b68c7d6f0ececca7673d13f4309df6cd7
440440

441-
etag = 50937c64732bb2b97ddc67cc7b7b2d091c51390c9f5f2b5fdcfe9f1becb5d838
441+
etag = 3f3bb07d204d2539d90a28145653c4b48c1f373d7186b39d2593338cebcd3299
442+
weak
443+
[file ".github/workflows/dotnet-file-core.yml"]
444+
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
445+
sha = 875284ba5d565f529aba2f5d24ab8ed27c1d1c79
446+
etag = 8de1d974bf73b1945b5c8be684c3a0b7364114a0d795c9d68837aed9b3aff331
447+
weak
448+
[file "src/nuget.config"]
449+
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
450+
sha = 032439dbf180fca0539a5bd3a019f18ab3484b76
451+
etag = da7c0104131bd474b52fc9bc9f9bda6470e24ae38d4fb9f5c4f719bc01370ab5
442452
weak

readme.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ The versioning scheme for packages is:
313313

314314
<!-- sponsors.md -->
315315
[![Clarius Org](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/clarius.png "Clarius Org")](https://github.com/clarius)
316-
[![Kirill Osenkov](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KirillOsenkov.png "Kirill Osenkov")](https://github.com/KirillOsenkov)
317316
[![MFB Technologies, Inc.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MFB-Technologies-Inc.png "MFB Technologies, Inc.")](https://github.com/MFB-Technologies-Inc)
318317
[![Torutek](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/torutek-gh.png "Torutek")](https://github.com/torutek-gh)
319318
[![DRIVE.NET, Inc.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/drivenet.png "DRIVE.NET, Inc.")](https://github.com/drivenet)

src/SponsorLink/Analyzer/Analyzer.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="NuGetizer" Version="1.2.3" />
17+
<PackageReference Include="NuGetizer" Version="1.2.4" />
1818
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" Pack="false" />
19-
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
20-
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.4.3" PrivateAssets="all" />
21-
<PackageReference Include="ThisAssembly.Git" Version="1.4.3" PrivateAssets="all" />
22-
<PackageReference Include="ThisAssembly.Constants" Version="1.4.3" PrivateAssets="all" />
23-
<PackageReference Include="ThisAssembly.Project" Version="1.4.3" PrivateAssets="all" />
19+
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
20+
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="2.0.11" PrivateAssets="all" />
2421
</ItemGroup>
2522

2623
<ItemGroup>

src/SponsorLink/Library/Library.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="NuGetizer" Version="1.2.3" />
14+
<PackageReference Include="NuGetizer" Version="1.2.4" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

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.2.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
88-
<PackageReference Include="ILRepack" Version="2.0.35" VersionOverride="all" PrivateAssets="all" Pack="false" />
87+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" VersionOverride="8.4.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.2.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
95-
<PackageReference Include="ILRepack" Version="2.0.35" PrivateAssets="all" Pack="false" />
94+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.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">

src/SponsorLink/SponsorLink/SponsorLink.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
<ItemGroup>
2525
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
2626
<PackageReference Include="Humanizer.Core.es" Version="2.14.1" />
27-
<PackageReference Include="ILRepack" Version="2.0.35" PrivateAssets="all" />
28-
<PackageReference Include="NuGetizer" Version="1.2.3" />
27+
<PackageReference Include="ILRepack" Version="2.0.37" PrivateAssets="all" />
28+
<PackageReference Include="NuGetizer" Version="1.2.4" />
2929
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" Pack="false" />
30-
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
31-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" PrivateAssets="all" />
30+
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
31+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.0" PrivateAssets="all" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

0 commit comments

Comments
 (0)