From b9cb20f266415ca93287bcfb2074118be320920f Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Thu, 12 Nov 2026 10:35:20 +0100 Subject: [PATCH 1/2] Bump every dependency to its latest version MinVer 8.0.0, Nullean.Argh 0.27.2, NuGet.Versioning 8.0.0 (7.9.0 on net8.0, which 8.x no longer targets), Nullean.Make.Fs 0.27.2; tools minver-cli 8.0.0, nupkg-validator 0.11.5 (now `validate `), assembly-differ 0.17.0 (0.18.0/0.18.1 crash in previous-nuget, nullean/assembly-differ#62; listed before nupkg-validator for the .NET 11.0.100 tool-restore bug), curb-cli 0.14.1. docker/login-action v4.8.0 and the nullean/.github workflows at v1.5.0. Make.Fs 0.27's -s is a switch, so CI drops `-s true`. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/release-drafter.yml | 2 +- AGENTS.md | 2 +- Directory.Packages.props | 10 ++++++---- build/scripts/Program.fs | 2 +- dotnet-tools.json | 16 ++++++++-------- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ca6d29..8483baa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: # ghcr.io happens once, in the build job below, which does pass --push. - name: Build container image (no push) if: matrix.rid == 'linux-x64' - run: ./build.sh publishcontainers -s true + run: ./build.sh publishcontainers -s shell: bash - name: Report container image size @@ -88,9 +88,9 @@ jobs: env: MISE_JOBS: "1" # dotnet versions share one DOTNET_ROOT; installing them in parallel races - - run: ./build.sh build -s true + - run: ./build.sh build -s name: Build - - run: ./build.sh generatepackages -s true + - run: ./build.sh generatepackages -s name: Generate local nuget packages - name: Download per-RID AOT packages @@ -101,9 +101,9 @@ jobs: path: build/output merge-multiple: true - - run: ./build.sh validatepackages -s true + - run: ./build.sh validatepackages -s name: "validate *.npkg files that were created" - - run: ./build.sh generateapichanges -s true + - run: ./build.sh generateapichanges -s name: "Inspect public API changes" # the tools are restored by the steps above @@ -123,7 +123,7 @@ jobs: # publishContainers/containerImageTags in Targets.fs for how that split is decided. - name: Log in to ghcr.io if: github.event_name == 'push' || github.event_name == 'release' - uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 + uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4.8.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -131,7 +131,7 @@ jobs: - name: Publish container image if: github.event_name == 'push' || github.event_name == 'release' - run: ./build.sh publishcontainers -s true --push + run: ./build.sh publishcontainers -s --push # Trusted publishing: nuget.org trusts this repository's ci.yml (a policy owned by the nullean # organization), so there is no long-lived API key to expire. The key it returns lasts an hour, so the @@ -174,6 +174,6 @@ jobs: gh release edit "$TAG" --repo "$GITHUB_REPOSITORY" --notes-file "$RUNNER_TEMP/notes.md" zizmor: - uses: nullean/.github/.github/workflows/zizmor.yml@83ef343759c443afe1964e9c33327527f8677b05 # v1.3.0 + uses: nullean/.github/.github/workflows/zizmor.yml@d850ce6eee9efa9f81b410d15fcd480409518d19 # v1.5.0 permissions: contents: read diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 179be65..47ed847 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -9,7 +9,7 @@ permissions: {} jobs: draft: - uses: nullean/.github/.github/workflows/release-drafter.yml@83ef343759c443afe1964e9c33327527f8677b05 # v1.3.0 + uses: nullean/.github/.github/workflows/release-drafter.yml@d850ce6eee9efa9f81b410d15fcd480409518d19 # v1.5.0 permissions: contents: write pull-requests: read diff --git a/AGENTS.md b/AGENTS.md index 1fc7070..a88d1b0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -60,4 +60,4 @@ one release label. This repository's own releases do not run the tool: release-d bodies go through `GitHubJsonContext`, and writes are idempotent upserts rather than check-then-create. - Build targets are Make.Fs `target { }` blocks in `build/scripts/Program.fs` whose commands are Proc.Fs `sh $"…"` lines; values come from `text` inside `shell { }` (`Versions.fs`). Do not call the C# `ProcNet` API from the build. - CI calls targets by name (`./build.sh generatepackages -s true`): keep multi-word case names as one word. + CI calls targets by name (`./build.sh generatepackages -s`): keep multi-word case names as one word. diff --git a/Directory.Packages.props b/Directory.Packages.props index 4c3b2f6..d28f48b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,9 +5,11 @@ - - - + + + + + @@ -16,6 +18,6 @@ - + diff --git a/build/scripts/Program.fs b/build/scripts/Program.fs index 20e6242..dbac02a 100644 --- a/build/scripts/Program.fs +++ b/build/scripts/Program.fs @@ -79,7 +79,7 @@ let main argv = |> Seq.head |> fun p -> Paths.RootRelative p.FullName let version = Versions.informational.Value - sh $"dotnet nupkg-validator {package} -v {version} -a {Paths.ToolName} -k 96c599bbe3e70f5d" } + sh $"dotnet nupkg-validator validate {package} -v {version} -a {Paths.ToolName} -k 96c599bbe3e70f5d" } | Generateapichanges -> target [] { let version = Versions.current.Value let tool = Paths.ToolName diff --git a/dotnet-tools.json b/dotnet-tools.json index 90a7970..d28ffd6 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,28 +3,28 @@ "isRoot": true, "tools": { "minver-cli": { - "version": "6.0.0", + "version": "8.0.0", "commands": [ "minver" ], "rollForward": false }, - "nupkg-validator": { - "version": "0.10.0", + "assembly-differ": { + "version": "0.17.0", "commands": [ - "nupkg-validator" + "assembly-differ" ], "rollForward": false }, - "assembly-differ": { - "version": "0.16.0", + "nupkg-validator": { + "version": "0.11.5", "commands": [ - "assembly-differ" + "nupkg-validator" ], "rollForward": false }, "curb-cli": { - "version": "0.14.0", + "version": "0.14.1", "commands": [ "curb" ], From ef28a865272c74d92d0b4a3f297fd13352bb4019 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Thu, 12 Nov 2026 11:36:19 +0100 Subject: [PATCH 2/2] Bump Nullean.Argh and Nullean.Make.Fs to 0.28.0, assembly-differ to 0.18.2 Make.Fs 0.28.0 brings Proc.Fs 0.21.0. assembly-differ 0.18.2 fixes previous-nuget (nullean/assembly-differ#62); the build moves to its `diff` subcommand. Co-Authored-By: Claude Opus 5.5 --- Directory.Packages.props | 4 ++-- build/scripts/Program.fs | 2 +- dotnet-tools.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d28f48b..0124cdd 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,7 +6,7 @@ - + @@ -18,6 +18,6 @@ - + diff --git a/build/scripts/Program.fs b/build/scripts/Program.fs index 679d4be..d4972d1 100644 --- a/build/scripts/Program.fs +++ b/build/scripts/Program.fs @@ -92,7 +92,7 @@ let main argv = // so NuGetAssemblyProvider would find 0 assemblies there. The portable, signed managed build // lives in "release-notes.any" instead. // The provider specs are quoted: an unquoted | would pipe. - sh $"dotnet assembly-differ 'previous-nuget|{tool}.any|{version}|net10.0' 'directory|src/{tool}/bin/Release/net10.0' --target {tool} -f github-comment --output {output}" } + sh $"dotnet assembly-differ diff 'previous-nuget|{tool}.any|{version}|net10.0' 'directory|src/{tool}/bin/Release/net10.0' --target {tool} -f github-comment --output {output}" } // Publishes the CLI's native-AOT build as a container image via the .NET SDK's own container // support (`dotnet publish -t:PublishContainer`), the same mechanism used for curb — see // https://github.com/nullean/curb/pull/72. linux-x64 only for now; a second RID becomes a second diff --git a/dotnet-tools.json b/dotnet-tools.json index d28ffd6..6a9b57d 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -10,7 +10,7 @@ "rollForward": false }, "assembly-differ": { - "version": "0.17.0", + "version": "0.18.2", "commands": [ "assembly-differ" ],