Skip to content

Conversation

@MilenaHristova
Copy link

Add a boolean property named ProducesDotNetReleaseShippingAssets in Publishing.props for repos that produce .NET shipping packages (packages that we ship with the release infra)
Based on this property we will select which packages to ship as part of .NET on release day.

This is a infrastructure only change. It will add extra metadata to the MergedManifest.xml produced during CI build.

Issue: https://github.com/dotnet/release/issues/822

@akoeplinger akoeplinger merged commit 2d3f1fe into dotnet:main Feb 21, 2024
@MilenaHristova MilenaHristova deleted the publishing-props branch February 27, 2024 10:38
@MilenaHristova
Copy link
Author

/backport to release/8.0

@github-actions
Copy link

@MilenaHristova
Copy link
Author

/backport to release/7.0

@github-actions
Copy link

@MilenaHristova
Copy link
Author

/backport to release/6.0

@github-actions
Copy link

@github-actions
Copy link

@MilenaHristova backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: add ProducesDotNetReleaseShippingAssets property
Using index info to reconstruct a base tree...
M	eng/Publishing.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Publishing.props
CONFLICT (content): Merge conflict in eng/Publishing.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add ProducesDotNetReleaseShippingAssets property
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link

@MilenaHristova an error occurred while backporting to release/6.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants