[release/6.0] Pass TargetRid and SourceBuildNonPortable to the native scripts (backport of #74504)

[ayakael]

Backport of #74504

Per @tmds:

Fixes https://github.com/dotnet/runtime/issues/74577.

Customer impact

Before this patch, additional RIDs would not properly flow down to runtime as __DistroRid would ignore previously set variables. This was problematic for source-build application, as every update we would have to update the RID graph, and porting to new distros would require modifying init-distro-rid.sh to output the correct RID.

Testing

• unit tests in ci
• source-build build within Alpine environment passes
• Installer backport: [release/6.0.1xx] Eliminate runtime portable build installer#14816

Risk

Low, as it is already in main, and only activates when these options are defined.

[dotnet-issue-labeler]

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

[ghost]

Tagging subscribers to this area: @hoyosjs
See info in area-owners.md if you want to be subscribed.

Issue Details

---

Backport of #74504

Per @tmds:

Fixes https://github.com/dotnet/runtime/issues/74577.

Author:	ayakael
Assignees:	-
Labels:	area-Infrastructure-coreclr, community-contribution
Milestone:	6.0.x

[carlossanlop]

@jkoritzinsky @MichaelSimons I see you approved the main PR. When/if this is ready, can you please add the servicing-consider label and send an email to Tactics requesting merge approval?

[carlossanlop]

Actually, this is an infra change only. We just need a code review sign off from one or either of you, @jkoritzinsky @MichaelSimons. @ViktorHofer too, if possible.

[ViktorHofer]

@tmds, do you remember if there's also a change required in Arcade for these set of changes?

[ViktorHofer]

Something must be missing here:

 The "GenerateRuntimeGraph" task failed unexpectedly.
  /__w/1/s/artifacts/source-build/self/src/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj(55,5): error MSB4018: System.InvalidOperationException: AdditionalRuntimeIdentifier banana.24-x64 was specified, which could not be found in any existing RuntimeGroup, and no parent was specified.

[ayakael]

Something must be missing here:

 The "GenerateRuntimeGraph" task failed unexpectedly.
  /__w/1/s/artifacts/source-build/self/src/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj(55,5): error MSB4018: System.InvalidOperationException: AdditionalRuntimeIdentifier banana.24-x64 was specified, which could not be found in any existing RuntimeGroup, and no parent was specified.

There's a patch somewhere that should be adding the AdditionalRuntimeIdentifier to runtime graph. Maybe it hasn't been backported yet? I think it was an installer level change

edit right, I suspect it's this #77510. Now that it's merged, I've rebased.

[ayakael]

Something must be missing here:

 The "GenerateRuntimeGraph" task failed unexpectedly.
  /__w/1/s/artifacts/source-build/self/src/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj(55,5): error MSB4018: System.InvalidOperationException: AdditionalRuntimeIdentifier banana.24-x64 was specified, which could not be found in any existing RuntimeGroup, and no parent was specified.

There's a patch somewhere that should be adding the AdditionalRuntimeIdentifier to runtime graph. Maybe it hasn't been backported yet? I think it was an installer level change

edit right, I suspect it's this #77510. Now that it's merged, I've rebased.

The rebase didn't work, there's some code missing somewhere for RIDs in AdditionalRuntimeIdentifier. I think it was implemented in source-build somewhere, so it might be an installer backport that needs doing. @tmds does this ring any bells?

[tmds]

This line is missing:

runtime/eng/SourceBuild.props

Line 50 in 794f1af

<InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS)</InnerBuildArgs>

[ayakael]

@ViktorHofer With above fix, CI is green.

[ViktorHofer]

@carlossanlop can this be merged into release/6.0 or is the branch closed?

[carlossanlop]

@carlossanlop can this be merged into release/6.0 or is the branch closed?

We're on time.

Infra change only (tell-mode). Signed off by area owner. No OOB package authoring changes needed. CI green. Ready to merge.