Revert "[main] Source code updates from dotnet/dotnet"#16744
Merged
mmitche merged 1 commit intoApr 23, 2026
Conversation
This reverts commit 0bae2b2.
missymessa
approved these changes
Apr 23, 2026
mmitche
deleted the
revert-16726-darc-main-b46622d4-f860-4171-9113-5c232204d1f3
branch
This was referenced Apr 24, 2026
lbussell
added a commit
to dotnet/docker-tools
that referenced
this pull request
May 12, 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: - dotnet/arcade#16726 originally introduced the `InitializeToolset` layout change. - dotnet/arcade#16744 reverted that source update. - dotnet/arcade#16753 reintroduced the layout change; this is the change present in the Arcade build consumed by #2099. 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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #16726