From 0571f77daeb0b8731fffbc717e6b41490963f191 Mon Sep 17 00:00:00 2001 From: devlooped-bot Date: Thu, 20 Aug 2026 00:08:28 +0000 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20files=20with=20dotn?= =?UTF-8?q?et-file=20sync=20=EF=BB=BF#=20devlooped/oss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update actions-includes version to v2 https://github.com/devlooped/oss/commit/d571412 - Update cron schedule in triage workflow https://github.com/devlooped/oss/commit/5ee8c91 - Disable warning on packing non-packable projects https://github.com/devlooped/oss/commit/320a5c5 - Allow logo.png as a PackageIcon fallback for nugetizer and SDK pack. https://github.com/devlooped/oss/commit/59861dd - feat: add validation step to check for disallowed package versions in publish workflow https://github.com/devlooped/oss/commit/0ca5fd1 --- .github/workflows/includes.yml | 2 +- .github/workflows/publish.yml | 12 +++++++++++- .github/workflows/triage.yml | 4 ++-- .netconfig | 24 ++++++++++++------------ Directory.Build.rsp | 1 + readme.md | 1 - src/Directory.Build.props | 4 +++- src/Directory.Build.targets | 22 +++++++++++++++++----- 8 files changed, 47 insertions(+), 23 deletions(-) diff --git a/.github/workflows/includes.yml b/.github/workflows/includes.yml index 8fd66901..ee446be4 100644 --- a/.github/workflows/includes.yml +++ b/.github/workflows/includes.yml @@ -32,7 +32,7 @@ jobs: token: ${{ env.PR_TOKEN || github.token }} - name: +Mᐁ includes - uses: devlooped/actions-includes@v1 + uses: devlooped/actions-includes@v2 - name: 📝 OSMF EULA shell: pwsh diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 035d8110..4fe29c5a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ env: Configuration: Release PackOnBuild: true GeneratePackageOnBuild: true - VersionLabel: ${{ github.ref }} + VersionLabel: refs/tags/${{ github.event.release.tag_name }} GH_TOKEN: ${{ secrets.GH_TOKEN }} MSBUILDTERMINALLOGGER: auto SLEET_FEED_URL: https://api.nuget.org/v3/index.json @@ -44,6 +44,16 @@ jobs: name: logs path: '*.binlog' + - name: ✅ validate + shell: pwsh + working-directory: bin + run: | + $invalid = Get-ChildItem -File -Filter "*.42.42*.nupkg" + if ($invalid) { + Write-Error "Found dev/local packages with disallowed 42.42* version prefix:`n$($invalid.Name -join "`n")" + exit 1 + } + - name: 🚀 nuget env: NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 99eec768..bd30f7c5 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -1,7 +1,7 @@ name: 'triage' on: schedule: - - cron: '42 0 * * *' + - cron: '42 0 1,15 * *' workflow_dispatch: # Manual triggering through the GitHub UI, API, or CLI @@ -104,4 +104,4 @@ jobs: closeDays: ${{ fromJson(inputs.daysBeforeClose || 30) }} closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity.\n\nHappy Coding!" pingDays: 80 - 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." \ No newline at end of file + 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." diff --git a/.netconfig b/.netconfig index 145e09dd..a94db30a 100644 --- a/.netconfig +++ b/.netconfig @@ -45,14 +45,14 @@ sha = 0683ee777d7d878d4bf013d7deea352685135a05 [file "src/Directory.Build.props"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props - etag = f1d6384abf18d8d891ce5e835a10c73fe029c42151374be96d7e4af43d189c65 + etag = 1561f1be53cc25ac0cd85a06b3f65d69764b174d0f60bf72ca2f8fc70573b75e weak - sha = 6e2438919e108aeb75106dc0737c45f5e55d5f42 + sha = 59861ddd1e330f3da410652b4c7fc6585726c0cf [file "src/Directory.Build.targets"] url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets - etag = cb83faed0cc8b930a7b6bdc61bea03a54059858cf04353e55fee94d9e3ae0fad + etag = cb1f7a3e5bf85e7307407b7b6d8b9869330e2191a2317ccf6218a552e5890b08 weak - sha = c67952501337303eda0fb8b340cb7606666abd8f + sha = 59861ddd1e330f3da410652b4c7fc6585726c0cf [file "src/kzu.snk"] url = https://github.com/devlooped/oss/blob/main/src/kzu.snk skip @@ -63,9 +63,9 @@ sha = e732f6a2c44a2f7940a1868a92cd66523f74ed24 [file "Directory.Build.rsp"] url = https://github.com/devlooped/oss/blob/main/Directory.Build.rsp - etag = 0ccae83fc51f400bfd7058170bfec7aba11455e24a46a0d7e6a358da6486e255 + etag = 9872addf980da78842d42e70e72f90fb10ba52c1c2ccddc8aa9a2b83e0005679 weak - sha = 0f7f7f7e8a29de9b535676f75fe7c67e629a5e8c + sha = 320a5c5710f269ccb038b5e74146fed8b5a114ae [file "_config.yml"] url = https://github.com/devlooped/oss/blob/main/_config.yml etag = d608aa0ddaedc2d8a87260f50756e8d8314964ad4671b76bd085bcb458757010 @@ -86,9 +86,9 @@ sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9 [file ".github/workflows/publish.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml - etag = c60411d1aa4e98e7f69e2d34cbccb8eb7e387ec11f6f8e78ee8d8b92122d7025 + etag = ac46ffdcef820bbc6bd32378aef25ff79713196e0a5696791abb3a804e06e4d8 weak - sha = 7f5f9ee9f362f7e8f951d618f8f799033550e687 + sha = 0ca5fd11125cd10c51b4433a86917c06ff1ae839 [file ".github/workflows/dotnet-file.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml sha = 8fa147d4799d73819040736c399d0b1db2c2d86c @@ -109,8 +109,8 @@ weak [file ".github/workflows/includes.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/includes.yml - sha = 7c1c6e615b5785e0ac9db33cb17343d6c1de16ff - etag = 5e6a10be141ee629201bfad01eae09b5c36a67f541ec7ab411ae400b5d73de1d + sha = d571412f07b0fb3c40023dc906f64906d7ed2b46 + etag = ab627107749577bb619b024aff93027359b66b4c3f5a85a36b235e428387cd17 weak [file ".github/workflows/combine-prs.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml @@ -147,8 +147,8 @@ weak [file ".github/workflows/triage.yml"] url = https://github.com/devlooped/oss/blob/main/.github/workflows/triage.yml - sha = 61a602fc61eedbdae235f01e93657a6219ac2427 - etag = 152cd3a559c08da14d1da12a5262ba1d2e0ed6bed6d2eabf5bd209b0c35d8a75 + sha = 5ee8c91c8d9e8c0ee739fe1ec877f36c15a4aff0 + etag = b19dc36058fc7d385cb5795c9e0860c11b9d027c57cb2a5e6a112e692c6884c1 weak [file "src/ILRepack.targets"] url = https://github.com/devlooped/catbag/blob/main/MSBuild/ILRepack.targets diff --git a/Directory.Build.rsp b/Directory.Build.rsp index 509cc660..a67e0543 100644 --- a/Directory.Build.rsp +++ b/Directory.Build.rsp @@ -3,3 +3,4 @@ -m:1 -v:m -clp:Summary;ForceNoAlign +-p:WarnOnPackingNonPackableProject=false diff --git a/readme.md b/readme.md index da748837..d7e1fe78 100644 --- a/readme.md +++ b/readme.md @@ -580,7 +580,6 @@ The versioning scheme for packages is: [![DRIVE.NET, Inc.](https://avatars.githubusercontent.com/u/15047123?v=4&s=39 "DRIVE.NET, Inc.")](https://github.com/drivenet) [![Keith Pickford](https://avatars.githubusercontent.com/u/16598898?u=64416b80caf7092a885f60bb31612270bffc9598&v=4&s=39 "Keith Pickford")](https://github.com/Keflon) [![Thomas Bolon](https://avatars.githubusercontent.com/u/127185?u=7f50babfc888675e37feb80851a4e9708f573386&v=4&s=39 "Thomas Bolon")](https://github.com/tbolon) -[![Kori Francis](https://avatars.githubusercontent.com/u/67574?u=3991fb983e1c399edf39aebc00a9f9cd425703bd&v=4&s=39 "Kori Francis")](https://github.com/kfrancis) [![Reuben Swartz](https://avatars.githubusercontent.com/u/724704?u=2076fe336f9f6ad678009f1595cbea434b0c5a41&v=4&s=39 "Reuben Swartz")](https://github.com/rbnswartz) [![Jacob Foshee](https://avatars.githubusercontent.com/u/480334?v=4&s=39 "Jacob Foshee")](https://github.com/jfoshee) [![](https://avatars.githubusercontent.com/u/33566379?u=bf62e2b46435a267fa246a64537870fd2449410f&v=4&s=39 "")](https://github.com/Mrxx99) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 93a0b1e4..5c43a5d9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -25,10 +25,12 @@ false MIT - + + logo.png icon.png readme.md + logo.png icon.png readme.md diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 20a680d9..c9a50b6e 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -39,7 +39,14 @@ $(MSBuildSDKsPath)\..\NuGet.Build.Tasks.Pack.targets - + + + + + + $(MSBuildProjectName) + + @@ -56,7 +63,12 @@ + Condition="'$(PackageIcon)' == 'icon.png'" /> + + - + Condition="'$(PackageIcon)' != '' and Exists('$(MSBuildThisFileDirectory)$(PackageIcon)') and !Exists('$(MSBuildProjectDirectory)\$(PackageIcon)')" />