[main] Source code updates from dotnet/source-build-reference-packages#4635
Closed
dotnet-maestro[bot] wants to merge 5 commits intomainfrom
Closed
[main] Source code updates from dotnet/source-build-reference-packages#4635dotnet-maestro[bot] wants to merge 5 commits intomainfrom
dotnet-maestro[bot] wants to merge 5 commits intomainfrom
Conversation
Contributor
Author
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Member
|
/backport to release/11.0.1xx-preview1 |
Contributor
|
Started backporting to |
Contributor
|
@jonathanpeppers backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [source-build-reference-packages] Source update df3705e → 44522c8 Diff: https://github.com/dotnet/source-build-reference-packages/compare/df3705e5bd9efd32d0ecbafeebbde7503951a536..44522c88484dc1620a53ac7691972b1b0cf3abc6
Using index info to reconstruct a base tree...
M src/source-build-reference-packages/eng/Version.Details.props
M src/source-build-reference-packages/eng/Version.Details.xml
M src/source-build-reference-packages/global.json
M src/source-manifest.json
Falling back to patching base and 3-way merge...
Auto-merging src/source-build-reference-packages/eng/Version.Details.props
CONFLICT (content): Merge conflict in src/source-build-reference-packages/eng/Version.Details.props
Auto-merging src/source-build-reference-packages/eng/Version.Details.xml
CONFLICT (content): Merge conflict in src/source-build-reference-packages/eng/Version.Details.xml
Auto-merging src/source-build-reference-packages/global.json
CONFLICT (content): Merge conflict in src/source-build-reference-packages/global.json
Auto-merging src/source-manifest.json
CONFLICT (content): Merge conflict in src/source-manifest.json
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 [source-build-reference-packages] Source update df3705e → 44522c8 Diff: https://github.com/dotnet/source-build-reference-packages/compare/df3705e5bd9efd32d0ecbafeebbde7503951a536..44522c88484dc1620a53ac7691972b1b0cf3abc6
Error: The process '/usr/bin/git' failed with exit code 128 |
jonathanpeppers
added a commit
that referenced
this pull request
Feb 4, 2026
… 11 Preview 1 Context: dotnet/source-build-reference-packages#1564 Manual/partial backport of: #4635 * Add .NET MAUI baseline manifests for .NET 11 Preview 1 dotnet/source-build-reference-packages#1564
Contributor
Author
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Member
|
@jonathanpeppers I folded this dependency update into #4646 earlier today. We can close this PR. |
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
2 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 source repo
as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/source-build-reference-packages
Diff the source with this PR branch