Skip to content

Commit 3663a4d

Browse files
devlooped-botkzu
devlooped-bot
authored and
kzu
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Support using current Version from CVM devlooped/oss@2fff747 - Make sure the feed url is available to msbuild devlooped/oss@931da83 - Allow workflow to work cross-org devlooped/oss@af171b7 - Add explicit write permissions from caller workflow devlooped/oss@8fa147d # devlooped/SponsorLink - Bump dependency in analyzer targets too devlooped/SponsorLink@1454a8f - Bump Microsoft.IdentityModel.JsonWebTokens devlooped/SponsorLink@2de6c98
1 parent 65b7f8c commit 3663a4d

File tree

11 files changed

+62
-30
lines changed

11 files changed

+62
-30
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 0 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:
@@ -104,6 +105,14 @@ jobs:
104105
submodules: recursive
105106
fetch-depth: 0
106107

108+
- name: ⚙ dotnet
109+
uses: actions/setup-dotnet@v4
110+
with:
111+
dotnet-version: |
112+
6.x
113+
8.x
114+
9.x
115+
107116
- name: ✓ ensure format
108117
run: |
109118
dotnet format whitespace --verify-no-changes -v:diag --exclude ~/.nuget

‎.github/workflows/dotnet-file-core.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
name: dotnet-file-core
33
on:
44
workflow_call:
5+
secrets:
6+
BOT_NAME:
7+
required: false
8+
BOT_EMAIL:
9+
required: false
10+
GH_TOKEN:
11+
required: false
512

613
env:
714
DOTNET_NOLOGO: true

‎.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: 2 additions & 1 deletion
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: ${{ vars.SLEET_FEED_URL }}
19+
1920
jobs:
2021
publish:
2122
runs-on: ${{ vars.PUBLISH_AGENT || 'ubuntu-latest' }}

‎.netconfig‎

Lines changed: 18 additions & 18 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 = 06e898ccba692566ebf845fa7c8833ac6c318c0a
45+
sha = 931da830a361d69b419887a0edbb424517ca75fc
4646

47-
etag = 0a4b3f0a875cd8c9434742b4046558aecf610d3fa3d490cfd2099266e95e9195
47+
etag = ea785d08ab67abc57629649b0a418a515dc58248de12668f3616908873f8ecc6
4848
weak
4949
[file ".github/workflows/changelog.yml"]
5050
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
@@ -54,9 +54,9 @@
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 = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
57+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
5858

59-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
59+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
6060
weak
6161
[file ".github/workflows/includes.yml"]
6262
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
@@ -66,9 +66,9 @@
6666
weak
6767
[file ".github/workflows/publish.yml"]
6868
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
69-
sha = 06e898ccba692566ebf845fa7c8833ac6c318c0a
69+
sha = 931da830a361d69b419887a0edbb424517ca75fc
7070

71-
etag = 2f64f75ad01f735fd05290370fb8a826111ac8dd7e74ce04226bb627a54a62ba
71+
etag = 62a13b8b34b1b265cdc045bf7ea001dee7bdc184cba7abfea5fe77283cf419a6
7272
weak
7373
[file ".gitignore"]
7474
url = https://github.com/devlooped/oss/blob/main/.gitignore
@@ -99,9 +99,9 @@
9999
weak
100100
[file "src/Directory.Build.props"]
101101
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
102-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
102+
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
103103

104-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
104+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
105105
weak
106106
[file "src/Directory.Build.targets"]
107107
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -213,19 +213,19 @@
213213
weak
214214
[file "src/SponsorLink/SponsorLink.Analyzer.Tests.targets"]
215215
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.Tests.targets
216-
sha = df44ccc14cc11b5674c55aca9ba8596bdbcf8438
216+
sha = 1454a8f481610a6cf33adfc6082a19421bbed43c
217217

218218

219219

220-
etag = a3e9cbcc227dd56a7bed236eaded136f1b80f9f36a4fabce8be695ee844bf881
220+
etag = a06c8e06228a859eb15ba9ffad88c15874048a2ee23e515029fc36a78df1349c
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 = 0f551e3be564625ee4d078649c55363bf35954ba
224+
sha = 1454a8f481610a6cf33adfc6082a19421bbed43c
225225

