[release/10.0.1xx] Fixup template versions and windowsdesktop stack versions#3290
Merged
mmitche merged 3 commits intodotnet:release/10.0.1xxfrom Nov 11, 2025
Conversation
Member
mmitche
commented
Nov 10, 2025
- Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label.
- Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows.
- Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label. - Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows.
Member
|
@mmitche - I think this will fix dotnet/source-build#5407, right? |
rbhanda
approved these changes
Nov 10, 2025
ViktorHofer
approved these changes
Nov 10, 2025
Member
ViktorHofer
left a comment
There was a problem hiding this comment.
LGTM, thanks. This should get ported into main (the infra parts)
ViktorHofer
reviewed
Nov 10, 2025
Removed comments regarding runtime shared framework and internal versions. Remove internal package version
Member
|
Build is failing because of macOS brownout. Can we merge anyway? |
Member
|
/backport to release/10.0.2xx |
Contributor
|
Started backporting to |
Contributor
|
@mthalman backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fixup template versions and windowsdesktop stack versions - Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label. - Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows.
Using index info to reconstruct a base tree...
M src/sdk/eng/Version.Details.xml
A src/windowsdesktop/eng/Versions.props
A src/wpf/eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging src/sdk/eng/Version.Details.xml
CONFLICT (content): Merge conflict in src/sdk/eng/Version.Details.xml
CONFLICT (modify/delete): src/windowsdesktop/eng/Versions.props deleted in HEAD and modified in Fixup template versions and windowsdesktop stack versions - Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label. - Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows.. Version Fixup template versions and windowsdesktop stack versions - Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label. - Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows. of src/windowsdesktop/eng/Versions.props left in tree.
CONFLICT (modify/delete): src/wpf/eng/Versions.props deleted in HEAD and modified in Fixup template versions and windowsdesktop stack versions - Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label. - Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows.. Version Fixup template versions and windowsdesktop stack versions - Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label. - Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows. of src/wpf/eng/Versions.props left in tree.
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 Fixup template versions and windowsdesktop stack versions - Fixup incorrectly resolved conflicts in wpf and windowsdesktop, should use a servicing label. - Remmove workarounds for project templates and ref packs now that we build key bits of the windowsdesktop stack on non-Windows.
Error: The process '/usr/bin/git' failed with exit code 128 |
Member
|
@mmitche how do we verify and validate that such changes forward flow into main? I.e. the windowsdesktop & wpf changes in this PR don't automatically forward flow because they don't have any inter branch forward flow. |
Member
Author
|
@ViktorHofer It's quite hard to do so. Which changes should forward flow vs. not? |
mmitche
added a commit
to mmitche/dotnet
that referenced
this pull request
Nov 13, 2025
Member
Author
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
5 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.