Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/6.0] Use generated runtime.json when building shared framework packages (backport of #76068) #77510

Merged

Conversation

ayakael
Copy link
Contributor

@ayakael ayakael commented Oct 26, 2022

Backport of #76068

Per @tmds

Fixes https://github.com/dotnet/runtime/issues/53550
Based on https://github.com/dotnet/runtime/pull/69455

With this change, when I build:

./build.sh /p:DotnetBuildFromSource=true /p:AdditionalRuntimeIdentifiers=fedora.45-x64
The new rid shows up in the packages:

artifacts/obj/Microsoft.NETCore.App.Bundle/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Composite.Bundle/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime.Composite/Debug/net7.0/linux-x64/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime.Composite/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime/Debug/net7.0/linux-x64/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/bin/Microsoft.NETCore.Platforms/Debug/runtime.json:    "fedora.45-x64": {

Customer impact

Allows for proper fllow of additional runtime identifiers, allowing builds on yet-to-be-introduced RIDs to pass

Testing

Risk

Low, as it is more relevant to source-build

@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Oct 26, 2022
@ghost
Copy link

ghost commented Oct 26, 2022

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

Backport of #76068

Per @tmds

Fixes https://github.com/dotnet/runtime/issues/53550
Based on https://github.com/dotnet/runtime/pull/69455

With this change, when I build:

./build.sh /p:DotnetBuildFromSource=true /p:AdditionalRuntimeIdentifiers=fedora.45-x64
The new rid shows up in the packages:

artifacts/obj/Microsoft.NETCore.App.Bundle/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Composite.Bundle/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime.Composite/Debug/net7.0/linux-x64/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime.Composite/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime/Debug/net7.0/linux-x64/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/obj/Microsoft.NETCore.App.Runtime/Debug/net7.0/linux-x64/output/shared/Microsoft.NETCore.App/8.0.0-dev/Microsoft.NETCore.App.deps.json:    "fedora.45-x64": [
artifacts/bin/Microsoft.NETCore.Platforms/Debug/runtime.json:    "fedora.45-x64": {
Author: ayakael
Assignees: -
Labels:

area-Infrastructure-libraries

Milestone: -

Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

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

LGTM but we need a servicing template and an approval from Tactics.

@ViktorHofer ViktorHofer added the Servicing-consider Issue for next servicing release review label Oct 31, 2022
@ViktorHofer
Copy link
Member

I don't think that this change is complete. Does the Microsoft.NETCore.Platforms library build outside of the -allconfigurations leg? We need it to produce the runtime.json file in all legs.

@ayakael
Copy link
Contributor Author

ayakael commented Oct 31, 2022

I don't think that this change is complete. Does the Microsoft.NETCore.Platforms library build outside of the -allconfigurations leg? We need it to produce the runtime.json file in all legs.

I wouldn't know, I just backported and tested within installer pipelines + Alpine's source-build, and it seems like everything flows.

@tmds do you have any insight on this?

@leecow leecow added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Nov 1, 2022
@leecow leecow modified the milestones: 6.0.x, 6.0.12 Nov 1, 2022
@ViktorHofer
Copy link
Member

If these changes are sufficient, then this LGTM

@carlossanlop
Copy link
Member

Approved by Tactics. Signed off by area owner. CI is green. Ready to merge. :shipit:

@carlossanlop carlossanlop merged commit 526eafa into dotnet:release/6.0 Nov 3, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Dec 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Infrastructure-libraries community-contribution Indicates that the PR has been added by a community member Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants