[10.0.1xx] Use dotnetup preview for SDK acquisition - #55641
Open
nagilson wants to merge 3 commits into
Open
Conversation
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
3 tasks
merging on red due to OTHER known build issues - this is an isolated and understood / tested fix
nagilson
marked this pull request as ready for review
August 6, 2026 22:22
nagilson
enabled auto-merge
August 6, 2026 22:22
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
Pull request overview
Backports the “use dotnetup preview for acquisition” work to the 10.0.1xx servicing branch, updating toolset bootstrap and test-runtime acquisition to prefer dotnetup (with fallbacks) and to better support cross-architecture Helix payloads.
Changes:
- Add shared dotnetup acquisition helpers (bash/PowerShell) and repo-owned architecture helpers used by build/test scripts.
- Update toolset restore/configure scripts to install SDKs and test runtimes via dotnetup, including cross-build sidecar runtime handling and an MSBuild overlay step for Helix payloads.
- Adjust a publish test to dynamically discover the installed 8.0.x runtime folder when dotnetup only installs latest patches.
Reviewed changes
Copilot reviewed 10 out of 11 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| test/Microsoft.NET.Publish.Tests/GivenThatAPublishedDepsJsonShouldContainVersionInformation.cs | Dynamically selects an installed 8.0.x runtime version for --fx-version execution. |
| src/Layout/redist/targets/OverlaySdkOnLKG.targets | Adds target to overlay cross-arch test runtimes into the Helix test host from an artifacts sidecar. |
| eng/sdk-tools.sh | Adds repo-owned bash helper for native machine architecture detection (incl. Rosetta handling). |
| eng/sdk-tools.ps1 | Adds repo-owned PowerShell helpers for native/process architecture detection. |
| eng/restore-toolset.sh | Switches test runtime acquisition to dotnetup with cross-arch sidecar behavior and install-script fallback. |
| eng/restore-toolset.ps1 | Switches test runtime acquisition to dotnetup with cross-arch sidecar behavior and install-script fallback. |
| eng/dotnetup-shared.sh | Adds shared bash helpers for dotnetup caching, acquisition, and non-errexit command execution. |
| eng/dotnetup-shared.ps1 | Adds shared PowerShell helpers for dotnetup caching, acquisition, and safe native invocation. |
| eng/configure-toolset.sh | Pre-installs bootstrap SDK(s) from global.json using dotnetup into repo-local .dotnet. |
| eng/configure-toolset.ps1 | Pre-installs bootstrap SDK(s) from global.json using dotnetup into repo-local .dotnet. |
| .gitignore | Ignores dotnetup build output under eng/dotnetup/. |
Suppressed comments (1)
eng/restore-toolset.ps1:100
- The generated
sdk-build-env.ps1no longer setsDOTNET_MULTILEVEL_LOOKUP=0. This repo disables multi-level lookup for deterministic builds (seeeng/common/tools.ps1:160-162), and the generated script is meant to be executed in a fresh PowerShell session.
$scriptContents = @"
`$host.ui.RawUI.WindowTitle = "SDK Build ($RepoRoot)"
# https://aka.ms/vs/unsigned-dotnet-debugger-lib
`$env:VSDebugger_ValidateDotnetDebugLibSignatures=0
`$env:DOTNET_ROOT="$env:DOTNET_INSTALL_DIR"
`$env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR="$env:DOTNET_INSTALL_DIR"
Member
Author
|
/azp run |
|
Azure Pipelines: Successfully started running 2 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
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
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.
Please see #55640