Fix runtime.depproj allconfigurations restore (dotnet/corefx#34332)

* Fix runtime.depproj allconfigurations restore

Use default PackageRID for RuntimeIdentifier, not the overridden value
from build args. In allconfigurations mode, using PackageRID can cause
the wrong assets to be restored for other configurations.

* Incorporate $(RuntimeOS)-$(ArchGroup) defaulting

Commit migrated from https://github.com/dotnet/corefx/commit/98aac1eab50bcc379c14e85fb1f530d2858cc8f6

diff --git a/src/libraries/external/runtime/runtime.depproj b/src/libraries/external/runtime/runtime.depproj
index 5759bcf..e10100e 100644 (file)
--- a/src/libraries/external/runtime/runtime.depproj
+++ b/src/libraries/external/runtime/runtime.depproj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
+    <!--
+      Use the configuration default for PackageRID. PackageRID might be overridden by the build
+      command, and interfere with this depproj in -allconfigurations mode.
+    -->
+    <RuntimeIdentifier>$(PackageRIDConfigurationDefault)</RuntimeIdentifier>
     <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsAOT)'=='true'">