diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eabfb6e..0aa6c2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: - name: Build container image (no push) if: matrix.rid == 'linux-x64' shell: bash - run: dotnet run --project build/scripts -- publishcontainers -s true + run: dotnet run --project build/scripts -- publishcontainers -s - name: Report container image size if: matrix.rid == 'linux-x64' @@ -74,7 +74,7 @@ jobs: if-no-files-found: error 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 @@ -127,7 +127,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 }} @@ -135,7 +135,7 @@ jobs: - name: Publish container image if: github.event_name == 'push' || github.event_name == 'release' - run: dotnet run --project build/scripts -- publishcontainers -s true --push + run: dotnet run --project build/scripts -- publishcontainers -s --push - name: Check the packages carry the release version if: github.event_name == 'release' 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/Directory.Build.props b/Directory.Build.props index 3f0b469..a4c8b01 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,11 @@ - canary + canary.0 0.2 - + + all diff --git a/Directory.Packages.props b/Directory.Packages.props index 02db885..9cfb58a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,18 +5,18 @@ - - - - + + + + - - - + + + diff --git a/build/scripts/Program.fs b/build/scripts/Program.fs index 36aa03b..c44651f 100644 --- a/build/scripts/Program.fs +++ b/build/scripts/Program.fs @@ -104,15 +104,15 @@ let main argv = |> Seq.head let package = Paths.RootRelative package.FullName let version = Versions.informational.Value - sh $"dotnet nupkg-validator {package} -v {version} -a {Paths.ToolName} -k 96c599bbe3e70f5d --allow-roll-forward" } + sh $"dotnet nupkg-validator validate {package} -v {version} -a {Paths.ToolName} -k 96c599bbe3e70f5d" } // The plain "assembly-rewriter" package id is just a DotnetToolSettings.xml v2 shim pointing at per-RID // sub-packages (see generatepackages) - it ships no managed assembly of its own, so NuGetAssemblyProvider would // find 0 assemblies there. The portable, signed managed build lives in "assembly-rewriter.any" instead. - // `-a true`: don't fail a first-ever diff when "assembly-rewriter.any" has no previous version on nuget.org. + // `-a`: don't fail a first-ever diff when "assembly-rewriter.any" has no previous version on nuget.org. | Generateapichanges -> target [] { let version = Versions.current.Value // quoted: an unquoted | would pipe - sh $"dotnet assembly-differ 'previous-nuget|{Paths.ToolName}.any|{version}|net10.0' 'directory|src/{Paths.ToolName}/bin/Release/net10.0' -a true --target {Paths.ToolName} -f github-comment --output {output}" } + sh $"dotnet assembly-differ diff 'previous-nuget|{Paths.ToolName}.any|{version}|net10.0' 'directory|src/{Paths.ToolName}/bin/Release/net10.0' -a --target {Paths.ToolName} -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/build/scripts/Versions.fs b/build/scripts/Versions.fs index 93226a9..afd65bc 100644 --- a/build/scripts/Versions.fs +++ b/build/scripts/Versions.fs @@ -11,7 +11,7 @@ let current = // failing with "The command ... is not contained in the package ...". The cache is warm after the first attempt, // so one retry always succeeds. sh $"dotnet tool restore" |> Cmd.retry 1 - let! version = text $"dotnet minver --default-pre-release-phase canary" + let! version = text $"dotnet minver --default-pre-release-identifiers canary.0" return version }) diff --git a/dotnet-tools.json b/dotnet-tools.json index f9bf9ac..9d15adc 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,25 +3,25 @@ "isRoot": true, "tools": { "minver-cli": { - "version": "4.3.0", + "version": "8.0.0", "commands": [ "minver" ] }, - "nupkg-validator": { - "version": "0.10.1", + "assembly-differ": { + "version": "0.18.2", "commands": [ - "nupkg-validator" + "assembly-differ" ] }, - "assembly-differ": { - "version": "0.16.0", + "nupkg-validator": { + "version": "0.11.5", "commands": [ - "assembly-differ" + "nupkg-validator" ] }, "curb-cli": { - "version": "0.14.0", + "version": "0.14.1", "commands": [ "curb" ], diff --git a/src/assembly-rewriter/Program.cs b/src/assembly-rewriter/Program.cs index e502ee0..0c1a9f3 100644 --- a/src/assembly-rewriter/Program.cs +++ b/src/assembly-rewriter/Program.cs @@ -4,7 +4,6 @@ var app = new ArghApp(); // The root alias keeps a bare `assembly-rewriter -i … -o …` working: `uses: nullean/assembly-rewriter@v0` runs the // `edge` image, which follows main, with the arguments of an action.yml that may predate the `rewrite` subcommand. -// Until nullean/argh#138 is fixed a bare call also prints a spurious "unknown short option" before it runs. app.MapAndRootAlias(); return await app.RunAsync(args);