Skip to content

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

Merged
carlossanlop merged 1 commit into
dotnet:release/6.0from
ayakael:backport/pr-76068-to-release/6.0
Nov 3, 2022
Merged

[release/6.0] Use generated runtime.json when building shared framework packages (backport of #76068)#77510
carlossanlop merged 1 commit into
dotnet:release/6.0from
ayakael:backport/pr-76068-to-release/6.0

Conversation

@ayakael

@ayakaelayakael commented Oct 26, 2022

Copy link
Copy Markdown
Contributor

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

@ghostghost added area-Infrastructure-libraries community-contribution Indicates that the PR has been added by a community member labels Oct 26, 2022
@ghost

Copy link
Copy Markdown

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:-

@ViktorHoferViktorHofer 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.

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

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

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

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?

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

Copy link
Copy Markdown
Member

If these changes are sufficient, then this LGTM

@carlossanlop

Copy link
Copy Markdown
Contributor

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

@carlossanlop
carlossanlop merged commit 526eafa into dotnet:release/6.0Nov 3, 2022
@ghostghost locked as resolved and limited conversation to collaborators Dec 3, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Infrastructure-librariescommunity-contributionIndicates that the PR has been added by a community memberServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@ayakael@ViktorHofer@carlossanlop@leecow@teo-tsirpanis