diff --git a/eng/native/naming.props b/eng/native/naming.props
index ab5462b0d7bc59..dbc7bc7cd9f886 100644
--- a/eng/native/naming.props
+++ b/eng/native/naming.props
@@ -6,6 +6,7 @@
         <ApplicationFileExtension>.exe</ApplicationFileExtension>
         <LibraryFilePrefix></LibraryFilePrefix>
         <LibraryFileExtension>.dll</LibraryFileExtension>
+        <StaticLibraryFileExtension>.lib</StaticLibraryFileExtension>
         <SymbolFileExtension>.pdb</SymbolFileExtension>
       </PropertyGroup>
     </When>
@@ -13,6 +14,7 @@
       <PropertyGroup>
         <LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix>
         <LibraryFileExtension>.dylib</LibraryFileExtension>
+        <StaticLibraryFileExtension>.a</StaticLibraryFileExtension>
         <SymbolFileExtension>.dwarf</SymbolFileExtension>
       </PropertyGroup>
     </When>
@@ -20,6 +22,7 @@
       <PropertyGroup>
         <LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix>
         <LibraryFileExtension>.so</LibraryFileExtension>
+        <StaticLibraryFileExtension>.a</StaticLibraryFileExtension>
         <!--symbols included in .so, like Linux, but can be generated externally and if so, uses .debug ext-->
         <SymbolFileExtension>.debug</SymbolFileExtension>
       </PropertyGroup>
@@ -28,6 +31,7 @@
       <PropertyGroup>
         <LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix>
         <LibraryFileExtension>.so</LibraryFileExtension>
+        <StaticLibraryFileExtension>.a</StaticLibraryFileExtension>
         <SymbolFileExtension>.dbg</SymbolFileExtension>
       </PropertyGroup>
     </Otherwise>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
index a72803c9c520a6..c21e7eaa736b74 100644
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
@@ -4,9 +4,12 @@
 
   <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
     <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
+    <PackageTargetRuntime Condition="'$(_packageTargetOSGroup)' == 'Windows_NT'">$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
   </PropertyGroup>
-  
-  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
+
+  <ItemGroup>
+    <NativeBinary Include="$(BinDir)ilasm$(ApplicationFileExtension)" />
+  </ItemGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
 </Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.FreeBSD.Microsoft.NETCore.ILAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.FreeBSD.Microsoft.NETCore.ILAsm.props
deleted file mode 100644
index a8019b21e6385c..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.FreeBSD.Microsoft.NETCore.ILAsm.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ilasm" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props
deleted file mode 100644
index a8019b21e6385c..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ilasm" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props
deleted file mode 100644
index a8019b21e6385c..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ilasm" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props
deleted file mode 100644
index e08b0241c56ed0..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
-  </PropertyGroup>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ilasm.exe" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
index d4010ae0fa2c78..ce1739f8d6f582 100644
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
@@ -4,9 +4,12 @@
 
   <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
     <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
+    <PackageTargetRuntime Condition="'$(_packageTargetOSGroup)' == 'Windows_NT'">$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
   </PropertyGroup>
 
-  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
+  <ItemGroup>
+    <NativeBinary Include="$(BinDir)ildasm$(ApplicationFileExtension)" />
+  </ItemGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
 </Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.FreeBSD.Microsoft.NETCore.ILDAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.FreeBSD.Microsoft.NETCore.ILDAsm.props
deleted file mode 100644
index f7ab15b6641705..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.FreeBSD.Microsoft.NETCore.ILDAsm.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ildasm" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props
deleted file mode 100644
index f7ab15b6641705..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ildasm" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props
deleted file mode 100644
index f7ab15b6641705..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ildasm" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props
deleted file mode 100644
index 5795eee2f208e6..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
-  </PropertyGroup>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)ildasm.exe" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
index d4010ae0fa2c78..5188a4cae99453 100644
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
@@ -4,9 +4,12 @@
 
   <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
     <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
