From: Davis Goodin <dagood@users.noreply.github.com>
Date: Mon, 7 Jan 2019 19:16:45 +0000 (-0600)
Subject: Fix runtime.depproj allconfigurations restore (dotnet/corefx#34332)
X-Git-Tag: submit/tizen/20210909.063632~11031^2~2753
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fdf51d1619812f6f3aef77380d211e7b26e836c;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

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
--- 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'">