diff --git a/external/dir.props b/external/dir.props
index 250e89c72f5c..800b9127e076 100644
--- a/external/dir.props
+++ b/external/dir.props
@@ -6,9 +6,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <IntermediateOutputPath>$(IntermediateOutputPath)$(ArchGroup)/</IntermediateOutputPath>
-    <ProjectJsonTemplate>$(MSBuildThisProjectDirectory)project.json.template</ProjectJsonTemplate>
-    <ProjectJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.json</ProjectJson>
-    <ProjectLockJson Condition="Exists('$(ProjectJsonTemplate)')">$(IntermediateOutputPath)project.lock.json</ProjectLockJson>
     <NugetRuntimeIdentifier>$(RuntimeOS)-$(ArchGroup)</NugetRuntimeIdentifier>
   </PropertyGroup>
 </Project>
diff --git a/external/dir.targets b/external/dir.targets
index 84ddfc97ae11..0365aa74c726 100644
--- a/external/dir.targets
+++ b/external/dir.targets
@@ -1,4 +1,10 @@
 <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>
@@ -16,7 +22,7 @@
     <!-- Update project.json template -->
     <WriteLinesToFile
       File="$(ProjectJson)"
-      Lines="$([System.IO.File]::ReadAllText('project.json.template').Replace('{RID}', $(NuGetRuntimeIdentifier)).Replace('{TFM}', $(NuGetTargetMoniker)))"
+      Lines="$([System.IO.File]::ReadAllText('$(ProjectJsonTemplate)').Replace('{RID}', $(NuGetRuntimeIdentifier)).Replace('{TFM}', $(NuGetTargetMoniker)).Replace('{PackageId}', $(TargetingPackNugetPackageId)))"
       Overwrite="true"
                       />
     <ItemGroup>
diff --git a/external/netfx/Configurations.props b/external/netfx/Configurations.props
index 26837694bae8..07b0930eafa7 100644
--- a/external/netfx/Configurations.props
+++ b/external/netfx/Configurations.props
@@ -3,7 +3,12 @@
   <PropertyGroup>
     <!-- Include netcoreapp since we need to generate facades between desktop and netcoreapp -->
     <BuildConfigurations>
+      net45;
+      net451;
+      net46;
       net461;
+      net462;
+      net463;
       netcoreapp;
     </BuildConfigurations>
   </PropertyGroup>
diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj
index 4fe3b6227083..7e9bce2189bd 100644
--- a/external/netfx/netfx.depproj
+++ b/external/netfx/netfx.depproj
@@ -3,8 +3,17 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'netcoreapp'">.NETFramework,Version=v4.6.1</NuGetTargetMoniker>
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
+    <OutputPath>$(RefRootPath)/$(TargetGroup)</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetGroup)' == 'net463'">
+    <!-- Missing 4.6.3 targeting pack, use 462 for now -->
+    <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+    <!-- For NETCoreApp we need the net461 targeting pack to generate facades -->
+    <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker>
+    <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId>
     <OutputPath>$(NetFxRefPath)</OutputPath>
   </PropertyGroup>
   <!-- Filter the targeting pack to just these assemblies which we need netcoreapp shims for -->
diff --git a/external/netfx/project.json b/external/netfx/project.json
deleted file mode 100644
index cf1090db1295..000000000000
--- a/external/netfx/project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "frameworks": {
-    "net461": {
-      "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1"
-      }
-    }
-  }
-}
diff --git a/external/netfx/project.json.template b/external/netfx/project.json.template
new file mode 100644
index 000000000000..4cc6dfed2d6b
--- /dev/null
+++ b/external/netfx/project.json.template
@@ -0,0 +1,9 @@
+{
+  "frameworks": {
+    "{TFM}": {
+      "dependencies": {
+        "{PackageId}": "1.0.1"
+      }
+    }
+  }
+}
diff --git a/external/netstandard/Configurations.props b/external/netstandard/Configurations.props
index c398e42e8994..2e14c5a1f6fb 100644
--- a/external/netstandard/Configurations.props
+++ b/external/netstandard/Configurations.props
@@ -2,6 +2,14 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
+      netstandard1.0;
+      netstandard1.1;
+      netstandard1.2;
+      netstandard1.3;
+      netstandard1.4;
+      netstandard1.5;
+      netstandard1.6;
+      netstandard2.0;
       netstandard;
     </BuildConfigurations>
   </PropertyGroup>
diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj
index 072ff0f3afc9..c3cca8af4f25 100644
--- a/external/netstandard/netstandard.depproj
+++ b/external/netstandard/netstandard.depproj
@@ -4,7 +4,8 @@
   <PropertyGroup>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
-    <OutputPath>$(NetStandardRefPath)</OutputPath>
+    <OutputPath>$(RefRootPath)/$(TargetGroup)</OutputPath>
+    <ProjectJsonTemplate Condition="$(NuGetTargetMoniker.Contains('Version=v1.'))">$(MSBuildProjectDirectory)\netstandard1.x\project.json.template</ProjectJsonTemplate>
   </PropertyGroup>
   
   <Target Name="AddNETStandardRefs" AfterTargets="ResolveReferences"
diff --git a/external/netstandard/netstandard1.x/project.json.template b/external/netstandard/netstandard1.x/project.json.template
new file mode 100644
index 000000000000..2b99eaffd181
--- /dev/null
+++ b/external/netstandard/netstandard1.x/project.json.template
@@ -0,0 +1,10 @@
+{
+  "frameworks": {
+    "{TFM}": {
+      "dependencies": {
+        "NETStandard.Library": "2.0.0-beta-24919-01",
+        "System.Diagnostics.Contracts": "4.3.0"
+      }
+    }
+  }
+}
diff --git a/external/netstandard/project.json b/external/netstandard/project.json.template
similarity index 83%
rename from external/netstandard/project.json
rename to external/netstandard/project.json.template
index c000ed74a618..edacdc9f2ff4 100644
--- a/external/netstandard/project.json
+++ b/external/netstandard/project.json.template
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "netstandard2.0": {
+    "{TFM}": {
       "dependencies": {
         "NETStandard.Library": "2.0.0-beta-24919-01"
       }
diff --git a/external/portable/Configurations.props b/external/portable/Configurations.props
new file mode 100644
index 000000000000..dcef341debd4
--- /dev/null
+++ b/external/portable/Configurations.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <BuildConfigurations>
+      portable_net45+win8+sl5;
+      portable_net40+sl4+win8+wp8;
+    </BuildConfigurations>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/external/portable/portable.depproj b/external/portable/portable.depproj
new file mode 100644
index 000000000000..e079484cea74
--- /dev/null
+++ b/external/portable/portable.depproj
@@ -0,0 +1,11 @@
+<?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" />
+  <PropertyGroup>
+    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
+    <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
+    <OutputPath>$(RefRootPath)/$(TargetGroup)</OutputPath>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="FilterTargetingPackResolvedNugetPackages" />
+</Project>
\ No newline at end of file
diff --git a/external/portable/project.json.template b/external/portable/project.json.template
new file mode 100644
index 000000000000..08936feb37fc
--- /dev/null
+++ b/external/portable/project.json.template
@@ -0,0 +1,9 @@
+{
+  "frameworks": {
+    "{TFM}": {
+      "dependencies": {
+        "{PackageId}": "1.0.0"
+      }
+    }
+  }
+}