Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' - #55233

Merged
dsplaisted merged 10 commits into
release/9.0.3xxfrom
merge/release/9.0.1xx-to-release/9.0.3xx
Jul 16, 2026
Merged

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'#55233
dsplaisted merged 10 commits into
release/9.0.3xxfrom
merge/release/9.0.1xx-to-release/9.0.3xx

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

I detected changes in the release/9.0.1xx branch which have not been merged yet to release/9.0.3xx. I'm a robot and am configured to help you automatically keep release/9.0.3xx up to date, so I've opened this PR.

This PR merges commits made on release/9.0.1xx by the following committers:

  • mthalman
  • nagilson
  • dotnet-bot
  • dsplaisted
  • github-actions[bot]
  • dotnet-maestro[bot]

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 release/9.0.1xx
git pull --ff-only
git checkout release/9.0.3xx
git pull --ff-only
git merge --no-ff release/9.0.1xx

# 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/release/9.0.1xx-to-release/9.0.3xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.3xx

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/release/9.0.1xx-to-release/9.0.3xx'. 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/release/9.0.1xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull https://github.com/dotnet/sdk merge/release/9.0.1xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/9.0.1xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull git@github.com:dotnet/sdk merge/release/9.0.1xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.1xx-to-release/9.0.3xx

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.

dsplaisted and others added 8 commits June 15, 2026 10:16
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…#54674)

[release/9.0.1xx] Update dependencies from dotnet/source-build-assets


 - Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-600f1db5-5e69-40f8-ab1b-ddb483a9858e

 - Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-600f1db5-5e69-40f8-ab1b-ddb483a9858e
Co-authored-by: Mirroring <dnceng-mirroring@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: ProductConstructionServiceProd <ProductConstructionServiceProd>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Simon Zhao (BEYONDSOFT CONSULTING INC) <v-weidzh@microsoft.com>
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
@github-actions
github-actions Bot requested review from a team as code owners July 10, 2026 13:55
Keep truncated output logging from release/9.0.1xx and exit code
log line from release/9.0.3xx.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…Execute

The 9.0.1xx to 9.0.3xx merge conflict in TestCommand.cs was resolved by keeping BOTH the truncating end-of-run logging (from 9.0.1xx, #54795) and the unbounded real-time per-line echo (Log.WriteLine for every output/error line, from 9.0.3xx). That double-logs command output and defeats the truncation: the real-time echo writes the full output to Log with no cap, re-flooding the test host IPC channel and reintroducing the spurious hang-dump timeouts #54795 was meant to prevent.

Resolve to the truncation approach for 9.0.3xx: drop the real-time OnOutputLine/OnErrorLine echo (and the associated 'Executing/exited' display logging) and keep the bounded LogCommandResult via TruncatingTestOutputHelper. Note: main and 10.0.x intentionally keep the real-time echo (a different fix applies there), so the truncation should not flow past 9.0.3xx.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 59570d89-a7e3-4993-baa9-3fb1f442a617
@dsplaisted

Copy link
Copy Markdown
Member

@marcpopMSFT This needs a re-review, as the merge ended up with both the truncating output logger as well as real-time log line writing.

@dsplaisted
dsplaisted merged commit 7fba05d into release/9.0.3xx Jul 16, 2026
33 checks passed
@dsplaisted
dsplaisted deleted the merge/release/9.0.1xx-to-release/9.0.3xx branch July 16, 2026 20:54
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.

5 participants