Move corefx onto the .NET Core 2.0 toolset

26 files changed, 338 insertions, 226 deletions

diff --git a/external/ILLink/ILLink.depproj b/external/ILLink/ILLink.depproj
index 853c90047b..ab060b3030 100644
--- a/external/ILLink/ILLink.depproj
+++ b/external/ILLink/ILLink.depproj
@@ -3,9 +3,20 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort>
     <OutputPath>$(ToolsDir)ILLink</OutputPath>
     <IsRuntimeAssembly>false</IsRuntimeAssembly>
+    <RidSpecificAssets>true</RidSpecificAssets>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.ILLink">
+      <Version>0.1.8-preview</Version>
+      <IncludeAssets>Analyzers;Build;ContentFiles;Native;Runtime</IncludeAssets>
+    </PackageReference>
+    <Content Include="illink.runtimeconfig.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <Target Name="IncludeAllFiles"
           AfterTargets="ResolveNuGetPackages">
diff --git a/external/ILLink/illink.runtimeconfig.json b/external/ILLink/illink.runtimeconfig.json
new file mode 100644
index 0000000000..51d6286475
--- /dev/null
+++ b/external/ILLink/illink.runtimeconfig.json
@@ -0,0 +1,9 @@
+{
+  "runtimeOptions": {
+    "tfm": "netcoreapp1.1",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "2.0.0-preview1-001913-00"
+    }
+  }
+}
diff --git a/external/ILLink/project.json.template b/external/ILLink/project.json.template
deleted file mode 100644
index e7c9cde5f3..0000000000
--- a/external/ILLink/project.json.template
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.ILLink": {
-      "version": "0.1.8-preview",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.1": { }
-  },
-  "runtimes": {
-    "{RID}": {}
-  }
-}
diff --git a/external/dir.proj b/external/dir.proj
index 3912e6143f..4c5085a132 100644
--- a/external/dir.proj
+++ b/external/dir.proj
@@ -11,7 +11,8 @@
     <Project Include="netfx/netfx.depproj" />
     <Project Include="runtime/runtime.depproj" />
     <Project Include="test-runtime/XUnit.Runtime.depproj" />
-    <Project Include="harvestPackages/harvestPackages.depproj" />
+    <Project Include="harvestPackages/harvestPackages.netstandard1.6.depproj" />
+    <Project Include="harvestPackages/harvestPackages.uap10.0.depproj" />
     <Project Include="portable\portable.depproj" />
     <Project Include="uapaotredist/uapaotredist.depproj" />
     <Project Include="ilasm/ilasm.depproj" />
diff --git a/external/dir.props b/external/dir.props
index 286fde00b3..424b15fce2 100644
--- a/external/dir.props
+++ b/external/dir.props
@@ -8,5 +8,8 @@
     <RuntimeOS Condition="'$(PortableBuild)' == 'true' and '$(OSGroup)' == 'Linux'">linux</RuntimeOS>
     -->
     <NugetRuntimeIdentifier>$(RuntimeOS)-$(ArchGroup)</NugetRuntimeIdentifier>
+    <ContainsPackageReferences>true</ContainsPackageReferences>
+    <!-- We need configuration-specific assets files. -->
+    <RestoreOutputPath>$(BaseIntermediateOutputPath)external/$(MSBuildProjectName)/$(TargetGroup)</RestoreOutputPath>
   </PropertyGroup>
 </Project>
diff --git a/external/dir.targets b/external/dir.targets
index c713f4c770..83f658c87b 100644
--- a/external/dir.targets
+++ b/external/dir.targets
@@ -1,10 +1,4 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectJsonTemplate Condition="'$(ProjectJsonTemplate)' == ''">$(MSBuildThisProjectDirectory)project.json.template</ProjectJsonTemplate>
-    <ProjectJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.json</ProjectJson>
-    <ProjectLockJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-
   <Import Project="..\dir.targets" />
 
   <PropertyGroup>
@@ -12,22 +6,6 @@
     <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
   </PropertyGroup>
 
-  <Target
-    Name="GenerateProjectJsonFromTemplates"
-    BeforeTargets="RestorePackages"
-    Inputs="$(ProjectJsonTemplate)"
-    Outputs="$(ProjectJson)"
-    Condition="Exists('$(ProjectJsonTemplate)')"
-    >
-    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(ProjectJson)'))" />
-    <!-- Update project.json template -->
-    <WriteLinesToFile
-      File="$(ProjectJson)"
-      Lines="$([System.IO.File]::ReadAllText('$(ProjectJsonTemplate)').Replace('{RID}', $(NuGetRuntimeIdentifier)).Replace('{TFM}', $(NuGetTargetMoniker)).Replace('{PackageId}', $(TargetingPackNugetPackageId)))"
-      Overwrite="true"
-                      />
-  </Target>
-
   <!-- Override build and GetTargetPath to return all items deployed -->
   <Target Name="Build"
           Condition=" '$(_InvalidConfigurationWarning)' != 'true' "
diff --git a/external/harvestPackages/harvestPackages.netstandard1.6.depproj b/external/harvestPackages/harvestPackages.netstandard1.6.depproj
new file mode 100644
index 0000000000..e2de4672fb
--- /dev/null
+++ b/external/harvestPackages/harvestPackages.netstandard1.6.depproj
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.6</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualBasic">
+      <Version>10.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Win32.Registry">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Buffers">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>1.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition">
+     <Version>1.0.31</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition.AttributedModel">
+     <Version>1.0.31</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition.Convention">
+     <Version>1.0.31</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition.Hosting">
+     <Version>1.0.31</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition.Runtime">
+     <Version>1.0.31</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition.TypedParts">
+     <Version>1.0.31</Version>
+    </PackageReference>
+    <PackageReference Include="System.Data.SqlClient">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Compression">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.FileSystem.AccessControl">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Packaging">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Pipes.AccessControl">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.Http">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.Http.Rtc">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.Http.WinHttpHandler">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Numerics.Vectors">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reflection.Context">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reflection.DispatchProxy">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Reflection.Metadata">
+     <Version>1.4.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.WindowsRuntime">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.AccessControl">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.OpenSsl">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.Pkcs">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.ProtectedData">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.X509Certificates">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Principal.Windows">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.ServiceProcess.ServiceController">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Encoding.CodePages">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Encodings.Web">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.AccessControl">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Dataflow">
+     <Version>4.7.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+     <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+     <Version>4.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- only restore this project during the build, don't copy any of it's packages
+       The sole purpose of this project is to download packages that can be examined
+       for harvesting binaries & support. -->
+  <Target Name="Build" DependsOnTargets="RestorePackages" />
+</Project>
\ No newline at end of file
diff --git a/external/harvestPackages/harvestPackages.depproj b/external/harvestPackages/harvestPackages.uap10.0.depproj
index 7f78359421..f4288e2b4a 100644
--- a/external/harvestPackages/harvestPackages.depproj
+++ b/external/harvestPackages/harvestPackages.uap10.0.depproj
@@ -2,6 +2,17 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Numerics.Vectors.WindowsRuntime">
+      <Version>4.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
   <!-- only restore this project during the build, don't copy any of it's packages
        The sole purpose of this project is to download packages that can be examined
        for harvesting binaries & support. -->
