Skip to content

[automated] Merge branch 'main' => 'release/dnup'#55159

Open
github-actions[bot] wants to merge 10 commits into
release/dnupfrom
merge/main-to-release/dnup
Open

[automated] Merge branch 'main' => 'release/dnup'#55159
github-actions[bot] wants to merge 10 commits into
release/dnupfrom
merge/main-to-release/dnup

Conversation

@github-actions

@github-actions github-actions Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

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:

  • nagilson
  • mthalman
  • JeremyKuhne

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.

merge button instructions

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.

git fetch
git checkout main
git pull --ff-only
git checkout release/dnup
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/main-to-release/dnup
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/main-to-release/dnup

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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.

git fetch
git checkout -b merge/main-to-release/dnup origin/release/dnup
git pull https://github.com/dotnet/sdk merge/main-to-release/dnup
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/main-to-release/dnup
or if you are using SSH
git fetch
git checkout -b merge/main-to-release/dnup origin/release/dnup
git pull git@github.com:dotnet/sdk merge/main-to-release/dnup
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/main-to-release/dnup

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.

nagilson and others added 10 commits July 6, 2026 09:13
…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
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.

3 participants