[automated] Merge branch 'main' => 'release/dnup'#55159
Open
github-actions[bot] wants to merge 10 commits into
Open
[automated] Merge branch 'main' => 'release/dnup'#55159github-actions[bot] wants to merge 10 commits into
github-actions[bot] wants to merge 10 commits into
Conversation
…ty with sh) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Route the dotnetup 'sdk install' and 'runtime install' native invocations in
configure-toolset.ps1 and restore-toolset.ps1 through a new shared helper,
Invoke-DotnetupNativeCommand, in dotnetup-shared.ps1.
The helper locally neutralizes both \Continue ('Stop' from the
build host) and \False (defaults \True on
PowerShell 7.4+) so a non-zero native exit code cannot become a terminating
error that bypasses the graceful fallback. A genuine throw (e.g. missing
executable) is caught and surfaced as a non-zero exit code. It returns the
process exit code for the caller's existing fallback check.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The identical 'save \$-, set +e, run, capture \True, restore set -e' block was copy-pasted in three places (configure-toolset.sh dotnetup sdk install, restore-toolset.sh dotnetup runtime install, and the dotnet-install fallback). Factor it into a shared RunWithoutErrexit helper in dotnetup-shared.sh (the shell counterpart to Invoke-DotnetupNativeCommand in dotnetup-shared.ps1). It returns the wrapped command's exit code via the global _RunWithoutErrexit, following the _<FunctionName> return convention already used for _GetDotNetInstallScript, and always returns 0 itself so callers can invoke it as a plain command under 'set -e'. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…55108) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Reset patterns: - CODEOWNERS
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.
I detected changes in the main branch which have not been merged yet to release/dnup. I'm a robot and am configured to help you automatically keep release/dnup up to date, so I've opened this PR.
This PR merges commits made on main by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-release/dnup'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.