Skip building of workload manifests#4166
Merged
mthalman merged 1 commit intodotnet:release/10.0.2xxfrom Jan 13, 2026
Merged
Conversation
NikolaMilosavljevic
approved these changes
Jan 13, 2026
joeloff
approved these changes
Jan 13, 2026
Member
Author
|
/backport to main |
Contributor
|
Started backporting to |
Contributor
|
@mthalman backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Skip building of workload manifests
Using index info to reconstruct a base tree...
M repo-projects/sdk.proj
M src/sdk/src/Workloads/Manifests/manifest-packages.csproj
Falling back to patching base and 3-way merge...
Auto-merging repo-projects/sdk.proj
CONFLICT (content): Merge conflict in repo-projects/sdk.proj
Auto-merging src/sdk/src/Workloads/Manifests/manifest-packages.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Skip building of workload manifests
Error: The process '/usr/bin/git' failed with exit code 128 |
mthalman
added a commit
to mthalman/dotnet
that referenced
this pull request
Jan 13, 2026
This was referenced Jan 13, 2026
Merged
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.
Fixes #4155
The 10.0.2xx build fails during darc publishing because there are multiple workload manifest packages described in
MergedManifest.xmlwith duplicate names. For example:In fact, neither of these packages should be output by the build. For 2xx, the intent is to use the downloaded 10.0.100 manifest packages, not build new ones.