diff --git a/external/harvestPackages/project.json.template b/external/harvestPackages/project.json.template
deleted file mode 100644
index 2bbc08839a..0000000000
--- a/external/harvestPackages/project.json.template
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "frameworks": {
-    "netstandard1.6": {
-      "dependencies": {
-        "Microsoft.CSharp": "4.3.0",
-        "Microsoft.VisualBasic": "10.1.0",
-        "Microsoft.Win32.Registry": "4.3.0",
-        "Microsoft.Win32.Registry.AccessControl": "4.3.0",
-        "System.Buffers": "4.3.0",
-        "System.Collections.Immutable": "1.3.0",
-        "System.Composition": "1.0.31",
-        "System.Composition.AttributedModel": "1.0.31",
-        "System.Composition.Convention": "1.0.31",
-        "System.Composition.Hosting": "1.0.31",
-        "System.Composition.Runtime": "1.0.31",
-        "System.Composition.TypedParts": "1.0.31",
-        "System.Data.SqlClient": "4.3.0",
-        "System.Diagnostics.DiagnosticSource": "4.3.0",
-        "System.IO.Compression": "4.3.0",
-        "System.IO.FileSystem.AccessControl": "4.3.0",
-        "System.IO.Packaging": "4.3.0",
-        "System.IO.Pipes.AccessControl": "4.3.0",
-        "System.Net.Http": "4.3.0",
-        "System.Net.Http.Rtc": "4.3.0",
-        "System.Net.Http.WinHttpHandler": "4.3.0",
-        "System.Numerics.Vectors": "4.3.0",
-        "System.Reflection.Context": "4.3.0",
-        "System.Reflection.DispatchProxy": "4.3.0",
-        "System.Reflection.Metadata": "1.4.1",
-        "System.Reflection.TypeExtensions": "4.3.0",
-        "System.Runtime.CompilerServices.Unsafe": "4.3.0",
-        "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-        "System.Runtime.WindowsRuntime": "4.3.0",
-        "System.Runtime.WindowsRuntime.UI.Xaml": "4.3.0",
-        "System.Security.AccessControl": "4.3.0",
-        "System.Security.Cryptography.OpenSsl": "4.3.0",
-        "System.Security.Cryptography.Pkcs": "4.3.0",
-        "System.Security.Cryptography.ProtectedData": "4.3.0",
-        "System.Security.Cryptography.X509Certificates": "4.3.0",
-        "System.Security.Principal.Windows": "4.3.0",
-        "System.ServiceProcess.ServiceController": "4.3.0",
-        "System.Text.Encoding.CodePages": "4.3.0",
-        "System.Text.Encodings.Web": "4.3.0",
-        "System.Threading.AccessControl": "4.3.0",
-        "System.Threading.Tasks.Dataflow": "4.7.0",
-        "System.Threading.Tasks.Extensions": "4.3.0",
-        "System.ValueTuple": "4.3.0"
-      }
-    },
-    "uap10.0": {
-      "dependencies": {
-        "System.Numerics.Vectors.WindowsRuntime": "4.3.0"
-      }
-    }
-  }
-}
diff --git a/external/ilasm/ilasm.depproj b/external/ilasm/ilasm.depproj
index 0341bf5c0e..01f013ed39 100644
--- a/external/ilasm/ilasm.depproj
+++ b/external/ilasm/ilasm.depproj
@@ -6,6 +6,22 @@
     <NugetRuntimeIdentifier>$(RuntimeOS)-x64</NugetRuntimeIdentifier>
     <OutputPath>$(ToolsDir)ilasm</OutputPath>
     <IsRuntimeAssembly>false</IsRuntimeAssembly>
+    <RidSpecificAssets>true</RidSpecificAssets>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.Platforms">
+      <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
+      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.ILAsm">
+      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <!-- When zipped/unzipped in a package, ilasm loses its executable flag. Reset it. -->
+  <Target Name="MakeIlasmExecutable" AfterTargets="CopyFilesToOutputDirectory" Condition="'$(RunningOnUnix)' == 'true'">
+    <Exec Command="chmod +x $(OutputPath)ilasm" />
+  </Target>
 </Project>
diff --git a/external/ilasm/project.json.template b/external/ilasm/project.json.template
deleted file mode 100644
index 945f3aa076..0000000000
--- a/external/ilasm/project.json.template
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "frameworks": {
-    "{TFM}": {
-      "dependencies": {
-        "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
-        "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25207-02",
-        "Microsoft.NETCore.ILAsm": "2.0.0-preview1-25207-02"
-      }
-    }
-  },
-  "runtimes": {
-    "{RID}": {}
-  }
-}
diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj
index eed64a22b6..db115c3212 100644
--- a/external/netfx/netfx.depproj
+++ b/external/netfx/netfx.depproj
@@ -13,10 +13,16 @@
   <PropertyGroup Condition="!$(NuGetTargetMoniker.StartsWith('.NETFramework'))">
     <!-- For things not .NETFramework we need the net461 targeting pack to generate facades -->
     <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>net461</NuGetTargetMonikerShort>
     <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId>
     <ForShims>true</ForShims>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="$(TargetingPackNugetPackageId)">
+      <Version>1.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
     <BinPlaceConfiguration Include="$(Configuration)">
       <RefPath Condition="'$(ForShims)' != 'true'">$(RefPath)</RefPath>
       <RefPath Condition="'$(ForShims)' == 'true'">$(NetFxRefPath)</RefPath>
diff --git a/external/netfx/project.json.template b/external/netfx/project.json.template
deleted file mode 100644
index 4cc6dfed2d..0000000000
--- a/external/netfx/project.json.template
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "frameworks": {
-    "{TFM}": {
-      "dependencies": {
-        "{PackageId}": "1.0.1"
-      }
-    }
-  }
-}
diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj
index 798cdea514..54580889b7 100644
--- a/external/netstandard/netstandard.depproj
+++ b/external/netstandard/netstandard.depproj
@@ -10,12 +10,32 @@
     <IsRuntimeAndReferenceAssembly Condition="'$(IsNetFx)' == 'true' AND '$(IsNetFxVertical)' == 'true'">true</IsRuntimeAndReferenceAssembly>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
