Skip to content

Fix ImageBuilder test toolset resolution#2105

Merged
lbussell merged 1 commit into
dotnet:mainfrom
lbussell:fix-arcade
May 12, 2026
Merged

Fix ImageBuilder test toolset resolution#2105
lbussell merged 1 commit into
dotnet:mainfrom
lbussell:fix-arcade

Conversation

@lbussell
Copy link
Copy Markdown
Member

@lbussell lbussell commented May 11, 2026

This PR fixes docker-tools-imagebuilder-official failing in Test Images after the Arcade update in #2099.

The root cause is that Arcade stopped writing artifacts/toolset/<version>.txt and now restores the SDK toolset to artifacts/toolset/<version>/Build.proj.

Relevant Arcade history:

This PR updates src/run-tests.ps1 to resolve the new Build.proj location first while retaining a legacy marker-file fallback for older Arcade layouts.

Validation:

  • git clean -ffxd
  • pwsh -NoLogo -NoProfile -NonInteractive -File ./src/run-tests.ps1 (478 tests passed)

Fixes #2104

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@lbussell lbussell marked this pull request as ready for review May 11, 2026 21:33
@lbussell lbussell requested a review from a team as a code owner May 11, 2026 21:33
@lbussell lbussell merged commit a04350e into dotnet:main May 12, 2026
12 checks passed
@lbussell lbussell deleted the fix-arcade branch May 12, 2026 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fix ImageBuilder Test Images after Arcade toolset layout change

2 participants