From 99809cd3d01496af6fe973fd0364f06846769640 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 17 Jul 2017 19:01:20 +0200
Subject: Move RID computations to dir.props

Move the RID calculation to the common dir.props file.

Compute a ToolRuntimeRID to be used for assets that need to run as part of the tools infrastructure to build things.

Compute PackageRID which will be used as the target RID for the assets that are being built.

Make sure both ToolRuntimeRID and PackageRID honor both a specific and a portable RID.
---
 .../netcoreapp.rids.props                              |  9 ---------
 pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props        | 18 ------------------
 pkg/dir.props                                          | 11 ++---------
 3 files changed, 2 insertions(+), 36 deletions(-)

(limited to 'pkg')

diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props b/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
index 6269203455..ef4618d15b 100644
--- a/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
+++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(PortableBuild)' == 'true'">
-    <PackageRID>linux-$(ArchGroup)</PackageRID>
-    <PackageRID Condition="'$(_runtimeOSFamily)' == 'osx'">osx-$(ArchGroup)</PackageRID>
-    <PackageRID Condition="'$(_runtimeOSFamily)' == 'win'">win-$(ArchGroup)</PackageRID>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(PortableBuild)' != 'true'">
-    <PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
-  </PropertyGroup>
-
   <ItemGroup>
     <OfficialBuildRID Include="linux-arm">
       <Platform>arm</Platform>
diff --git a/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props b/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props
index c92651a996..4dda2a8ff5 100644
--- a/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props
+++ b/pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_aotSuffix Condition="'$(TargetGroup)' == 'uapaot'">-aot</_aotSuffix>
-  </PropertyGroup>
-  
-  <Choose>
-    <When Condition="'$(PackageRID)' != ''" />
-    <When Condition="'$(_runtimeOSFamily)' == 'win'">
-      <PropertyGroup>
-        <PackageRID>win10-$(ArchGroup)$(_aotSuffix)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
   <ItemGroup>
     <OfficialBuildRID Include="win10-x86">
       <Platform>x86</Platform>
diff --git a/pkg/dir.props b/pkg/dir.props
index 0e27f9cdcb..aee4309040 100644
--- a/pkg/dir.props
+++ b/pkg/dir.props
@@ -2,20 +2,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
 
-  <PropertyGroup>
-    <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
-    <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
-  </PropertyGroup>
-
   <!-- Packages opt-in to automatic RID-specific builds by placing a *.RID.props next to their project
-       that defines the following:
-       PackageRID property: the RID which we should be building for
-       OfficialBuildRID item: all RIDs targeted by the package -->
+       that defines the OfficialBuildRID item: all RIDs targeted by the package -->
   <Import Project="$(MSBuildProjectDirectory)\*.rids.props" />
 
   <!-- create the "BuildRID" item which is the set of all supported RIDs, with metadata.
        We'll add a RID for the current platform even if it isn't in the officially supported set -->
-  <ItemGroup>
+  <ItemGroup Condition="'@(OfficialBuildRID)' != ''">
     <BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/>
     <BuildRID Include="$(PackageRID)">
       <Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform>
-- 
cgit v1.2.3