226226

227227

228-
etag = 7276d81830e29f8d5f3e27ee62cadaf7aef02a0162b9a05c88e1daef9cc4875e
228+
etag = 0b4028f3cbc6463257b741106186689bdc7d1b20af5d1d0075e81e6d4fbe8d7b
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 = 0f551e3be564625ee4d078649c55363bf35954ba
281+
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
282282

283283

284-
etag = 27db7c8288b721804b52a719a9218ab1198f4db5b7a7d06bce4e1770def2d4a0
284+
etag = 0d1ba307ebf2ffa53af749afc408c738566cf1a334eb7df16dc64cb243f6233d
285285
weak
286286
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
287287
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLinkAnalyzer.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 = 0f551e3be564625ee4d078649c55363bf35954ba
384+
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
385385

386386

387-
etag = 7d27c17944c61da196f11f904383b25b3f40579fbeb0cacb367bf05ec184ad7f
387+
etag = 3fc99ed4d45124df055e60a0b89aedc46286c973c05859a5cada0daa0457efbd
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
@@ -442,8 +442,8 @@
442442
weak
443443
[file ".github/workflows/dotnet-file-core.yml"]
444444
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
445-
sha = 875284ba5d565f529aba2f5d24ab8ed27c1d1c79
446-
etag = 8de1d974bf73b1945b5c8be684c3a0b7364114a0d795c9d68837aed9b3aff331
445+
sha = af171b7a87382ee665ba6fbaeb5f38a3551e1c23
446+
etag = 5ce370f52933ab2a4cd50f2b410e842fc5eab23088db2bf98b6c4d4ccdc9022b
447447
weak
448448
[file "src/nuget.config"]
449449
url = https://github.com/devlooped/oss/blob/main/src/nuget.config

‎readme.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ The versioning scheme for packages is:
331331
[![Jonathan ](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
332332
[![Charley Wu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/akunzai.png "Charley Wu")](https://github.com/akunzai)
333333
[![Jakob Tikjøb Andersen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jakobt.png "Jakob Tikjøb Andersen")](https://github.com/jakobt)
334-
[![Tino Hager](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tinohager.png "Tino Hager")](https://github.com/tinohager)
335334
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
336335
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
337336
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)

‎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: 3 additions & 4 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">
@@ -42,8 +42,7 @@
4242
<NetStandard>$([MSBuild]::ValueOrDefault('%(FullPath)', '').Replace('net6.0', 'netstandard2.0').Replace('net8.0', 'netstandard2.0').Replace('netcoreapp3.1', 'netstandard2.0'))</NetStandard>
4343
</UniqueCandidateAnalyzer>
4444
<!-- Analyzer assemblies cannot target anything other than NS2.0 -->
45-
<Analyzer Include="@(UniqueCandidateAnalyzer -> '%(NetStandard)')" Condition="Exists('%(UniqueCandidateAnalyzer.NetStandard)')"
46-
NuGetPackageId="$(FundingPackageId)"/>
45+
<Analyzer Include="@(UniqueCandidateAnalyzer -> '%(NetStandard)')" Condition="Exists('%(UniqueCandidateAnalyzer.NetStandard)')"/>
4746
</ItemGroup>
4847
</Target>
4948

‎src/SponsorLink/SponsorLink.Analyzer.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@
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)" />
87+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" VersionOverride="8.5.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
8888
<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)" />
94+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.5.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
9595
<PackageReference Include="ILRepack" Version="2.0.37" PrivateAssets="all" Pack="false" />
9696
</ItemGroup>
9797

‎src/SponsorLink/SponsorLink/SponsorLink.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PackageReference Include="NuGetizer" Version="1.2.4" />
2929
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" Pack="false" />
3030
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
31-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.0" PrivateAssets="all" />
31+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.5.0" PrivateAssets="all" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

0 commit comments

Comments
 (0)