Skip to content

Ship CoreCLR packages in servicing releases - #113020

Merged
amanasifkhalid merged 1 commit into
dotnet:mainfrom
amanasifkhalid:ship-coreclr-packages-in-servicing
Feb 28, 2025
Merged

Ship CoreCLR packages in servicing releases#113020
amanasifkhalid merged 1 commit into
dotnet:mainfrom
amanasifkhalid:ship-coreclr-packages-in-servicing

Conversation

@amanasifkhalid

Copy link
Copy Markdown
Contributor

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-staging with these changes. Fixes #112710.

Copilot AI review requested due to automatic review settings February 28, 2025 17:21

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

@amanasifkhalid

Copy link
Copy Markdown
Contributor Author

@jkoritzinsky could you PTAL? Thanks!

@jkoritzinsky jkoritzinsky left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the previous error messages, LGTM

@amanasifkhalid
amanasifkhalid merged commit bb5f473 into dotnet:main Feb 28, 2025
@amanasifkhalid
amanasifkhalid deleted the ship-coreclr-packages-in-servicing branch February 28, 2025 20:45
@amanasifkhalid

Copy link
Copy Markdown
Contributor Author

/backport to release/9.0-staging

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/13597197739

@github-actions

Copy link
Copy Markdown
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 128

Please backport manually!

@github-actions github-actions Bot locked and limited conversation to collaborators Mar 31, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Infrastructure-coreclr Only use for closed issues

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

CoreCLR packages are not servicing ready

3 participants