GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture.

[tmds]

Fixes #12515.

[tmds]

@dsplaisted ptal.

[dsplaisted]

LGTM. I think we should merge this into 6.0.2xx once we've created a branch for that.

[dsplaisted]

@tmds I've created a release/6.0.2xx branch. Could you rebase this PR onto that? Thanks!

[tmds]

@tmds I've created a release/6.0.2xx branch.

@dsplaisted I don't see the branch.

[dsplaisted]

@tmds Sorry, I forgot this PR was for dotnet/installer. I created the 6.0.2xx branch for dotnet/sdk, but not yet for dotnet/installer.

[dsplaisted]

@tmds OK, the 6.0.2xx branch has now been created in dotnet/installer. It's not ready to merge PRs into yet, but you can go ahead and rebase on top of it if you like.

[tmds]

@dsplaisted I've rebased against 6.0.2xx.

cc @omajid

[tmds]

@dsplaisted with the help of @omajid I built an rpm with this patch.

Unfortunately, it doesn't seem to work. Microsoft.NETCoreSdk.BundledVersions.props has:

<NETCoreSdkPortableRuntimeIdentifier>rhel.8-x64</NETCoreSdkPortableRuntimeIdentifier>

I was expecting to see linux-x64 here.

Do you have an idea where things might go wrong?

[tmds]

Do you have an idea where things might go wrong?

I guess OSName gets derived from the TargetRid, and I should be using HostOSName instead?

installer/src/SourceBuild/tarball/content/repos/installer.proj

Lines 9 to 24 in ca1b404

	<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
	<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
	<OSNameOverride>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</OSNameOverride>
	<RuntimeArg>--runtime-id $(OverrideTargetRid)</RuntimeArg>
	<RuntimeArg Condition="'$(TargetOS)' == 'Linux'">--runtime-id $(TargetRid)</RuntimeArg>
	<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
	<BuildCommandArgs>$(BuildCommandArgs) $(RuntimeArg)</BuildCommandArgs>
	<!--
	Setting NETCoreAppMaximumVersion to a high version so that the sdk doesn't complain if we're restoring/publishing for a higher version than the sdk.
	See https://github.com/dotnet/sdk/issues/1512#issuecomment-377082883
	-->
	<BuildCommandArgs>$(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9</BuildCommandArgs>
	<BuildCommandArgs>$(BuildCommandArgs) /p:OSName=$(OSNameOverride)</BuildCommandArgs>

[tmds]

I guess OSName gets derived from the TargetRid.

The build log confirms this. I'll update the PR.

[tmds]

I'll update the PR.

The PR now works as expected.

[tmds]

@dsplaisted can this be merged now?

[dsplaisted]

@tmds Thanks for the ping, I've merged this