Ship CoreCLR packages in servicing releases#113020
Merged
amanasifkhalid merged 1 commit intodotnet:mainfrom Feb 28, 2025
Merged
Ship CoreCLR packages in servicing releases#113020amanasifkhalid merged 1 commit intodotnet:mainfrom
amanasifkhalid merged 1 commit intodotnet:mainfrom
Conversation
ghost
added
the
Contributor
Author
|
@jkoritzinsky could you PTAL? Thanks! |
jkoritzinsky
approved these changes
Feb 28, 2025
Member
jkoritzinsky
left a comment
jkoritzinsky
left a comment
There was a problem hiding this comment.
Based on the previous error messages, LGTM
Contributor
Author
|
/backport to release/9.0-staging |
Contributor
|
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/13597197739 |
Contributor
|
@amanasifkhalid backporting to "release/9.0-staging" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Ship CoreCLR packages in servicing releases
Using index info to reconstruct a base tree...
M src/coreclr/.nuget/Directory.Build.props
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/.nuget/Directory.Build.props
CONFLICT (content): Merge conflict in src/coreclr/.nuget/Directory.Build.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 Ship CoreCLR packages in servicing releases
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
4 tasks
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Unblock shippable CoreCLR packages from being published in servicing releases. This will need to be backported to servicing branches. Here's an official build of
release/9.0-stagingwith these changes. Fixes #112710.