Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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

Expand Down Expand Up @@ -127,15 +127,15 @@ 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 }}
password: ${{ github.token }}

- 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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Project>
<PropertyGroup>
<MinVerDefaultPreReleasePhase>canary</MinVerDefaultPreReleasePhase>
<MinVerDefaultPreReleaseIdentifiers>canary.0</MinVerDefaultPreReleaseIdentifiers>
<MinVerMinimumMajorMinor>0.2</MinVerMinimumMajorMinor>
</PropertyGroup>

<ItemGroup>
<!-- versions the packages; build/scripts is not packed and has no use for it -->
<ItemGroup Condition="'$(IsPackable)' != 'false'">
<PackageReference Include="MinVer">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@

<!-- the tool -->
<ItemGroup>
<PackageVersion Include="ILRepack.Lib" Version="2.0.18" />
<PackageVersion Include="MinVer" Version="4.3.0" />
<PackageVersion Include="Mono.Cecil" Version="0.11.3" />
<PackageVersion Include="Nullean.Argh" Version="0.18.0" />
<PackageVersion Include="ILRepack.Lib" Version="2.0.48" />
<PackageVersion Include="MinVer" Version="8.0.0" />
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
<PackageVersion Include="Nullean.Argh" Version="0.28.0" />
</ItemGroup>

<!-- build/scripts -->
<ItemGroup>
<!-- Nullean.Make.Fs needs 11.0.100 or later; this is the one the SDK resolved before -->
<PackageVersion Include="FSharp.Core" Version="11.0.101" />
<PackageVersion Include="Nullean.Make.Fs" Version="0.25.0" />
<!-- the current release, which Nullean.Make.Fs would otherwise resolve at its 0.17.0 floor -->
<PackageVersion Include="Proc.Fs" Version="0.18.0" />
<PackageVersion Include="Nullean.Make.Fs" Version="0.28.0" />
<!-- build/scripts opens Proc.Fs directly -->
<PackageVersion Include="Proc.Fs" Version="0.21.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions build/scripts/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/Versions.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
})

Expand Down
16 changes: 8 additions & 8 deletions dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
1 change: 0 additions & 1 deletion src/assembly-rewriter/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<AssemblyRewriterCommands>();

return await app.RunAsync(args);
Loading