+    <PackageTargetRuntime Condition="'$(_packageTargetOSGroup)' == 'Windows_NT'">$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
   </PropertyGroup>
 
-  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
+  <ItemGroup>
+    <NativeBinary Include="$(BinDir)corerun$(ApplicationFileExtension)" />
+  </ItemGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
 </Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.FreeBSD.Microsoft.NETCore.TestHost.props b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.FreeBSD.Microsoft.NETCore.TestHost.props
deleted file mode 100644
index ce004bdac4db86..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.FreeBSD.Microsoft.NETCore.TestHost.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)corerun" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props
deleted file mode 100644
index ce004bdac4db86..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)corerun" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props
deleted file mode 100644
index ce004bdac4db86..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)corerun" />
-  </ItemGroup>
-</Project>
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props b/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props
deleted file mode 100644
index 96c2595cf9102f..00000000000000
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
-  </PropertyGroup>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)CoreRun.exe" />
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props
index 27384cefe6a6a2..d563bd08bb1e76 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props
@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import
-    Condition="'$(PackageTargetRuntime)' != '' and Exists('$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildThisFile)')"
-    Project="$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildThisFile)" />
+  <ItemGroup>
+    <NativeBinary Include="$(DotNetHostBinDir)/apphost$(ApplicationFileExtension)" />
+    <NativeBinary Include="$(DotNetHostBinDir)/singlefilehost$(ApplicationFileExtension)" />
+    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(LibraryFileExtension)" />
+    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(StaticLibraryFileExtension)" />
+    <NativeBinary Include="$(DotNetHostBinDir)/nethost.h" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetOS)' == 'Windows_NT'">
+    <NativeBinary Include="$(DotNetHostBinDir)/comhost.dll" />
+    <NativeBinary Include="$(DotNetHostBinDir)/ijwhost.dll" />
+    <NativeBinary Include="$(DotNetHostBinDir)/ijwhost.lib" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
+    <File Include="@(NativeBinary)">
+      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      <IsNative>true</IsNative>
+    </File>
+  </ItemGroup>
 
 </Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.FreeBSD.Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.FreeBSD.Microsoft.NETCore.DotNetAppHost.props
deleted file mode 100644
index 85296204a2cf8d..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.FreeBSD.Microsoft.NETCore.DotNetAppHost.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/apphost" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/singlefilehost" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.so" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.a" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Linux.Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Linux.Microsoft.NETCore.DotNetAppHost.props
deleted file mode 100644
index 85296204a2cf8d..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Linux.Microsoft.NETCore.DotNetAppHost.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/apphost" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/singlefilehost" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.so" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.a" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.OSX.Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.OSX.Microsoft.NETCore.DotNetAppHost.props
deleted file mode 100644
index 61e6b950ffe0f6..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.OSX.Microsoft.NETCore.DotNetAppHost.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/apphost" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/singlefilehost" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.dylib" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.a" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props
deleted file mode 100644
index 6d52e1984f8ce5..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/apphost.exe" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/singlefilehost.exe" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/comhost.dll" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/ijwhost.dll" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/ijwhost.lib" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.dll" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.lib" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.lib" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
index 002cc4ca93cb3e..7de9341dc42a2e 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj
@@ -48,8 +48,12 @@
     </ItemGroup>
   </Target>
 
-  <Import 
-    Condition="'$(PackageTargetRuntime)' != '' and Exists('$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildProjectName).props')"
-    Project="$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildProjectName).props" />
+  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
+    <NativeBinary Include="$(DotNetHostBinDir)/dotnet$(ApplicationFileExtension)" />
+    <File Include="@(NativeBinary)">
+      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      <IsNative>true</IsNative>
+    </File>
+  </ItemGroup>
 
 </Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.FreeBSD.Microsoft.NETCore.DotNetHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.FreeBSD.Microsoft.NETCore.DotNetHost.props