-    <ProjectJsonTemplate Condition="'$(IsNETStandard1x)' == 'true'">$(MSBuildProjectDirectory)\netstandard1.x\project.json.template</ProjectJsonTemplate>
     <_NETStandardTFMFolder Condition="'$(NuGetTargetMoniker)' == '.NETStandard,Version=v2.0'">netstandard2.0</_NETStandardTFMFolder>
     <_NETStandardTFMFolder Condition="'$(IsNetFx)' == 'true'">net461</_NETStandardTFMFolder>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="NETStandard.Library">
+      <Version>$(NETStandardPackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsNETStandard1x)' == 'true'">
+    <PackageReference Include="System.Diagnostics.Contracts">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Diagnostics.Debug">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Dynamic.Runtime">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.Serialization.Primitives">
+      <Version>4.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
     <!-- for all configurations this project provides refs for that configuration -->
     <BinPlaceConfiguration Include="$(Configuration)">
       <RefPath>$(RefPath)</RefPath>
@@ -31,7 +51,7 @@
   <Target Name="AddNETStandardRefs" AfterTargets="ResolveReferences"
           Condition="'$(_NETStandardTFMFolder)' != ''">
     <PropertyGroup>
-      <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder>
+      <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder>
     </PropertyGroup>
     <ItemGroup>
       <Reference Include="$(_NETStandardRefFolder)\*.dll">
diff --git a/external/netstandard/netstandard1.x/project.json.template b/external/netstandard/netstandard1.x/project.json.template
deleted file mode 100644
index d13b533d40..0000000000
--- a/external/netstandard/netstandard1.x/project.json.template
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "frameworks": {
-    "{TFM}": {
-      "dependencies": {
-        "NETStandard.Library": "2.0.0-preview1-25210-01",
-        "System.Diagnostics.Contracts": "4.3.0",
-        "System.Diagnostics.Debug": "4.3.0",
-        "System.Dynamic.Runtime": "4.3.0",
-        "System.Runtime.Serialization.Primitives": "4.3.0"
-      }
-    }
-  }
-}
diff --git a/external/netstandard/project.json.template b/external/netstandard/project.json.template
deleted file mode 100644
index f74f1d5e98..0000000000
--- a/external/netstandard/project.json.template
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "frameworks": {
-    "{TFM}": {
-      "dependencies": {
-        "NETStandard.Library": "2.0.0-preview1-25210-01"
-      }
-    }
-  }
-}
diff --git a/external/portable/portable.depproj b/external/portable/portable.depproj
index 3251b5ecad..54b1f268db 100644
--- a/external/portable/portable.depproj
+++ b/external/portable/portable.depproj
@@ -7,6 +7,11 @@
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="$(TargetingPackNugetPackageId)">
+      <Version>1.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
     <!-- for all configurations this project provides refs for that configuration -->
     <BinPlaceConfiguration Include="$(Configuration)">
       <RefPath>$(RefPath)</RefPath>
diff --git a/external/portable/project.json.template b/external/portable/project.json.template
deleted file mode 100644
index 08936feb37..0000000000
--- a/external/portable/project.json.template
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "frameworks": {
-    "{TFM}": {
-      "dependencies": {
-        "{PackageId}": "1.0.0"
-      }
-    }
-  }
-}
diff --git a/external/runtime/project.json.template b/external/runtime/project.json.template
deleted file mode 100644
index a06027b44c..0000000000
--- a/external/runtime/project.json.template
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "frameworks": {
-    "{TFM}": {
-      "dependencies": {
-        "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
-        "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25207-02",
-        "Microsoft.NETCore.TestHost": "2.0.0-preview1-25207-02",
-        "runtime.native.System.Data.SqlClient.sni": "4.4.0-preview1-25210-01",
-        "Microsoft.NETCore.DotNetHost": "1.2.0-beta-001259-00",
-        "Microsoft.NETCore.DotNetHostPolicy": "1.2.0-beta-001259-00"
-      }
-    }
-  },
-  "runtimes": {
-    "{RID}": {}
-  }
-}
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index 4aef5df03f..0a9b68762b 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -7,18 +7,45 @@
     <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Unix' AND '$(RunningOnUnix)' != 'true'">ubuntu.14.04-x64</NugetRuntimeIdentifier>
     <NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uap'">win10-$(ArchGroup)</NugetRuntimeIdentifier>
     <NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uapaot'">win10-$(ArchGroup)-aot</NugetRuntimeIdentifier>
