[release/7.0-staging] Microsoft.NETCore.Platforms: support adding rids with '-' in the base part.#86282

carlossanlop merged 2 commits intorelease/7.0-stagingdotnet/runtime:release/7.0-stagingfrom

backport/pr-84413-to-release/7.0-stagingdotnet/runtime:backport/pr-84413-to-release/7.0-stagingCopy head branch name to clipboard