deleted file mode 100644
index 19ec9d79030679..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.FreeBSD.Microsoft.NETCore.DotNetHost.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/dotnet" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Linux.Microsoft.NETCore.DotNetHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Linux.Microsoft.NETCore.DotNetHost.props
deleted file mode 100644
index 19ec9d79030679..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Linux.Microsoft.NETCore.DotNetHost.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/dotnet" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.OSX.Microsoft.NETCore.DotNetHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.OSX.Microsoft.NETCore.DotNetHost.props
deleted file mode 100644
index 19ec9d79030679..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.OSX.Microsoft.NETCore.DotNetHost.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/dotnet" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Windows_NT.Microsoft.NETCore.DotNetHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Windows_NT.Microsoft.NETCore.DotNetHost.props
deleted file mode 100644
index 1708e1f9228a90..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Windows_NT.Microsoft.NETCore.DotNetHost.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/dotnet.exe" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props
index 27384cefe6a6a2..6b1b70b6c20636 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import
-    Condition="'$(PackageTargetRuntime)' != '' and Exists('$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildThisFile)')"
-    Project="$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildThisFile)" />
+  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
+    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostpolicy$(LibraryFileExtension)"/>
+    <File Include="@(NativeBinary)">
+      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      <IsNative>true</IsNative>
+    </File>
+  </ItemGroup>
 
 </Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.FreeBSD.Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.FreeBSD.Microsoft.NETCore.DotNetHostPolicy.props
deleted file mode 100644
index f0a69699017e80..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.FreeBSD.Microsoft.NETCore.DotNetHostPolicy.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libhostpolicy.so"/>
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Linux.Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Linux.Microsoft.NETCore.DotNetHostPolicy.props
deleted file mode 100644
index f0a69699017e80..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Linux.Microsoft.NETCore.DotNetHostPolicy.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libhostpolicy.so"/>
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.OSX.Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.OSX.Microsoft.NETCore.DotNetHostPolicy.props
deleted file mode 100644
index 64e5aa6211e2af..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.OSX.Microsoft.NETCore.DotNetHostPolicy.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libhostpolicy.dylib" />
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Windows_NT.Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Windows_NT.Microsoft.NETCore.DotNetHostPolicy.props
deleted file mode 100644
index 8b78be3f92cea2..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Windows_NT.Microsoft.NETCore.DotNetHostPolicy.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/hostpolicy.dll"/>
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props
index 27384cefe6a6a2..81d8d72da34c97 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props
+++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import
-    Condition="'$(PackageTargetRuntime)' != '' and Exists('$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildThisFile)')"
-    Project="$(MSBuildThisFileDirectory)runtime.$(TargetOS).$(MSBuildThisFile)" />
+  <ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
+    <NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)hostfxr$(LibraryFileExtension)"/>
+    <File Include="@(NativeBinary)">
+      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      <IsNative>true</IsNative>
+    </File>
+  </ItemGroup>
 
 </Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.FreeBSD.Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.FreeBSD.Microsoft.NETCore.DotNetHostResolver.props
deleted file mode 100644
index b7040aaade1c43..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.FreeBSD.Microsoft.NETCore.DotNetHostResolver.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libhostfxr.so"/>
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Linux.Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Linux.Microsoft.NETCore.DotNetHostResolver.props
deleted file mode 100644
index b7040aaade1c43..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Linux.Microsoft.NETCore.DotNetHostResolver.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libhostfxr.so"/>
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.OSX.Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.OSX.Microsoft.NETCore.DotNetHostResolver.props
deleted file mode 100644
index 6ccd19d6294e73..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.OSX.Microsoft.NETCore.DotNetHostResolver.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libhostfxr.dylib"/>
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Windows_NT.Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Windows_NT.Microsoft.NETCore.DotNetHostResolver.props
deleted file mode 100644
index b2686198a99cbb..00000000000000
--- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Windows_NT.Microsoft.NETCore.DotNetHostResolver.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/hostfxr.dll"/>
-
-    <File Include="@(ArchitectureSpecificNativeFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      <IsNative>true</IsNative>
-    </File>
-  </ItemGroup>
-</Project>
\ No newline at end of file