From 04948f708746e3507771f08dfe36e33b4e9afcb8 Mon Sep 17 00:00:00 2001
From: Russ Keldorph <Russ.Keldorph@microsoft.com>
Date: Thu, 12 Apr 2018 16:12:43 -0700
Subject: Make Windows builds always portable

Apparently there is little or no need for a non-portable Windows build, so
rather than trying to figure out which version of Windows we are building
on, just ignore -PortableBuild=false.  We can add a warning or refuse to
accept the switch later if necessary, but for now we need to continue
accepting it to avoid build breaks.

Fixes #14291
---
 src/.nuget/dir.props | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props
index 3f0936a662..224c6bf1be 100644
--- a/src/.nuget/dir.props
+++ b/src/.nuget/dir.props
@@ -67,13 +67,8 @@
     <When Condition="'$(PackageRID)' != ''" />
     <When Condition="'$(_runtimeOSFamily)' == 'win'">
       <PropertyGroup>
-        <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)' == 'true'">win</RIDPlatform>
-        <PackageRID>$(RIDPlatform)-$(ArchGroup)</PackageRID>
+        <!-- Note: Windows builds are always portable (-PortableBuild=false is ignored) -->
+        <PackageRID>win-$(ArchGroup)</PackageRID>
       </PropertyGroup>
     </When>
     <When Condition="'$(_runtimeOSFamily)' == 'osx'">
-- 
cgit v1.2.3