fix stable pkg proj versioning support #58474
Conversation
|
Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer Issue DetailsFixes #57982
|
| <PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'"> | ||
| <IsShipping>false</IsShipping> | ||
| </PropertyGroup> |
There was a problem hiding this comment.
Does that mean that none of these packages ship during servicing?
There was a problem hiding this comment.
they will get shipped internally
There was a problem hiding this comment.
Why do we change the definition of what's shipping publicly vs internally based on if the repo is in servicing mode?
There was a problem hiding this comment.
What packages are these specifically? IsShipping generally controls whether something goes to NuGet. Are they supposed to go to NuGet in non-servicing?
There was a problem hiding this comment.
Why do we change the definition of what's shipping publicly vs internally based on if the repo is in servicing mode?
basically following the same convention guidelines from the coreclr team as we did for 5.0.0
What packages are these specifically? IsShipping generally controls whether something goes to NuGet. Are they supposed to go to NuGet in non-servicing?
yes they are not supposed to go to nuget in non-servicing
There was a problem hiding this comment.
But they do go in rtm? What package set is this specifically?
There was a problem hiding this comment.
yes they go to nuget in rtm, these https://github.com/dotnet/runtime/tree/main/src/coreclr/.nuget
Microsoft.ILVerification
Microsoft.NETCore.ILAsm
Microsoft.NETCore.ILDAsm
Microsoft.NETCore.TestHost
dotnet-ilverify
|
/backport to main |
|
Started backporting to main: https://github.com/dotnet/runtime/actions/runs/1199414650 |
|
@Anipik backporting to main failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: fix stable package proj versioning support
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
Patch failed at 0001 fix stable package proj versioning support
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 128Please backport manually! |
ghost
locked as resolved and limited conversation to collaborators
3 participants
Fixes #57982