[main] Source code updates from dotnet/dotnet#16753
Merged
ViktorHofer merged 5 commits intomainfrom Apr 24, 2026
Merged
Conversation
Contributor
Author
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Diff: https://github.com/dotnet/dotnet/compare/aae32bdb43e214583a15e3393e38c889b9447ec4..aae32bdb43e214583a15e3393e38c889b9447ec4 From: dotnet/dotnet@aae32bd To: dotnet/dotnet@aae32bd The following files had conflicts that were resolved by a user: - Documentation/update-xunit.md - eng/Versions.props
RunWixTool redirects stdout/stderr but never reads the streams. When the child process (wix.exe) produces output exceeding the ~4KB pipe buffer, the write blocks and WaitForExit() deadlocks. WiX v6 (6.0.3) produces ~18KB of output on error, triggering this latent bug that was hidden with WiX v5's smaller output. Fix: read both streams before WaitForExit() and log the output. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The WiX v5->v6 upgrade means the bundled extension DLLs in the test wixpack resources (WixToolset.Util.wixext.dll, WixToolset.UI.wixext.dll, WixToolset.BootstrapperApplications.wixext.dll, WixToolset.Dependency.wixext.dll) need to reference WixToolset.Extensibility v6.0.0.0 instead of v5.0.0.0. Without this, WiX v6's wix.exe fails with WIX0144 when loading the v5 extensions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 task
Member
|
Contains reverted commits from #16744 |
dkurepa
approved these changes
Apr 24, 2026
Member
|
I think this may break the promotion pipeline: https://dev.azure.com/dnceng/internal/_build/results?buildId=2961545&view=logs&j=ba23343f-f710-5af9-782d-5bd26b102304&t=74531eb2-9b39-5603-839e-94e3ba212b65&l=53 |
rolfbjarne
pushed a commit
to dotnet/macios
that referenced
this pull request
Apr 28, 2026
Arcade SDK `11.0.0-beta.26215.121` moved `PublishBuildAssets.proj` from `tools/SdkTasks/` to `toolset/` (see dotnet/arcade#16753). This caused the "generate and publish BAR manifest" CI step to fail with: ``` error MSB3202: The project file "...\packages\microsoft.dotnet.arcade.sdk\11.0.0-beta.26215.121\tools\SdkTasks\PublishBuildAssets.proj" was not found. ``` Fixes: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=13945090 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
rolfbjarne
added a commit
to dotnet/macios
that referenced
this pull request
Apr 28, 2026
…h for newer Arcade SDK (#25269) Arcade SDK `11.0.0-beta.26215.121` moved `PublishBuildAssets.proj` from `tools/SdkTasks/` to `toolset/` (see dotnet/arcade#16753). This caused the "generate and publish BAR manifest" CI step to fail with: ``` error MSB3202: The project file "...\packages\microsoft.dotnet.arcade.sdk\11.0.0-beta.26215.121\tools\SdkTasks\PublishBuildAssets.proj" was not found. ``` Fixes: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=13945090 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Backport of #25260. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> 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
3 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.
Note
This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/dotnet
New Dependencies
Associated changes in source repos
Diff the source with this PR branch