+    <AppendMSBuildRestoreArguments>true</AppendMSBuildRestoreArguments>
+    <RidSpecificAssets>true</RidSpecificAssets>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
-    <ProjectJsonTemplate>$(MSBuildThisFileDirectory)NETNative/project.json.template</ProjectJsonTemplate>
     <!-- System.Private.* can't be on the ILCInputFolder since ilc.exe needs to use the matching one from its toolchain. -->
     <BinPlaceILCInputFolder>false</BinPlaceILCInputFolder>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
+    <PackageReference Include="Microsoft.TargetingPack.Private.NETNative">
+      <Version>1.1.0-beta-25128-00</Version>
+    </PackageReference>
     <FileToExclude Include="System.Private.CoreLib.Augments" />
     <FileToExclude Include="System.Private.CoreLib.DynamicDelegate" />
     <FileToExclude Include="System.Private.CoreLib.WinRTInterop" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetGroup)'!='uapaot'">
+    <PackageReference Include="Microsoft.NETCore.Platforms">
+      <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
+      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.TestHost">
+      <Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
+    </PackageReference>
+    <PackageReference Include="runtime.native.System.Data.SqlClient.sni">
+      <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.DotNetHost">
+      <Version>1.2.0-beta-001259-00</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.2.0-beta-001259-00</Version>
+    </PackageReference>
+  </ItemGroup>
+
+
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 
   <!-- Setup the testing shared framework host -->
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
index b254d1ff51..a0a7745a41 100644
--- a/external/test-runtime/XUnit.Runtime.depproj
+++ b/external/test-runtime/XUnit.Runtime.depproj
@@ -6,14 +6,75 @@
          This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
     -->
     <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier>
+    <RidSpecificAssets>true</RidSpecificAssets>
     <OutputPath>$(RuntimePath)</OutputPath>
     <XUnitRunnerPackageId Condition="'$(TargetGroup)' != 'netfx'">xunit.console.netcore</XUnitRunnerPackageId>
     <XUnitRunnerPackageId Condition="'$(TargetGroup)' == 'netfx'">xunit.runner.console</XUnitRunnerPackageId>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'uapaot'">.NETStandard,Version=v2.0</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uapaot'">netstandard2.0</NuGetTargetMonikerShort>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'uap'">.NETStandard,Version=v2.0</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uap'">netstandard2.0</NuGetTargetMonikerShort>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="project.json" />
