Skip to content

Bump Proc to 0.14.0, retry dotnet tool restore once on failure #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mpdreamz merged 2 commits into from
Sep 3, 2026
Merged

Bump Proc to 0.14.0, retry dotnet tool restore once on failure #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c84174e
Bump Proc to 0.14.0, retry dotnet tool restore once on failure
Mpdreamz Sep 2, 2026
c6704f9
Fix generateApiChanges diffing the empty root package instead of .any
Mpdreamz Sep 3, 2026
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
17 changes: 15 additions & 2 deletions build/scripts/Targets.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ open ProcNet
let exec binary args =
Proc.Exec (binary, args |> List.toArray)

let private restoreTools = lazy(exec "dotnet" ["tool"; "restore"])
/// dotnet/sdk#53783: on a cold tool-resolver cache (every fresh CI runner, every fresh container),
/// restoring 2+ RID-specific tool packages in one manifest can misattribute one package's
/// DotnetToolSettings.xml to another, failing with "The command ... is not contained in the
/// package ...". The cache is warm after the first attempt, so a bare retry always succeeds -
/// see https://github.com/dotnet/sdk/issues/53783.
let private restoreTools =
lazy(
try exec "dotnet" ["tool"; "restore"]
with _ -> exec "dotnet" ["tool"; "restore"]
)
let private currentVersion =
lazy(
restoreTools.Value |> ignore
Expand Down Expand Up @@ -100,7 +109,11 @@ let private generateApiChanges (arguments:ParseResults<Arguments>) =
let args =
[
"assembly-differ"
(sprintf "previous-nuget|%s|%s|net10.0" Paths.ToolName currentVersion);
// The plain "release-notes" package id is just a DotnetToolSettings.xml v2 shim pointing
// at per-RID sub-packages (see generatePackages above) - it ships no managed assembly of
// its own, so NuGetAssemblyProvider would find 0 assemblies there. The portable, signed
// managed build lives in "release-notes.any" instead.
(sprintf "previous-nuget|%s.any|%s|net10.0" Paths.ToolName currentVersion);
(sprintf "directory|src/%s/bin/Release/net10.0" Paths.ToolName);
"--target"; "release-notes"; "-f"; "github-comment"; "--output"; output
]
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/scripts.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Argu" Version="6.0.0" />
<PackageReference Include="Bullseye" Version="6.0.0" />
<PackageReference Include="Proc" Version="0.9.1" />
<PackageReference Include="Proc" Version="0.14.0" />
<PackageReference Include="Fake.Tools.Git" Version="5.15.0" />
</ItemGroup>

Expand Down
Loading