Skip to content

Commit 46e2e0e

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - Allow logo.png as a PackageIcon fallback for nugetizer and SDK pack. devlooped/oss@59861dd - Disable warning on packing non-packable projects devlooped/oss@320a5c5 - Update actions-includes version to v2 devlooped/oss@d571412 - Update cron schedule in triage workflow devlooped/oss@5ee8c91 - feat: add validation step to check for disallowed package versions in publish workflow devlooped/oss@0ca5fd1
1 parent 096e2b1 commit 46e2e0e

8 files changed

Lines changed: 48 additions & 23 deletions

File tree

‎.github/workflows/includes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
token: ${{ env.PR_TOKEN || github.token }}
3333

3434
- name: +Mᐁ includes
35-
uses: devlooped/actions-includes@v1
35+
uses: devlooped/actions-includes@v2
3636

3737
- name: 📝 OSMF EULA
3838
shell: pwsh

‎.github/workflows/publish.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
Configuration: Release
1313
PackOnBuild: true
1414
GeneratePackageOnBuild: true
15-
VersionLabel: ${{ github.ref }}
15+
VersionLabel: refs/tags/${{ github.event.release.tag_name }}
1616
GH_TOKEN: ${{ secrets.GH_TOKEN }}
1717
MSBUILDTERMINALLOGGER: auto
1818
SLEET_FEED_URL: https://api.nuget.org/v3/index.json
@@ -44,6 +44,16 @@ jobs:
4444
name: logs
4545
path: '*.binlog'
4646