+    <PackageReference Include="xunit.console.netcore">
+      <Version>$(AppXRunnerVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite">
+      <Version>$(XunitNetcoreExtensionsVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.xunit.netcore.extensions">
+      <Version>$(XunitNetcoreExtensionsVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.performance.api">
+      <Version>$(XunitPerfAnalysisPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.performance.core">
+      <Version>$(XunitPerfAnalysisPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.performance.execution">
+      <Version>$(XunitPerfAnalysisPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.performance.metrics">
+      <Version>$(XunitPerfAnalysisPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent">
+      <Version>$(TraceEventPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.3rdpartytools.MarkdownLog">
+      <Version>0.10.0-alpha-experimental</Version>
+    </PackageReference>
+    <PackageReference Include="CommandLineParser">
+      <Version>2.1.1-beta</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>9.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="coveralls.io">
+      <Version>1.4</Version>
+    </PackageReference>
+    <PackageReference Include="OpenCover">
+      <Version>4.6.519</Version>
+    </PackageReference>
+    <PackageReference Include="ReportGenerator">
+      <Version>2.5.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Compression.TestData">
+      <Version>1.0.4-prerelease</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Packaging.TestData">
+      <Version>1.0.0-prerelease</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.X509Certificates.TestData">
+      <Version>1.0.2-prerelease</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.TestData">
+      <Version>1.0.0-prerelease</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
+    <PackageReference Include="xunit.runner.console">
+      <Version>$(XUnitPackageVersion)</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <PackageToInclude Include="xunit.abstractions"/>
@@ -45,7 +106,7 @@
 
     <PropertyGroup>
       <UAPToolsPackageVersion>1.0.2</UAPToolsPackageVersion>
-      <UAPToolsPackageName>Microsoft.DotNet.UAP.TestTools</UAPToolsPackageName>
+      <UAPToolsPackageName>microsoft.dotnet.uap.testtools</UAPToolsPackageName>
 
       <UAPToolsFolder Condition="'$(UAPToolsFolder)'==''">$(PackagesDir)$(UAPToolsPackageName)\$(UAPToolsPackageVersion)\Tools</UAPToolsFolder>
       <UAPToolsFolder>$(UAPToolsFolder.Replace('/', '\'))</UAPToolsFolder>
diff --git a/external/test-runtime/project.json b/external/test-runtime/project.json
deleted file mode 100644
index 537db95723..0000000000
--- a/external/test-runtime/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "dependencies": {
-    "xunit.console.netcore": "1.0.3-prerelease-00921-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01401-04",
-    "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01401-04",
-    "xunit.performance.api": "1.0.0-alpha-build0049",
-    "xunit.performance.core": "1.0.0-alpha-build0049",
-    "xunit.performance.execution": "1.0.0-alpha-build0049",
-    "xunit.performance.metrics": "1.0.0-alpha-build0049",
-    "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.0-alpha-experimental",
-    "Microsoft.3rdpartytools.MarkdownLog": "0.10.0-alpha-experimental",
-    "CommandLineParser": "2.1.1-beta",
-    "Newtonsoft.Json": "9.0.1",
-    "coveralls.io": "1.4",
-    "OpenCover": "4.6.519",
-    "ReportGenerator": "2.5.0",
-    "System.IO.Compression.TestData": "1.0.4-prerelease",
-    "System.IO.Packaging.TestData": "1.0.0-prerelease",
-    "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease",
-    "System.Net.TestData": "1.0.0-prerelease"
-  },
-  "frameworks": {
-    "netstandard2.0": {},
-    "net463": {
-      "dependencies": {
-        "xunit.runner.console": "2.2.0-beta4-build3444"
-      }
-    }
-  },
-  "runtimes": {
-    "win7-x64": {}
-  }
-}
diff --git a/external/uapaotredist/project.json.template b/external/uapaotredist/project.json.template
deleted file mode 100644
index 47c0f7b588..0000000000
--- a/external/uapaotredist/project.json.template
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "frameworks": {
-    "netcore50": {
-      "dependencies": {
-        "System.Diagnostics.Tracing": "4.3.0",
-        "System.Dynamic.Runtime": "4.0.11",
-        "System.Net.Requests": "4.0.11",
-        "System.Linq.Expressions": "4.3.0"
-      }
-    },
-  },
-
-  "runtimes": {
-    "{RID}": {}
-  }
-}
\ No newline at end of file
diff --git a/external/uapaotredist/uapaotredist.depproj b/external/uapaotredist/uapaotredist.depproj
index 4871dbaa06..b66267c3af 100644
--- a/external/uapaotredist/uapaotredist.depproj
+++ b/external/uapaotredist/uapaotredist.depproj
@@ -7,8 +7,22 @@
   <PropertyGroup>
     <NugetRuntimeIdentifier>win10-x64-aot</NugetRuntimeIdentifier>
     <NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>netcore50</NuGetTargetMonikerShort>
+    <RidSpecificAssets>true</RidSpecificAssets>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
+    <PackageReference Include="System.Diagnostics.Tracing">
+      <Version>4.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Dynamic.Runtime">
+      <Version>4.0.11</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.Requests">
+      <Version>4.0.11</Version>
+    </PackageReference>
+    <PackageReference Include="System.Linq.Expressions">
+      <Version>4.3.0</Version>
+    </PackageReference>
     <FileToInclude Include="System.Dynamic.Runtime" />
     <FileToInclude Include="System.Net.Requests" />
   </ItemGroup>
diff --git a/external/winrt/project.json.template b/external/winrt/project.json.template
deleted file mode 100644
index 8ccca2018a..0000000000
--- a/external/winrt/project.json.template
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.TargetingPack.Private.WinRT": "1.0.3"
-  },
-  "frameworks": {
-    "{TFM}": {}
-  }
-}
diff --git a/external/winrt/winrt.depproj b/external/winrt/winrt.depproj
index 3d3a1add5d..15e50b350f 100644
--- a/external/winrt/winrt.depproj
+++ b/external/winrt/winrt.depproj
@@ -8,5 +8,10 @@
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT">
+      <Version>1.0.3</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file