Update scripts to set distro RID and properties to use it as TargetRid #17185
Conversation
|
It's not clear to me what the behavior change here is. With source-build today, the |
|
This is in response to one of the changes we're making this release around RIDs and moving the runtime away from being distro-aware. The intent here is no behaviour change. |
| @@ -159,6 +159,8 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <PropertyGroup> | |||
| <!-- Use current machine distro RID if set. Otherwise, fall back to RuntimeInformation.RuntimeIdentifier --> | |||
| <TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid> | |||
| <TargetRid Condition="'$(TargetRid)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</TargetRid> | |||
|
|
|||
| <TargetOS Condition="'$(TargetOS)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS'))">Windows_NT</TargetOS> | |||
There was a problem hiding this comment.
At line 171, the PortableRid is computed, should this be updated to default to the __PortableTargetOS? Also should the AdditionalRuntimeIdentified get set when PortableBuild == false? I thought that is required part of fixing dotnet/source-build#3578.
There was a problem hiding this comment.
At line 171, the PortableRid is computed, should this be updated to default to the __PortableTargetOS?
That makes sense - will update.
Also should the
AdditionalRuntimeIdentifiedget set whenPortableBuild == false? I thought that is required part of fixing dotnet/source-build#3578.
I was going to do that separately, since that is in response to a different RID-related change (dotnet/sdk#34279). Also, I believe it needs to happen in the sdk repo rather than this one.
There was a problem hiding this comment.
dotnet/source-build#3584 is the issue tracking the need for AdditionalRuntimeIdentifier.
|
@elinor-fung - Could you please backport this to the rc1 branch? |
|
This also needs to be backported to the |
This updates installer and source-build to call shared scripts for determining the distro RID and use that value as the
TargetRid.cc @dsplaisted @tmds
Fixes dotnet/source-build#3578