47+
- name: ✅ validate
48+
shell: pwsh
49+
working-directory: bin
50+
run: |
51+
$invalid = Get-ChildItem -File -Filter "*.42.42*.nupkg"
52+
if ($invalid) {
53+
Write-Error "Found dev/local packages with disallowed 42.42* version prefix:`n$($invalid.Name -join "`n")"
54+
exit 1
55+
}
56+
4757
- name: 🚀 nuget
4858
env:
4959
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

‎.github/workflows/triage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 'triage'
22
on:
33
schedule:
4-
- cron: '42 0 * * *'
4+
- cron: '42 0 1,15 * *'
55

66
workflow_dispatch:
77
# Manual triggering through the GitHub UI, API, or CLI
@@ -104,4 +104,4 @@ jobs:
104104
closeDays: ${{ fromJson(inputs.daysBeforeClose || 30) }}
105105
closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity.\n\nHappy Coding!"
106106
pingDays: 80
107-
pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information."
107+
pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information."

‎.netconfig‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
weak
5050
[file "src/Directory.Build.props"]
5151
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
52-
sha = 6e2438919e108aeb75106dc0737c45f5e55d5f42
52+
sha = 59861ddd1e330f3da410652b4c7fc6585726c0cf
5353

54-
etag = f1d6384abf18d8d891ce5e835a10c73fe029c42151374be96d7e4af43d189c65
54+
etag = 1561f1be53cc25ac0cd85a06b3f65d69764b174d0f60bf72ca2f8fc70573b75e
5555
weak
5656
[file "src/Directory.Build.targets"]
5757
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
58-
sha = c67952501337303eda0fb8b340cb7606666abd8f
58+
sha = 59861ddd1e330f3da410652b4c7fc6585726c0cf
5959

60-
etag = cb83faed0cc8b930a7b6bdc61bea03a54059858cf04353e55fee94d9e3ae0fad
60+
etag = cb1f7a3e5bf85e7307407b7b6d8b9869330e2191a2317ccf6218a552e5890b08
6161
weak
6262
[file "src/nuget.config"]
6363
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
@@ -99,16 +99,16 @@
9999
skip
100100
[file ".github/workflows/includes.yml"]
101101
url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml
102-
sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff
102+
sha = d571412f07b0fb3c40023dc906f64906d7ed2b46
103103

104-
etag = 5e6a10be141ee629201bfad01eae09b5c36a67f541ec7ab411ae400b5d73de1d
104+
etag = ab627107749577bb619b024aff93027359b66b4c3f5a85a36b235e428387cd17
105105
weak
106106
[file ".github/workflows/publish.yml"]
107107
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
108108
weak
109-
sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687
109+
sha = 0ca5fd11125cd10c51b4433a86917c06ff1ae839
110110

111-
etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025
111+
etag = ac46ffdcef820bbc6bd32378aef25ff79713196e0a5696791abb3a804e06e4d8
112112
[file ".gitignore"]
113113
url = https://github.com/devlooped/oss/blob/main/.gitignore
114114
sha = ff61659751374b95c7a8a0477c908a8119f756f0
@@ -117,9 +117,9 @@
117117
weak
118118
[file "Directory.Build.rsp"]
119119
url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp
120-
sha = 0f7f7f7e8a29de9b535676f75fe7c67e629a5e8c
120+
sha = 320a5c5710f269ccb038b5e74146fed8b5a114ae
121121

122-
etag = 0ccae83fc51f400bfd7058170bfec7aba11455e24a46a0d7e6a358da6486e255
122+
etag = 9872addf980da78842d42e70e72f90fb10ba52c1c2ccddc8aa9a2b83e0005679
123123
weak
124124
[file "_config.yml"]
125125
url = https://github.com/devlooped/oss/blob/main/_config.yml
@@ -148,9 +148,9 @@
148148
skip
149149
[file ".github/workflows/triage.yml"]
150150
url = https://github.com/devlooped/oss/blob/main/.github/workflows/triage.yml
151-
sha = 61a602fc61eedbdae235f01e93657a6219ac2427
151+
sha = 5ee8c91c8d9e8c0ee739fe1ec877f36c15a4aff0
152152

153-
etag = 152cd3a559c08da14d1da12a5262ba1d2e0ed6bed6d2eabf5bd209b0c35d8a75
153+
etag = b19dc36058fc7d385cb5795c9e0860c11b9d027c57cb2a5e6a112e692c6884c1
154154
weak
155155
[file ".github/workflows/dotnet-env.yml"]
156156
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-env.yml

‎Directory.Build.rsp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
-m:1
44
-v:m
55
-clp:Summary;ForceNoAlign
6+
-p:WarnOnPackingNonPackableProject=false

‎readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,6 @@ The versioning scheme for packages is:
498498
[![DRIVE.NET, Inc.](https://avatars.githubusercontent.com/u/15047123?v=4&s=39 "DRIVE.NET, Inc.")](https://github.com/drivenet)
499499
[![Keith Pickford](https://avatars.githubusercontent.com/u/16598898?u=64416b80caf7092a885f60bb31612270bffc9598&v=4&s=39 "Keith Pickford")](https://github.com/Keflon)
500500
[![Thomas Bolon](https://avatars.githubusercontent.com/u/127185?u=7f50babfc888675e37feb80851a4e9708f573386&v=4&s=39 "Thomas Bolon")](https://github.com/tbolon)
501-
[![Kori Francis](https://avatars.githubusercontent.com/u/67574?u=3991fb983e1c399edf39aebc00a9f9cd425703bd&v=4&s=39 "Kori Francis")](https://github.com/kfrancis)
502501
[![Reuben Swartz](https://avatars.githubusercontent.com/u/724704?u=2076fe336f9f6ad678009f1595cbea434b0c5a41&v=4&s=39 "Reuben Swartz")](https://github.com/rbnswartz)
503502
[![Jacob Foshee](https://avatars.githubusercontent.com/u/480334?v=4&s=39 "Jacob Foshee")](https://github.com/jfoshee)
504503
[![](https://avatars.githubusercontent.com/u/33566379?u=bf62e2b46435a267fa246a64537870fd2449410f&v=4&s=39 "")](https://github.com/Mrxx99)
@@ -519,6 +518,7 @@ The versioning scheme for packages is:
519518
[![Andrew Grant](https://avatars.githubusercontent.com/devlooped-user?s=39 "Andrew Grant")](https://github.com/wizardness)
520519
[![eska-gmbh](https://avatars.githubusercontent.com/devlooped-team?s=39 "eska-gmbh")](https://github.com/eska-gmbh)
521520
[![Geodata AS](https://avatars.githubusercontent.com/u/5946299?v=4&s=39 "Geodata AS")](https://github.com/geodata-no)
521+
[![Jiri Slachta](https://avatars.githubusercontent.com/u/6891947?u=802cfeb13b070d04c53269fc662b0d58963480dd&v=4&s=39 "Jiri Slachta")](https://github.com/jslachta)
522522

523523

524524
<!-- sponsors.md -->

‎src/Directory.Build.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@
2525
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2626
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2727

28-
<!-- Pick src-level readme+icon automatically -->
28+
<!-- Pick src-level readme+icon automatically (icon.png preferred, logo.png fallback) -->
29+
<PackageIcon Condition="Exists('$(MSBuildThisFileDirectory)logo.png')">logo.png</PackageIcon>
2930
<PackageIcon Condition="Exists('$(MSBuildThisFileDirectory)icon.png')">icon.png</PackageIcon>
3031
<PackageReadmeFile Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md')">readme.md</PackageReadmeFile>
3132
<!-- Pick project-level readme+icon overrides automatically -->
33+
<PackageIcon Condition="Exists('$(MSBuildProjectDirectory)\logo.png')">logo.png</PackageIcon>
3234
<PackageIcon Condition="Exists('$(MSBuildProjectDirectory)\icon.png')">icon.png</PackageIcon>
3335
<PackageReadmeFile Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildProjectDirectory)\readme.md')">readme.md</PackageReadmeFile>
3436

‎src/Directory.Build.targets‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,14 @@
3939
<NuGetBuildTasksPackTargets Condition="'$(NuGetBuildTasksPackTargets)' == ''">$(MSBuildSDKsPath)\..\NuGet.Build.Tasks.Pack.targets</NuGetBuildTasksPackTargets>
4040
</PropertyGroup>
4141

42-
<Import Project="$(NuGetBuildTasksPackTargets)" Condition="Exists('$(NuGetBuildTasksPackTargets)')"/>
42+
<Import Project="$(NuGetBuildTasksPackTargets)" Condition="Exists('$(NuGetBuildTasksPackTargets)') And '$(NuGetize)' != 'true'" />
43+
44+
<!-- Fix for hardcoded assumption in SDK: <GenerateStaticWebAssetsManifest Source="$(PackageId)" -->
45+
<Target Name="EnsureStaticWebAssetsSource" BeforeTargets="GenerateStaticWebAssetsManifest">
46+
<PropertyGroup>
47+
<PackageId Condition="'$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
48+
</PropertyGroup>
49+
</Target>
4350

4451
<PropertyGroup>
4552
<!-- Revert the forced PackageId by the NuGet SDK targets for non-packable projects, see https://github.com/NuGet/Home/issues/14928 -->
@@ -56,18 +63,23 @@
5663
<None Update="@(None -> WithMetadataValue('Filename', 'icon'))"
5764
Pack="true" PackagePath="%(Filename)%(Extension)"
5865
CopyToOutputDirectory="Never"
59-
Condition="'$(PackageIcon)' != ''" />
66+
Condition="'$(PackageIcon)' == 'icon.png'" />
67+
68+
<None Update="@(None -> WithMetadataValue('Filename', 'logo'))"
69+
Pack="true" PackagePath="%(Filename)%(Extension)"
70+
CopyToOutputDirectory="Never"
71+
Condition="'$(PackageIcon)' == 'logo.png'" />
6072

6173
<None Update="@(None -> WithMetadataValue('Filename', 'readme'))"
6274
Pack="true" PackagePath="%(Filename)%(Extension)"
6375
CopyToOutputDirectory="Never"
6476
Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
6577

6678
<!-- src-level will need explicit inclusion -->
67-
<None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false"
68-
Pack="true" PackagePath="%(Filename)%(Extension)"
79+
<None Include="$(MSBuildThisFileDirectory)$(PackageIcon)" Link="$(PackageIcon)" Visible="false"
80+
Pack="true" PackagePath="$(PackageIcon)"
6981
CopyToOutputDirectory="Never"
70-
Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
82+
Condition="'$(PackageIcon)' != '' and Exists('$(MSBuildThisFileDirectory)$(PackageIcon)') and !Exists('$(MSBuildProjectDirectory)\$(PackageIcon)')" />
7183

7284
<None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md"
7385
Pack="true" PackagePath="%(Filename)%(Extension)"

0 commit comments

Comments
 (0)