From da1d8cd17a8ec2a78e8139d03be358d26acb503c Mon Sep 17 00:00:00 2001
From: Gaurav Khanna <gkhanna@microsoft.com>
Date: Wed, 22 Mar 2017 13:30:49 -0700
Subject: Enable Portable Windows RID (#10365)

* Enable Portable RID support for Windows and OSX.
---
 src/.nuget/dir.props | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props
index eb1457160d..6f9e29cf27 100644
--- a/src/.nuget/dir.props
+++ b/src/.nuget/dir.props
@@ -61,9 +61,13 @@
     <When Condition="'$(PackageRID)' != ''" />
     <When Condition="'$(_runtimeOSFamily)' == 'win'">
       <PropertyGroup>
-        <PackageRID Condition="'$(ArchGroup)' == 'x86' OR '$(ArchGroup)' == 'x64'">win7-$(ArchGroup)</PackageRID>
-        <PackageRID Condition="'$(ArchGroup)' == 'arm'">win8-$(ArchGroup)</PackageRID>
-        <PackageRID Condition="'$(ArchGroup)' == 'arm64'">win10-$(ArchGroup)</PackageRID>
+        <RIDPlatform>win7</RIDPlatform>
+        <RIDPlatform Condition="'$(ArchGroup)' == 'arm'">win8</RIDPlatform>
+        <RIDPlatform Condition="'$(ArchGroup)' == 'arm64'">win10</RIDPlatform>
+        
+        <!-- Set the platform part of the RID if we are doing a portable build -->
+        <RIDPlatform Condition="'$(PortableBuild)' == '1'">win</RIDPlatform>
+        <PackageRID>$(RIDPlatform)-$(ArchGroup)</PackageRID>
       </PropertyGroup>
     </When>
     <When Condition="'$(_runtimeOSFamily)' == 'osx'">
-- 
cgit v1.2.3