diff --git a/config.json b/config.json
index bf20cb414ad3..5d568358276b 100644
--- a/config.json
+++ b/config.json
@@ -31,11 +31,17 @@
       "defaultValue": false
     },
     "RuntimeOS": {
-      "description": "The RuntimeOS used for building and restoring native OS dependent assets (i.e. RID specific binaries)",
+      "description": "The RuntimeOS of the build system.",
       "valueType": "property",
       "values": ["win7", "osx.10.10", "ubuntu.14.04", "ubuntu.16.04", "etc-other-rid-based-os-names"],
       "defaultValue": ""
     },
+    "PackageRID": {
+      "description": "The RID of the target package.",
+      "valueType": "property",
+      "values": ["win7-x64", "ubuntu.14.04-x64"],
+      "defaultValue": ""
+    },
     "PortableBuild": {
       "description": "Indicates if this is a portable build.",
       "valueType": "property",
diff --git a/dir.props b/dir.props
index e97595d2011b..31390dfbeea0 100644
--- a/dir.props
+++ b/dir.props
@@ -124,6 +124,29 @@
   </PropertyGroup>
 
   <Import Project="$(BuildConfigurationImportFile)" Condition="Exists('$(BuildConfigurationImportFile)')" />
+  <PropertyGroup>
+    <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
+    <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
+    <_portableOS>linux</_portableOS>
+    <_portableOS Condition="'$(_runtimeOSFamily)' == 'win'">win</_portableOS>
+    <_portableOS Condition="'$(_runtimeOSFamily)' == 'osx'">osx</_portableOS>
+
+    <_runtimeOS>$(RuntimeOS)</_runtimeOS>
+    <_runtimeOS Condition="'$(_runtimeOS)' == 'tizen.4.0.0'">ubuntu.14.04</_runtimeOS>
+    <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS>
+    <ToolRuntimeRID>$(_runtimeOS)-x64</ToolRuntimeRID>
+
+    <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
+    <_portableOS Condition="'$(OSGroup)' == 'Unix' AND '$(_runtimeOSFamily)' != 'osx'">linux</_portableOS>
+    <_portableOS Condition="'$(OSGroup)' == 'Windows_NT'">win</_portableOS>
+
+    <_packageRID/>
+    <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(ArchGroup)</_packageRID>
+    <_packageRID Condition="'$(TargetGroup)' == 'uap'">win10-$(ArchGroup)</_packageRID>
+    <_packageRID Condition="'$(TargetGroup)' == 'uapaot'">win10-$(ArchGroup)-aot</_packageRID>
+    <PackageRID Condition="'$(PackageRID)' == ''">$(_packageRID)</PackageRID>
+    <PackageRID Condition="'$(PackageRID)' == ''">$(RuntimeOS)-$(ArchGroup)</PackageRID>
+  </PropertyGroup>
 
   <!-- Import packaging props -->
   <Import Project="$(MSBuildThisFileDirectory)Packaging.props"/>
diff --git a/external/ILLink/ILLink.depproj b/external/ILLink/ILLink.depproj
index 30b57ffaf9c4..18808d3e6496 100644
--- a/external/ILLink/ILLink.depproj
+++ b/external/ILLink/ILLink.depproj
@@ -6,6 +6,7 @@
     <NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort>
     <OutputPath>$(ToolsDir)ILLink</OutputPath>
     <EnableBinPlacing>false</EnableBinPlacing>
+    <NugetRuntimeIdentifier>$(ToolRuntimeRID)</NugetRuntimeIdentifier>
     <RidSpecificAssets>true</RidSpecificAssets>
   </PropertyGroup>
   <ItemGroup>
diff --git a/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj b/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
index 93ebafc163a4..a1bc6c2d66f4 100644
--- a/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
+++ b/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
@@ -9,7 +9,7 @@
     <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
     <NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort>
     <OutputPath>$(RefRootPath)SharedFrameworkValidation.LKG</OutputPath>
-    <NugetRuntimeIdentifier>$(_PublishRID)</NugetRuntimeIdentifier>
+    <NugetRuntimeIdentifier>$(_PackageRID)</NugetRuntimeIdentifier>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
   </PropertyGroup>
 
diff --git a/external/dir.props b/external/dir.props
index 9427eac821f3..a874fd0e204f 100644
--- a/external/dir.props
+++ b/external/dir.props
@@ -1,13 +1,8 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" 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>
     <IntermediateOutputPath>$(IntermediateOutputPath)$(OSGroup)-$(ArchGroup)/</IntermediateOutputPath>
-    <RuntimeOS Condition="'$(PortableBuild)' == 'true'">linux</RuntimeOS>
-    <RuntimeOS Condition="'$(PortableBuild)' == 'true' and '$(_runtimeOSFamily)' == 'win'">win</RuntimeOS>
-    <RuntimeOS Condition="'$(PortableBuild)' == 'true' and '$(_runtimeOSFamily)' == 'osx'">osx</RuntimeOS>
-    <NugetRuntimeIdentifier>$(RuntimeOS)-$(ArchGroup)</NugetRuntimeIdentifier>
+    <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
     <ContainsPackageReferences>true</ContainsPackageReferences>
     <!-- We need configuration-specific assets files. -->
     <RestoreOutputPath>$(IntermediateOutputPath)</RestoreOutputPath>
diff --git a/external/docs/docs.depproj b/external/docs/docs.depproj
index 60e842cc25d0..21f41e5384b8 100644
--- a/external/docs/docs.depproj
+++ b/external/docs/docs.depproj
@@ -3,7 +3,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <NuGetRuntimeIdentifier>none</NuGetRuntimeIdentifier>
     <OutputPath>$(XmlDocDir)</OutputPath>
     <EnableBinPlacing>false</EnableBinPlacing>
   </PropertyGroup>
diff --git a/external/ilasm/ilasm.depproj b/external/ilasm/ilasm.depproj
index fb3e77537290..9a7184b98a6a 100644
--- a/external/ilasm/ilasm.depproj
+++ b/external/ilasm/ilasm.depproj
@@ -2,10 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <!-- Always restore the x64 assets. These are build-only assets, so they should match the environment of the build. -->
-    <NugetRuntimeIdentifier>$(RuntimeOS)-x64</NugetRuntimeIdentifier>
-    <!-- Tizen does not provide the x64 runtime so replaces it with the ubuntu.14.04-x64 -->
-    <NugetRuntimeIdentifier Condition="'$(RuntimeOS)' == 'tizen.4.0.0'">ubuntu.14.04-x64</NugetRuntimeIdentifier>
+    <NugetRuntimeIdentifier>$(ToolRuntimeRID)</NugetRuntimeIdentifier>
     <OutputPath>$(ToolsDir)ilasm</OutputPath>
     <EnableBinPlacing>false</EnableBinPlacing>
     <RidSpecificAssets>true</RidSpecificAssets>
diff --git a/external/netfx-conflicts/netfx-conflicts.depproj b/external/netfx-conflicts/netfx-conflicts.depproj
index 0abf1ec0063a..51fc85b5d164 100644
--- a/external/netfx-conflicts/netfx-conflicts.depproj
+++ b/external/netfx-conflicts/netfx-conflicts.depproj
@@ -8,7 +8,6 @@
     <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
     <PackageTargetFallback>netstandard1.1;netstandard1.2;netstandard1.3</PackageTargetFallback>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
     <EnableBinPlacing>false</EnableBinPlacing>
   </PropertyGroup>
 
diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj
index d8e461a6a9bd..a860b41ed94a 100644
--- a/external/netfx/netfx.depproj
+++ b/external/netfx/netfx.depproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <BinPlaceRef>true</BinPlaceRef>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
     <RefOutputPath>$(RefPath)</RefOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(NuGetTargetMoniker)' == '.NETFramework,Version=v4.6.3'">
diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj
index 92e300ef55ee..f818449ea9d7 100644
--- a/external/netstandard/netstandard.depproj
+++ b/external/netstandard/netstandard.depproj
@@ -6,7 +6,6 @@
     <IsNETStandard1x Condition="$(NETStandardVersion.StartsWith('1.'))">true</IsNETStandard1x>
     <BinPlaceRef>true</BinPlaceRef>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
     <_NETStandardTFMFolder Condition="'$(NuGetTargetMoniker)' == '.NETStandard,Version=v2.0'">netstandard2.0</_NETStandardTFMFolder>
   </PropertyGroup>
 
diff --git a/external/portable/portable.depproj b/external/portable/portable.depproj
index 54b1f268db0a..1ac886ed1299 100644
--- a/external/portable/portable.depproj
+++ b/external/portable/portable.depproj
@@ -4,7 +4,6 @@
   <PropertyGroup>
     <BinPlaceRef>true</BinPlaceRef>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="$(TargetingPackNugetPackageId)">
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index 7423fd37ba91..fbf223dff331 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -2,11 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
-    <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT' AND '$(RunningOnUnix)' == 'true'">win-x64</NugetRuntimeIdentifier>
-    <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Unix' AND '$(RunningOnUnix)' != 'true'">linux-x64</NugetRuntimeIdentifier>
-    <NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uap'">win10-$(ArchGroup)</NugetRuntimeIdentifier>
-    <NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uapaot'">win10-$(ArchGroup)-aot</NugetRuntimeIdentifier>
+    <NugetRuntimeIdentifier>$(PackageRID)</NugetRuntimeIdentifier>
     <RidSpecificAssets>true</RidSpecificAssets>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
diff --git a/external/winrt/winrt.depproj b/external/winrt/winrt.depproj
index 67ffa0b1d560..4fc7a6203b9d 100644
--- a/external/winrt/winrt.depproj
+++ b/external/winrt/winrt.depproj
@@ -6,7 +6,6 @@
     <TargetExt>.winmd</TargetExt>
     <BinPlaceRef>true</BinPlaceRef>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.TargetingPack.Private.WinRT">
diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props b/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
index 6269203455cf..ef4618d15b45 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 c92651a996ea..4dda2a8ff588 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 0e27f9cdcb5a..aee4309040a2 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>
diff --git a/src/SharedFrameworkValidation/RestoreSDKProject/RestoreSDKProject.csproj b/src/SharedFrameworkValidation/RestoreSDKProject/RestoreSDKProject.csproj
index 787ece8d164f..e4b035133d37 100644
--- a/src/SharedFrameworkValidation/RestoreSDKProject/RestoreSDKProject.csproj
+++ b/src/SharedFrameworkValidation/RestoreSDKProject/RestoreSDKProject.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeFrameworkVersion>$(_RuntimeFrameworkVersion)</RuntimeFrameworkVersion>
     <CoreFxPackageVersion>4.4.0-$(CoreFxExpectedPrerelease)</CoreFxPackageVersion>
-    <RuntimeIdentifier>$(_PublishRID)</RuntimeIdentifier>
+    <RuntimeIdentifier>$(_PackageRID)</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
diff --git a/src/SharedFrameworkValidation/SharedFrameworkValidation.proj b/src/SharedFrameworkValidation/SharedFrameworkValidation.proj
index 1891b5b6aae6..eebed9a2742e 100644
--- a/src/SharedFrameworkValidation/SharedFrameworkValidation.proj
+++ b/src/SharedFrameworkValidation/SharedFrameworkValidation.proj
@@ -10,7 +10,6 @@
     <LKGSharedFrameworkExtractPath>$(RefRootPath)sharedFrameworkZip.LKG/shared/Microsoft.NETCore.App/$(_LKGSharedFrameworkVersion)</LKGSharedFrameworkExtractPath>
     <_RunTestsScriptName Condition="'$(RunningOnUnix)' != 'true'">CloneAndRunTests.cmd</_RunTestsScriptName>
     <_RunTestsScriptName Condition="'$(RunningOnUnix)' == 'true'">CloneAndRunTests.sh</_RunTestsScriptName>
-    <_PublishRID>$(RuntimeOS)-$(ArchGroup)</_PublishRID>
   </PropertyGroup>
 
   <Target Name="CreateScriptToDownloadSharedFrameworkZip">
@@ -57,8 +56,8 @@
 
   <Target Name="BuildPackagesProject">
     <PropertyGroup>
-      <_RestorePackagesCommand>"$(DotnetToolCommand)" restore $(MSBuildThisFileDirectory)/RestoreSDKProject/RestoreSDKProject.csproj /p:_PublishRID=$(_PublishRID) /p:_RuntimeFrameworkVersion=$(MicrosoftNETCoreAppPackageVersion) /p:CoreFxExpectedPrerelease=$(CoreFxExpectedPrerelease)</_RestorePackagesCommand>
-      <_PublishPackagesProjectCommand>"$(DotnetToolCommand)" publish $(MSBuildThisFileDirectory)/RestoreSDKProject/RestoreSDKProject.csproj /p:_PublishRID=$(_PublishRID) /p:_MetaPackageDestinationFolder=$(SharedFrameworkValidationRefPath) -f netcoreapp2.0 -r $(_PublishRID) -o $(SharedFrameworkValidationRuntimePath)</_PublishPackagesProjectCommand>
+      <_RestorePackagesCommand>"$(DotnetToolCommand)" restore $(MSBuildThisFileDirectory)/RestoreSDKProject/RestoreSDKProject.csproj /p:_PackageRID=$(PackageRID) /p:_RuntimeFrameworkVersion=$(MicrosoftNETCoreAppPackageVersion) /p:CoreFxExpectedPrerelease=$(CoreFxExpectedPrerelease)</_RestorePackagesCommand>
+      <_PublishPackagesProjectCommand>"$(DotnetToolCommand)" publish $(MSBuildThisFileDirectory)/RestoreSDKProject/RestoreSDKProject.csproj /p:_PackageRID=$(PackageRID) /p:_MetaPackageDestinationFolder=$(SharedFrameworkValidationRefPath) -f netcoreapp2.0 -o $(SharedFrameworkValidationRuntimePath) -r $(PackageRID)</_PublishPackagesProjectCommand>
     </PropertyGroup>
     <Exec Command="$(_RestorePackagesCommand)" StandardOutputImportance="Low" />
     <Exec Command="$(_PublishPackagesProjectCommand)" StandardOutputImportance="Low" />
@@ -66,7 +65,7 @@
 
   <Target Name="BuildDependenciesProject">
     <MSBuild Projects="../../external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj"
-             Properties="_PublishRID=$(_PublishRID)"
+            Properties="_PackageRID=$(PackageRID)"
              ContinueOnError="ErrorAndStop" />
   </Target>