[release/11.0.1xx-preview1] Update dependencies from dotnet/macios#33921
Merged
rmarinho merged 1 commit intorelease/11.0.1xx-preview1from Feb 6, 2026
Conversation
…205.4 On relative base path root Microsoft.iOS.Sdk.net11.0_26.2 , Microsoft.MacCatalyst.Sdk.net11.0_26.2 , Microsoft.macOS.Sdk.net11.0_26.2 , Microsoft.tvOS.Sdk.net11.0_26.2 From Version 26.2.11314-net11-p1 -> To Version 26.2.11315-net11-p1
This was referenced Feb 6, 2026
Open
Member
|
/backport to net11.0 |
Contributor
|
Started backporting to |
Contributor
|
@rmarinho backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update dependencies from https://github.com/dotnet/macios build 20260205.4 On relative base path root Microsoft.iOS.Sdk.net11.0_26.2 , Microsoft.MacCatalyst.Sdk.net11.0_26.2 , Microsoft.macOS.Sdk.net11.0_26.2 , Microsoft.tvOS.Sdk.net11.0_26.2 From Version 26.2.11314-net11-p1 -> To Version 26.2.11315-net11-p1
Using index info to reconstruct a base tree...
M eng/Version.Details.xml
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
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 Update dependencies from https://github.com/dotnet/macios build 20260205.4 On relative base path root Microsoft.iOS.Sdk.net11.0_26.2 , Microsoft.MacCatalyst.Sdk.net11.0_26.2 , Microsoft.macOS.Sdk.net11.0_26.2 , Microsoft.tvOS.Sdk.net11.0_26.2 From Version 26.2.11314-net11-p1 -> To Version 26.2.11315-net11-p1
Error: The process '/usr/bin/git' failed with exit code 128 |
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
1 participant
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.
This pull request updates the following dependencies
From https://github.com/dotnet/macios