Skip to content

Commit bd489ec

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Support using current Version from CVM devlooped/oss@2fff747 - Allow workflow to work cross-org devlooped/oss@af171b7 - 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 15be539 commit bd489ec

File tree

8 files changed

+46
-22
lines changed

8 files changed

+46
-22
lines changed

‎.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 }}

‎.netconfig‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
weak
5757
[file ".github/workflows/dotnet-file.yml"]
5858
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
59-
sha = 59aaf432369b5ea597831d4feec5a6ac4024c2e3
60-
etag = 1374e3f8c9b7af69c443605c03f7262300dcb7d783738d9eb9fe84268ed2d10c
59+
sha = 8fa147d4799d73819040736c399d0b1db2c2d86c
60+
etag = 1ca805a23656e99c03f9d478dba8ccef6e571f5de2ac0e9bb7e3c5216c99a694
6161
weak
6262
[file ".gitignore"]
6363
url = https://github.com/devlooped/oss/blob/main/.gitignore
@@ -86,8 +86,8 @@
8686
weak
8787
[file "src/Directory.Build.props"]
8888
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
89-
sha = b76de49afb376aa48eb172963ed70663b59b31d3
90-
etag = c8b56f3860cc7ccb8773b7bd6189f5c7a6e3a2c27e9104c1ee201fbdc5af9873
89+
sha = 2fff747a9673b499c99f2da183cdd5263fdc9333
90+
etag = 0fccddf04f282fe98122ab2610dc2972c205a521254559bf013655c6271b0017
9191
weak
9292
[file "src/Directory.Build.targets"]
9393
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -231,10 +231,10 @@
231231
weak
232232
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
233233
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.csproj
234-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
234+
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
235235

236236

237-
etag = 27db7c8288b721804b52a719a9218ab1198f4db5b7a7d06bce4e1770def2d4a0
237+
etag = 0d1ba307ebf2ffa53af749afc408c738566cf1a334eb7df16dc64cb243f6233d
238238
weak
239239
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
240240
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLinkAnalyzer.cs
@@ -322,10 +322,10 @@
322322
weak
323323
[file "src/SponsorLink/Tests/Tests.csproj"]
324324
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Tests.csproj
325-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
325+
sha = 2de6c983fd620ac8a268327c247f1ba4351ba29a
326326

327327

328-
etag = 7d27c17944c61da196f11f904383b25b3f40579fbeb0cacb367bf05ec184ad7f
328+
etag = 3fc99ed4d45124df055e60a0b89aedc46286c973c05859a5cada0daa0457efbd
329329
weak
330330
[file "src/SponsorLink/Tests/keys/kzu.key"]
331331
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/keys/kzu.key
@@ -374,15 +374,15 @@
374374
weak
375375
[file "src/SponsorLink/SponsorLink.Analyzer.targets"]
376376
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.targets
377-
sha = 0f551e3be564625ee4d078649c55363bf35954ba
377+
sha = 1454a8f481610a6cf33adfc6082a19421bbed43c
378378

379379

380-
etag = 7276d81830e29f8d5f3e27ee62cadaf7aef02a0162b9a05c88e1daef9cc4875e
380+
etag = 0b4028f3cbc6463257b741106186689bdc7d1b20af5d1d0075e81e6d4fbe8d7b
381381
weak
382382
[file "src/SponsorLink/SponsorLink.Analyzer.Tests.targets"]
383383
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.Tests.targets
384-
sha = df44ccc14cc11b5674c55aca9ba8596bdbcf8438
385-
etag = a3e9cbcc227dd56a7bed236eaded136f1b80f9f36a4fabce8be695ee844bf881
384+
sha = 1454a8f481610a6cf33adfc6082a19421bbed43c
385+
etag = a06c8e06228a859eb15ba9ffad88c15874048a2ee23e515029fc36a78df1349c
386386
weak
387387
[file "src/TableStorage/System/Chunk.cs"]
388388
url = https://github.com/dotnet/runtime/blob/main/src/libraries/System.Linq/src/System/Linq/Chunk.cs
@@ -415,8 +415,8 @@
415415
weak
416416
[file ".github/workflows/dotnet-file-core.yml"]
417417
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml
418-
sha = 875284ba5d565f529aba2f5d24ab8ed27c1d1c79
419-
etag = 8de1d974bf73b1945b5c8be684c3a0b7364114a0d795c9d68837aed9b3aff331
418+
sha = af171b7a87382ee665ba6fbaeb5f38a3551e1c23
419+
etag = 5ce370f52933ab2a4cd50f2b410e842fc5eab23088db2bf98b6c4d4ccdc9022b
420420
weak
421421
[file "src/nuget.config"]
422422
url = https://github.com/devlooped/oss/blob/main/src/nuget.config

‎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: 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>

‎src/SponsorLink/Tests/Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
1212
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
13-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.0" PrivateAssets="all" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.5.0" PrivateAssets="all" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1515
<PackageReference Include="ThisAssembly.Resources" Version="2.0.10" PrivateAssets="all" />
1616
<PackageReference Include="xunit" Version="2.9.3" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />

0 commit comments

Comments
 (0)