Rename "dotnet" to "NETStandard"

Fixes https://github.com/dotnet/corefx/issues/5707

We are changing the .NET packages to no longer use the ‘dotnet’, ‘dotnet5.x’, and ‘dnxcore50’ monikers.  This is thee first stage of the change for dotnet->netstandard.

The replacements are as follows

Old moniker | New moniker
----------------- | ------------------
dotnet5.x | netstandard1.y  (where y = x -1)
DNXCore50 | netstandardapp1.5
dotnet | netstandard1.3

To prepare for this change you can do the following to your project.json.  This change will require a recent build of NuGet or dotnet.exe and can be done prior to consuming the packages with the breaking change.  These packages will not work with DNX.

For a project targeting dotnet5.6
```
    "frameworks": {
        "netstandard1.5": {
            "imports": [ "dotnet5.6" ]
        }
    },
```

For a project targeting dnxcore50
```
    "frameworks": {
        "netstandardapp1.5": {
            "imports": [ "dnxcore50", "portable-net45+win8" ]
        }
    },
```

[tfs-changeset: 1578321]

522 files changed, 1866 insertions, 1032 deletions

diff --git a/Packaging.props b/Packaging.props
index 2fbadfe3d0..1ed8694ea3 100644
--- a/Packaging.props
+++ b/Packaging.props
@@ -12,6 +12,11 @@
     <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
     <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
     <NativePackagePath>$(MSBuildThisFileDirectory)src/Native/pkg</NativePackagePath>
+
+    <!-- Enable NETStandard -->
+    <UseNetPlatform>false</UseNetPlatform>
+    <BaseLinePackageDependencies>true</BaseLinePackageDependencies>
+    <ExcludeRuntimeJson>true</ExcludeRuntimeJson>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
diff --git a/pkg/redist/System.Collections.Concurrent/lib/System.Collections.Concurrent.depproj b/pkg/redist/System.Collections.Concurrent/lib/System.Collections.Concurrent.depproj
index 3d253106b6..0411aa6964 100644
--- a/pkg/redist/System.Collections.Concurrent/lib/System.Collections.Concurrent.depproj
+++ b/pkg/redist/System.Collections.Concurrent/lib/System.Collections.Concurrent.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Collections.Concurrent/lib/project.json b/pkg/redist/System.Collections.Concurrent/lib/project.json
index 6a126f3e29..a17058253e 100644
--- a/pkg/redist/System.Collections.Concurrent/lib/project.json
+++ b/pkg/redist/System.Collections.Concurrent/lib/project.json
@@ -3,6 +3,10 @@
     "System.Collections.Concurrent": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/pkg/redist/System.Collections/lib/System.Collections.depproj b/pkg/redist/System.Collections/lib/System.Collections.depproj
index d0bbd73eb8..dce9827280 100644
--- a/pkg/redist/System.Collections/lib/System.Collections.depproj
+++ b/pkg/redist/System.Collections/lib/System.Collections.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Diagnostics.Tracing/lib/System.Diagnostics.Tracing.depproj b/pkg/redist/System.Diagnostics.Tracing/lib/System.Diagnostics.Tracing.depproj
index 525e1d59e6..5383ee8243 100644
--- a/pkg/redist/System.Diagnostics.Tracing/lib/System.Diagnostics.Tracing.depproj
+++ b/pkg/redist/System.Diagnostics.Tracing/lib/System.Diagnostics.Tracing.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.20.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Dynamic.Runtime/lib/System.Dynamic.Runtime.depproj b/pkg/redist/System.Dynamic.Runtime/lib/System.Dynamic.Runtime.depproj
index d0bbd73eb8..dce9827280 100644
--- a/pkg/redist/System.Dynamic.Runtime/lib/System.Dynamic.Runtime.depproj
+++ b/pkg/redist/System.Dynamic.Runtime/lib/System.Dynamic.Runtime.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.IO/lib/System.IO.depproj b/pkg/redist/System.IO/lib/System.IO.depproj
index d0bbd73eb8..dce9827280 100644
--- a/pkg/redist/System.IO/lib/System.IO.depproj
+++ b/pkg/redist/System.IO/lib/System.IO.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Linq.Expressions/lib/System.Linq.Expressions.depproj b/pkg/redist/System.Linq.Expressions/lib/System.Linq.Expressions.depproj
index d0bbd73eb8..dce9827280 100644
--- a/pkg/redist/System.Linq.Expressions/lib/System.Linq.Expressions.depproj
+++ b/pkg/redist/System.Linq.Expressions/lib/System.Linq.Expressions.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Linq/lib/System.Linq.depproj b/pkg/redist/System.Linq/lib/System.Linq.depproj
index c7f5f88fda..29effd006d 100644
--- a/pkg/redist/System.Linq/lib/System.Linq.depproj
+++ b/pkg/redist/System.Linq/lib/System.Linq.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Linq/lib/project.json b/pkg/redist/System.Linq/lib/project.json
index 1c0fd63274..75e3c9d6b8 100644
--- a/pkg/redist/System.Linq/lib/project.json
+++ b/pkg/redist/System.Linq/lib/project.json
@@ -3,6 +3,10 @@
     "System.Linq": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/pkg/redist/System.ObjectModel/lib/System.ObjectModel.depproj b/pkg/redist/System.ObjectModel/lib/System.ObjectModel.depproj
index 3d253106b6..0411aa6964 100644
--- a/pkg/redist/System.ObjectModel/lib/System.ObjectModel.depproj
+++ b/pkg/redist/System.ObjectModel/lib/System.ObjectModel.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.ObjectModel/lib/project.json b/pkg/redist/System.ObjectModel/lib/project.json
index d4703689b9..ad89b2601c 100644
--- a/pkg/redist/System.ObjectModel/lib/project.json
+++ b/pkg/redist/System.ObjectModel/lib/project.json
@@ -3,6 +3,10 @@
     "System.ObjectModel": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/pkg/redist/System.Reflection.Extensions/lib/System.Reflection.Extensions.depproj b/pkg/redist/System.Reflection.Extensions/lib/System.Reflection.Extensions.depproj
index 1b9101f88f..2ac05766e4 100644
--- a/pkg/redist/System.Reflection.Extensions/lib/System.Reflection.Extensions.depproj
+++ b/pkg/redist/System.Reflection.Extensions/lib/System.Reflection.Extensions.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Reflection.Primitives/lib/System.Reflection.Primitives.depproj b/pkg/redist/System.Reflection.Primitives/lib/System.Reflection.Primitives.depproj
index 1b9101f88f..2ac05766e4 100644
--- a/pkg/redist/System.Reflection.Primitives/lib/System.Reflection.Primitives.depproj
+++ b/pkg/redist/System.Reflection.Primitives/lib/System.Reflection.Primitives.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Reflection.TypeExtensions/lib/System.Reflection.TypeExtensions.depproj b/pkg/redist/System.Reflection.TypeExtensions/lib/System.Reflection.TypeExtensions.depproj
index 1b9101f88f..2ac05766e4 100644
--- a/pkg/redist/System.Reflection.TypeExtensions/lib/System.Reflection.TypeExtensions.depproj
+++ b/pkg/redist/System.Reflection.TypeExtensions/lib/System.Reflection.TypeExtensions.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Resources.ResourceManager/lib/System.Resources.ResourceManager.depproj b/pkg/redist/System.Resources.ResourceManager/lib/System.Resources.ResourceManager.depproj
index 1b9101f88f..2ac05766e4 100644
--- a/pkg/redist/System.Resources.ResourceManager/lib/System.Resources.ResourceManager.depproj
+++ b/pkg/redist/System.Resources.ResourceManager/lib/System.Resources.ResourceManager.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Runtime.Extensions/lib/System.Runtime.Extensions.depproj b/pkg/redist/System.Runtime.Extensions/lib/System.Runtime.Extensions.depproj
index d0bbd73eb8..dce9827280 100644
--- a/pkg/redist/System.Runtime.Extensions/lib/System.Runtime.Extensions.depproj
+++ b/pkg/redist/System.Runtime.Extensions/lib/System.Runtime.Extensions.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Runtime/lib/System.Runtime.depproj b/pkg/redist/System.Runtime/lib/System.Runtime.depproj
index 525e1d59e6..5383ee8243 100644
--- a/pkg/redist/System.Runtime/lib/System.Runtime.depproj
+++ b/pkg/redist/System.Runtime/lib/System.Runtime.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.20.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Text.RegularExpressions/lib/System.Text.RegularExpressions.depproj b/pkg/redist/System.Text.RegularExpressions/lib/System.Text.RegularExpressions.depproj
index 3d253106b6..0411aa6964 100644
--- a/pkg/redist/System.Text.RegularExpressions/lib/System.Text.RegularExpressions.depproj
+++ b/pkg/redist/System.Text.RegularExpressions/lib/System.Text.RegularExpressions.depproj
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/pkg/redist/System.Text.RegularExpressions/lib/project.json b/pkg/redist/System.Text.RegularExpressions/lib/project.json
index a65a7d8f68..7424b6b7d0 100644
--- a/pkg/redist/System.Text.RegularExpressions/lib/project.json
+++ b/pkg/redist/System.Text.RegularExpressions/lib/project.json
@@ -3,6 +3,10 @@
     "System.Text.RegularExpressions": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
index 807fef3e30..13398a9847 100644
--- a/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
+++ b/src/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.CSharp.cs" />
diff --git a/src/Microsoft.CSharp/ref/project.json b/src/Microsoft.CSharp/ref/project.json
index e4c66743e0..48b0b56086 100644
--- a/src/Microsoft.CSharp/ref/project.json
+++ b/src/Microsoft.CSharp/ref/project.json
@@ -5,6 +5,10 @@
     "System.Linq.Expressions": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj
index 543b56ad93..237313c2ff 100644
--- a/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj
+++ b/src/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>Microsoft.CSharp</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <RootNamespace>Microsoft.CSharp</RootNamespace>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
     
     <!-- dotnet/corefx#3128 tracks removing this exclusion -->
     <ExcludeLocalizationImport Condition="'$(TargetsWindows)' != 'true'">true</ExcludeLocalizationImport>
diff --git a/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj b/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj
index f4ee4cf082..2c258b1a85 100644
--- a/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj
+++ b/src/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>10.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.VisualBasic.cs" />
diff --git a/src/Microsoft.VisualBasic/ref/project.json b/src/Microsoft.VisualBasic/ref/project.json
index 8d808f21f4..d27e26db76 100644
--- a/src/Microsoft.VisualBasic/ref/project.json
+++ b/src/Microsoft.VisualBasic/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj
index c0675d3a4e..70b39528ac 100644
--- a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj
+++ b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -15,7 +15,7 @@
     <AssemblyName>Microsoft.VisualBasic</AssemblyName>
     <AssemblyVersion>10.0.1.0</AssemblyVersion>
     <NoStdLib>true</NoStdLib>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
index 9c30acd6c7..120a54725a 100644
--- a/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
+++ b/src/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Win32.Primitives.cs" />
diff --git a/src/Microsoft.Win32.Primitives/ref/project.json b/src/Microsoft.Win32.Primitives/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/Microsoft.Win32.Primitives/ref/project.json
+++ b/src/Microsoft.Win32.Primitives/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
index 5d47b0d3e1..08aefce159 100644
--- a/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
+++ b/src/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
@@ -11,7 +11,7 @@
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <UsePackageTargetRuntimeDefaults Condition="'$(TargetGroup)' == ''">true</UsePackageTargetRuntimeDefaults>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
diff --git a/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj b/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
index 98f3321614..adaaf34a1f 100644
--- a/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
+++ b/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Win32.Registry.AccessControl.cs" />
diff --git a/src/Microsoft.Win32.Registry.AccessControl/ref/project.json b/src/Microsoft.Win32.Registry.AccessControl/ref/project.json
index 4d09272b91..034a0ec8f6 100644
--- a/src/Microsoft.Win32.Registry.AccessControl/ref/project.json
+++ b/src/Microsoft.Win32.Registry.AccessControl/ref/project.json
@@ -6,6 +6,10 @@
     "System.Security.Principal.Windows": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
index 2f30a58840..4a714efe54 100644
--- a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
+++ b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Microsoft.Win32.Registry.cs" />
diff --git a/src/Microsoft.Win32.Registry/ref/project.json b/src/Microsoft.Win32.Registry/ref/project.json
index 330f88a68e..f112c278ac 100644
--- a/src/Microsoft.Win32.Registry/ref/project.json
+++ b/src/Microsoft.Win32.Registry/ref/project.json
@@ -4,6 +4,10 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj b/src/System.AppContext/ref/4.0.0/System.AppContext.depproj
index e55f7d366f..936df44f24 100644
--- a/src/System.AppContext/ref/4.0.0/System.AppContext.depproj
+++ b/src/System.AppContext/ref/4.0.0/System.AppContext.depproj
@@ -4,8 +4,8 @@
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.AppContext/ref/4.0.0/project.json b/src/System.AppContext/ref/4.0.0/project.json
index cec982f778..60d78dc558 100644
--- a/src/System.AppContext/ref/4.0.0/project.json
+++ b/src/System.AppContext/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.AppContext": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.AppContext/ref/System.AppContext.csproj b/src/System.AppContext/ref/System.AppContext.csproj
index eebc569147..b317c7448b 100644
--- a/src/System.AppContext/ref/System.AppContext.csproj
+++ b/src/System.AppContext/ref/System.AppContext.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.6</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.6</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.AppContext.cs" />
diff --git a/src/System.AppContext/ref/project.json b/src/System.AppContext/ref/project.json
index 563779f4e9..9c66bb28d8 100644
--- a/src/System.AppContext/ref/project.json
+++ b/src/System.AppContext/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.6": {}
+    "netstandard1.5": {
+      "imports": [
+        "dotnet5.6"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.AppContext/src/System.AppContext.csproj b/src/System.AppContext/src/System.AppContext.csproj
index 7c968e465f..4da3469168 100644
--- a/src/System.AppContext/src/System.AppContext.csproj
+++ b/src/System.AppContext/src/System.AppContext.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,10 +13,10 @@
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
     <!-- Remove when resolving https://github.com/dotnet/corefx/issues/5471 
          And replace with property 
-         <PackageTargetFramework >dotnet5.6</PackageTargetFramework>
+         <PackageTargetFramework >netstandard1.5</PackageTargetFramework>
     -->
-    <PackageDestination Include="lib/dotnet5.6">
-      <TargetFramework>dotnet5.6</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.5">
+      <TargetFramework>netstandard1.5</TargetFramework>
     </PackageDestination>
     <PackageDestination Include="lib/dnxcore50">
       <TargetFramework>dnxcore50</TargetFramework>
diff --git a/src/System.Buffers/src/System.Buffers.csproj b/src/System.Buffers/src/System.Buffers.csproj
index d17491851e..6f52dccf36 100644
--- a/src/System.Buffers/src/System.Buffers.csproj
+++ b/src/System.Buffers/src/System.Buffers.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <ProjectGuid>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</ProjectGuid>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
     <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
diff --git a/src/System.Collections.Concurrent/ref/4.0.0/System.Collections.Concurrent.depproj b/src/System.Collections.Concurrent/ref/4.0.0/System.Collections.Concurrent.depproj
index bcd5a848db..29f2b6abda 100644
--- a/src/System.Collections.Concurrent/ref/4.0.0/System.Collections.Concurrent.depproj
+++ b/src/System.Collections.Concurrent/ref/4.0.0/System.Collections.Concurrent.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Collections.Concurrent/ref/4.0.0/project.json b/src/System.Collections.Concurrent/ref/4.0.0/project.json
index eef2161ef6..388d31d636 100644
--- a/src/System.Collections.Concurrent/ref/4.0.0/project.json
+++ b/src/System.Collections.Concurrent/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Collections.Concurrent": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections.Concurrent/ref/4.0.10/System.Collections.Concurrent.depproj b/src/System.Collections.Concurrent/ref/4.0.10/System.Collections.Concurrent.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.Collections.Concurrent/ref/4.0.10/System.Collections.Concurrent.depproj
+++ b/src/System.Collections.Concurrent/ref/4.0.10/System.Collections.Concurrent.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Collections.Concurrent/ref/4.0.10/project.json b/src/System.Collections.Concurrent/ref/4.0.10/project.json
index 6a126f3e29..a17058253e 100644
--- a/src/System.Collections.Concurrent/ref/4.0.10/project.json
+++ b/src/System.Collections.Concurrent/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Collections.Concurrent": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
index cfd2c0dcda..c92dcb9860 100644
--- a/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
+++ b/src/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.12.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Collections.Concurrent.cs" />
diff --git a/src/System.Collections.Concurrent/ref/project.json b/src/System.Collections.Concurrent/ref/project.json
index f3a2263603..b4da3de3ec 100644
--- a/src/System.Collections.Concurrent/ref/project.json
+++ b/src/System.Collections.Concurrent/ref/project.json
@@ -4,6 +4,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
index ceedbccc04..9e40507c59 100644
--- a/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
+++ b/src/System.Collections.Concurrent/src/System.Collections.Concurrent.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>System.Collections.Concurrent</RootNamespace>
     <DefineConstants>FEATURE_TRACING</DefineConstants>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
index 7966112bf3..31aa36364a 100644
--- a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
+++ b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
@@ -15,8 +15,8 @@
     <AssemblyVersion>1.2.0</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageDestination Include="lib/dotnet5.1">
-      <TargetFramework>dotnet5.1</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.0">
+      <TargetFramework>netstandard1.0</TargetFramework>
     </PackageDestination>
     <!-- Support targets that were supported in previous package versions -->
     <PackageDestination Include="lib/portable-net45+win8+wp8+wpa81">
diff --git a/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj b/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
index 78395693b8..64d572874d 100644
--- a/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
+++ b/src/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Collections.NonGeneric.cs" />
diff --git a/src/System.Collections.NonGeneric/ref/project.json b/src/System.Collections.NonGeneric/ref/project.json
index e7fc6f8248..34c6578279 100644
--- a/src/System.Collections.NonGeneric/ref/project.json
+++ b/src/System.Collections.NonGeneric/ref/project.json
@@ -4,6 +4,10 @@
     "System.Globalization": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
index 755cf9722f..229bb8f087 100644
--- a/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
+++ b/src/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>System.Collections.NonGeneric</RootNamespace>
     <AssemblyName>System.Collections.NonGeneric</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj b/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
index c78fe4815f..f6ef1fbfbb 100644
--- a/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
+++ b/src/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Collections.Specialized.cs" />
diff --git a/src/System.Collections.Specialized/ref/project.json b/src/System.Collections.Specialized/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Collections.Specialized/ref/project.json
+++ b/src/System.Collections.Specialized/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj
index 18ed553149..edd8e5ad16 100644
--- a/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj
+++ b/src/System.Collections.Specialized/src/System.Collections.Specialized.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>System.Collections.Specialized</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Collections/ref/4.0.0/System.Collections.depproj b/src/System.Collections/ref/4.0.0/System.Collections.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Collections/ref/4.0.0/System.Collections.depproj
+++ b/src/System.Collections/ref/4.0.0/System.Collections.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Collections/ref/4.0.0/project.json b/src/System.Collections/ref/4.0.0/project.json
index 9c9e489fa3..a38428a86c 100644
--- a/src/System.Collections/ref/4.0.0/project.json
+++ b/src/System.Collections/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Collections": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections/ref/4.0.10/System.Collections.depproj b/src/System.Collections/ref/4.0.10/System.Collections.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.Collections/ref/4.0.10/System.Collections.depproj
+++ b/src/System.Collections/ref/4.0.10/System.Collections.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Collections/ref/4.0.10/project.json b/src/System.Collections/ref/4.0.10/project.json
index c6cb6a52ed..d7c07c05a5 100644
--- a/src/System.Collections/ref/4.0.10/project.json
+++ b/src/System.Collections/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Collections": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections/ref/System.Collections.csproj b/src/System.Collections/ref/System.Collections.csproj
index a223b4b7eb..80a507caca 100644
--- a/src/System.Collections/ref/System.Collections.csproj
+++ b/src/System.Collections/ref/System.Collections.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Collections.cs" />
diff --git a/src/System.Collections/ref/project.json b/src/System.Collections/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Collections/ref/project.json
+++ b/src/System.Collections/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj
index 1a199a8d5a..5513ae4b3c 100644
--- a/src/System.Collections/src/System.Collections.csproj
+++ b/src/System.Collections/src/System.Collections.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>System.Collections</AssemblyName>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.ComponentModel.Annotations/ref/4.0.0/System.ComponentModel.Annotations.depproj b/src/System.ComponentModel.Annotations/ref/4.0.0/System.ComponentModel.Annotations.depproj
index bcd5a848db..29f2b6abda 100644
--- a/src/System.ComponentModel.Annotations/ref/4.0.0/System.ComponentModel.Annotations.depproj
+++ b/src/System.ComponentModel.Annotations/ref/4.0.0/System.ComponentModel.Annotations.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.ComponentModel.Annotations/ref/4.0.0/project.json b/src/System.ComponentModel.Annotations/ref/4.0.0/project.json
index 31cb06a69d..36a044e422 100644
--- a/src/System.ComponentModel.Annotations/ref/4.0.0/project.json
+++ b/src/System.ComponentModel.Annotations/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.ComponentModel.Annotations": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel.Annotations/ref/4.0.10/System.ComponentModel.Annotations.depproj b/src/System.ComponentModel.Annotations/ref/4.0.10/System.ComponentModel.Annotations.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.ComponentModel.Annotations/ref/4.0.10/System.ComponentModel.Annotations.depproj
+++ b/src/System.ComponentModel.Annotations/ref/4.0.10/System.ComponentModel.Annotations.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.ComponentModel.Annotations/ref/4.0.10/project.json b/src/System.ComponentModel.Annotations/ref/4.0.10/project.json
index 86e7e669a7..8ff4dec3e2 100644
--- a/src/System.ComponentModel.Annotations/ref/4.0.10/project.json
+++ b/src/System.ComponentModel.Annotations/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.ComponentModel.Annotations": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
index 8b907d769b..8b12f026ae 100644
--- a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
+++ b/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
     <!-- TODO: Update to 5.5 once nuget maps UAP to 5.5 https://github.com/nuget/home/1709 -->
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.Annotations.cs" />
diff --git a/src/System.ComponentModel.Annotations/ref/project.json b/src/System.ComponentModel.Annotations/ref/project.json
index d25cbe6ac9..f365ebc95f 100644
--- a/src/System.ComponentModel.Annotations/ref/project.json
+++ b/src/System.ComponentModel.Annotations/ref/project.json
@@ -4,6 +4,10 @@
     "System.ComponentModel": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
index ac95fedc9a..637dd137de 100644
--- a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
+++ b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
@@ -6,9 +6,9 @@
     <RootNamespace>System.ComponentModel.Annotations</RootNamespace>
     <AssemblyName>System.ComponentModel.Annotations</AssemblyName>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.ComponentModel.Annotations/src/project.json b/src/System.ComponentModel.Annotations/src/project.json
index 56250e3a88..2b7c9a0431 100644
--- a/src/System.ComponentModel.Annotations/src/project.json
+++ b/src/System.ComponentModel.Annotations/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.10",
         "System.ComponentModel": "4.0.0",
@@ -16,11 +16,14 @@
         "System.Runtime.Extensions": "4.0.10",
         "System.Text.RegularExpressions": "4.0.10",
         "System.Threading": "4.0.10"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
-    "net46":{
+    "net46": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
     }
   }
diff --git a/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/System.ComponentModel.EventBasedAsync.depproj b/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/System.ComponentModel.EventBasedAsync.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/System.ComponentModel.EventBasedAsync.depproj
+++ b/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/System.ComponentModel.EventBasedAsync.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/project.json b/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/project.json
index 83ffe8e0d4..60bfa2533e 100644
--- a/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/project.json
+++ b/src/System.ComponentModel.EventBasedAsync/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.ComponentModel.EventBasedAsync": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
index f82a99f6ac..1f230db5ca 100644
--- a/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
+++ b/src/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.EventBasedAsync.cs" />
diff --git a/src/System.ComponentModel.EventBasedAsync/ref/project.json b/src/System.ComponentModel.EventBasedAsync/ref/project.json
index 8e9890103d..7aa7a4aaf9 100644
--- a/src/System.ComponentModel.EventBasedAsync/ref/project.json
+++ b/src/System.ComponentModel.EventBasedAsync/ref/project.json
@@ -4,6 +4,10 @@
     "System.Threading": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj
index 303acdf5b6..856316cabf 100644
--- a/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj
+++ b/src/System.ComponentModel.EventBasedAsync/src/System.ComponentModel.EventBasedAsync.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj b/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
index 8aadb3e7fe..5f88f9b502 100644
--- a/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
+++ b/src/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.Primitives.cs" />
diff --git a/src/System.ComponentModel.Primitives/ref/project.json b/src/System.ComponentModel.Primitives/ref/project.json
index c0c66a7a97..68db9ec363 100644
--- a/src/System.ComponentModel.Primitives/ref/project.json
+++ b/src/System.ComponentModel.Primitives/ref/project.json
@@ -4,6 +4,10 @@
     "System.ComponentModel": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
index a125daa7df..86224199fe 100644
--- a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
+++ b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj
@@ -6,9 +6,9 @@
     <RootNamespace>System.ComponentModel.Primitives</RootNamespace>
     <AssemblyName>System.ComponentModel.Primitives</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.1</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.0</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net45'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.ComponentModel.Primitives/src/project.json b/src/System.ComponentModel.Primitives/src/project.json
index 5c017ee35b..50843c2043 100644
--- a/src/System.ComponentModel.Primitives/src/project.json
+++ b/src/System.ComponentModel.Primitives/src/project.json
@@ -1,14 +1,17 @@
 {
   "frameworks": {
-    "dotnet5.1": {
+    "netstandard1.0": {
       "dependencies": {
         "System.ComponentModel": "4.0.0",
         "System.Runtime": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.1"
+      ]
     },
-    "net45":{
+    "net45": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.5": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.5": "1.0.1"
       }
     }
   }
diff --git a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
index 943b586134..e875841075 100644
--- a/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
+++ b/src/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.TypeConverter.cs" />
diff --git a/src/System.ComponentModel.TypeConverter/ref/project.json b/src/System.ComponentModel.TypeConverter/ref/project.json
index a74d45731a..d36c268ea6 100644
--- a/src/System.ComponentModel.TypeConverter/ref/project.json
+++ b/src/System.ComponentModel.TypeConverter/ref/project.json
@@ -6,6 +6,10 @@
     "System.Globalization": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
index db40284a6c..a832612587 100644
--- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -6,9 +6,9 @@
     <RootNamespace>System.ComponentModel.TypeConverter</RootNamespace>
     <AssemblyName>System.ComponentModel.TypeConverter</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.1</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.0</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net45'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.ComponentModel.TypeConverter/src/project.json b/src/System.ComponentModel.TypeConverter/src/project.json
index efe0c2ad67..a39eb09d59 100644
--- a/src/System.ComponentModel.TypeConverter/src/project.json
+++ b/src/System.ComponentModel.TypeConverter/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.1": {
+    "netstandard1.0": {
       "dependencies": {
         "System.Collections": "4.0.0",
         "System.ComponentModel": "4.0.0",
@@ -15,11 +15,14 @@
         "System.Runtime": "4.0.0",
         "System.Runtime.Extensions": "4.0.0",
         "System.Threading": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.1"
+      ]
     },
-    "net45":{
+    "net45": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.5": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.5": "1.0.1"
       }
     }
   }
diff --git a/src/System.ComponentModel/ref/System.ComponentModel.csproj b/src/System.ComponentModel/ref/System.ComponentModel.csproj
index f4b4bb1543..95dd407e7f 100644
--- a/src/System.ComponentModel/ref/System.ComponentModel.csproj
+++ b/src/System.ComponentModel/ref/System.ComponentModel.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.cs" />
diff --git a/src/System.ComponentModel/ref/project.json b/src/System.ComponentModel/ref/project.json
index 03ac86ceb8..b60f939a11 100644
--- a/src/System.ComponentModel/ref/project.json
+++ b/src/System.ComponentModel/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ComponentModel/src/System.ComponentModel.csproj b/src/System.ComponentModel/src/System.ComponentModel.csproj
index 8e95bb85b5..842ba53dd0 100644
--- a/src/System.ComponentModel/src/System.ComponentModel.csproj
+++ b/src/System.ComponentModel/src/System.ComponentModel.csproj
@@ -8,7 +8,7 @@
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Console/ref/System.Console.csproj b/src/System.Console/ref/System.Console.csproj
index d7740a4f42..97ba776c36 100644
--- a/src/System.Console/ref/System.Console.csproj
+++ b/src/System.Console/ref/System.Console.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Console.cs" />
diff --git a/src/System.Console/ref/project.json b/src/System.Console/ref/project.json
index 5d5964f9e1..7a31f10a4d 100644
--- a/src/System.Console/ref/project.json
+++ b/src/System.Console/ref/project.json
@@ -4,6 +4,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Console/src/System.Console.csproj b/src/System.Console/src/System.Console.csproj
index 4f94aa4206..75176c6eeb 100644
--- a/src/System.Console/src/System.Console.csproj
+++ b/src/System.Console/src/System.Console.csproj
@@ -11,7 +11,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net46'">win7</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime>
   </PropertyGroup>
diff --git a/src/System.Data.Common/ref/System.Data.Common.csproj b/src/System.Data.Common/ref/System.Data.Common.csproj
index 9ee7be0c96..32004f554e 100644
--- a/src/System.Data.Common/ref/System.Data.Common.csproj
+++ b/src/System.Data.Common/ref/System.Data.Common.csproj
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
-    <PackageDestination Include="ref/dotnet5.1">
-      <TargetFramework>dotnet5.1</TargetFramework>
+    <PackageDestination Include="ref/netstandard1.0">
+      <TargetFramework>netstandard1.0</TargetFramework>
     </PackageDestination>
     <PackageDestination Include="ref/portable-net45+win8+wp8+wpa81">
       <TargetFramework>portable-net45+win8+wp8+wpa81</TargetFramework>
diff --git a/src/System.Data.Common/ref/project.json b/src/System.Data.Common/ref/project.json
index 5fd316692d..6c5ddb6b24 100644
--- a/src/System.Data.Common/ref/project.json
+++ b/src/System.Data.Common/ref/project.json
@@ -5,6 +5,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Data.Common/src/System.Data.Common.csproj b/src/System.Data.Common/src/System.Data.Common.csproj
index c2fc1bb56e..4b27304ad4 100644
--- a/src/System.Data.Common/src/System.Data.Common.csproj
+++ b/src/System.Data.Common/src/System.Data.Common.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,12 +7,12 @@
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net45'">true</IsPartialFacadeAssembly>
   </PropertyGroup>
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
-    <PackageDestination Include="lib/dotnet5.1">
-      <TargetFramework>dotnet5.1</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.0">
+      <TargetFramework>netstandard1.0</TargetFramework>
     </PackageDestination>
     <PackageDestination Include="lib/portable-net45+win8+wp8+wpa81">
       <TargetFramework>portable-net45+win8+wp8+wpa81</TargetFramework>
diff --git a/src/System.Data.Common/src/project.json b/src/System.Data.Common/src/project.json
index 964b584c75..43c189f878 100644
--- a/src/System.Data.Common/src/project.json
+++ b/src/System.Data.Common/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.1": {
+    "netstandard1.0": {
       "dependencies": {
         "Microsoft.NETCore.Platforms": "1.0.1-rc3-23818",
         "System.Collections": "4.0.0",
@@ -13,7 +13,10 @@
         "System.Runtime.Extensions": "4.0.0",
         "System.Text.RegularExpressions": "4.0.0",
         "System.Threading.Tasks": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.1"
+      ]
     },
     "net45": {
       "dependencies": {
@@ -21,4 +24,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
index d49d4d87ed..9018bba556 100644
--- a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
+++ b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Data.SqlClient.cs" />
diff --git a/src/System.Data.SqlClient/ref/project.json b/src/System.Data.SqlClient/ref/project.json
index 56c56747c5..0ef496e384 100644
--- a/src/System.Data.SqlClient/ref/project.json
+++ b/src/System.Data.SqlClient/ref/project.json
@@ -8,6 +8,10 @@
     "System.Xml.ReaderWriter": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj
index d0a42355a4..ccd85eb3d9 100644
--- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj
+++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
@@ -10,7 +10,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net45'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <UsePackageTargetRuntimeDefaults Condition="'$(TargetGroup)' == ''">true</UsePackageTargetRuntimeDefaults>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsWindows)' != 'true' ">
diff --git a/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
index 17f947a835..0164ed5e84 100644
--- a/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
+++ b/src/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Contracts.cs" />
diff --git a/src/System.Diagnostics.Contracts/ref/project.json b/src/System.Diagnostics.Contracts/ref/project.json
index 03ac86ceb8..b60f939a11 100644
--- a/src/System.Diagnostics.Contracts/ref/project.json
+++ b/src/System.Diagnostics.Contracts/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
index dea9065ee3..b59534c1a4 100644
--- a/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
+++ b/src/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Diagnostics.Contracts</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.1</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.0</PackageTargetFramework> 
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Diagnostics.Debug/ref/4.0.0/System.Diagnostics.Debug.depproj b/src/System.Diagnostics.Debug/ref/4.0.0/System.Diagnostics.Debug.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Diagnostics.Debug/ref/4.0.0/System.Diagnostics.Debug.depproj
+++ b/src/System.Diagnostics.Debug/ref/4.0.0/System.Diagnostics.Debug.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Diagnostics.Debug/ref/4.0.0/project.json b/src/System.Diagnostics.Debug/ref/4.0.0/project.json
index 09083e7b45..f8a8cde000 100644
--- a/src/System.Diagnostics.Debug/ref/4.0.0/project.json
+++ b/src/System.Diagnostics.Debug/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Diagnostics.Debug": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
index e53b4c4586..6004245b66 100644
--- a/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
+++ b/src/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Debug.cs" />
diff --git a/src/System.Diagnostics.Debug/ref/project.json b/src/System.Diagnostics.Debug/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Diagnostics.Debug/ref/project.json
+++ b/src/System.Diagnostics.Debug/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
index 120ccd34db..71253a5231 100644
--- a/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
+++ b/src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj
@@ -13,7 +13,7 @@
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory>
     <!-- Suppress warnings for type conflicts between SafeFileHandle in partial facade and mscorlib -->
     <UsePackageTargetRuntimeDefaults>true</UsePackageTargetRuntimeDefaults>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
index 0ee8f9d310..a5155898a2 100644
--- a/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
@@ -9,8 +9,8 @@
     <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
   </PropertyGroup>
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
-    <PackageDestination Include="lib/dotnet5.2">
-      <TargetFramework>dotnet5.2</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.1">
+      <TargetFramework>netstandard1.1</TargetFramework>
     </PackageDestination>
     <!-- Support downlevel targets -->
     <PackageDestination Include="lib/portable-net45+win8+wpa81">
diff --git a/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj b/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
index 3450efa23b..2d73f08309 100644
--- a/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.FileVersionInfo.cs" />
diff --git a/src/System.Diagnostics.FileVersionInfo/ref/project.json b/src/System.Diagnostics.FileVersionInfo/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Diagnostics.FileVersionInfo/ref/project.json
+++ b/src/System.Diagnostics.FileVersionInfo/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
index ee3863dee9..6b732cc344 100644
--- a/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
@@ -10,7 +10,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <UsePackageTargetRuntimeDefaults Condition="'$(TargetGroup)' == ''">true</UsePackageTargetRuntimeDefaults>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Diagnostics.Process/ref/4.0/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/ref/4.0/System.Diagnostics.Process.csproj
index a8530d3698..e7eda50da3 100644
--- a/src/System.Diagnostics.Process/ref/4.0/System.Diagnostics.Process.csproj
+++ b/src/System.Diagnostics.Process/ref/4.0/System.Diagnostics.Process.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Process.cs" />
diff --git a/src/System.Diagnostics.Process/ref/4.0/project.json b/src/System.Diagnostics.Process/ref/4.0/project.json
index 6d11251bc1..96ad4dbd65 100644
--- a/src/System.Diagnostics.Process/ref/4.0/project.json
+++ b/src/System.Diagnostics.Process/ref/4.0/project.json
@@ -6,6 +6,10 @@
     "System.Text.Encoding": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
index 7e180ab384..ec9ba7381f 100644
--- a/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
+++ b/src/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
     <!-- requires 5.5 since we needed surface area in Desktop 4.6.1 to support -->
-    <PackageTargetFramework>dotnet5.5</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.5</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.4</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Process.cs" />
diff --git a/src/System.Diagnostics.Process/ref/project.json b/src/System.Diagnostics.Process/ref/project.json
index 272ce1cbda..8544039843 100644
--- a/src/System.Diagnostics.Process/ref/project.json
+++ b/src/System.Diagnostics.Process/ref/project.json
@@ -6,6 +6,10 @@
     "System.Text.Encoding": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.5": {}
+    "netstandard1.4": {
+      "imports": [
+        "dotnet5.5"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index a96a42d056..948197ab07 100644
--- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -13,12 +13,12 @@
     <AssemblyVersion Condition="'$(TargetGroup)'!='net46'">4.1.0.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetGroup)'=='net46'">4.0.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework Condition="'$(TargetGroup)'==''">dotnet5.5</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)'==''">netstandard1.4</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' == ''">win7</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsLinux)' == 'true' and '$(TargetGroup)' == ''">linux</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsOSX)' == 'true' and '$(TargetGroup)' == ''">osx.10.10</PackageTargetRuntime>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46' OR '$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.5</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true' ">
     <!-- Suppress unused field warnings when using PlatformNotSupportedException stubs -->
diff --git a/src/System.Diagnostics.Process/src/project.json b/src/System.Diagnostics.Process/src/project.json
index f4b11770b6..2651c4fd99 100644
--- a/src/System.Diagnostics.Process/src/project.json
+++ b/src/System.Diagnostics.Process/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.5": {
+    "netstandard1.4": {
       "dependencies": {
         "System.Runtime": "4.0.20",
         "System.Runtime.Extensions": "4.0.10",
@@ -23,7 +23,10 @@
         "System.Collections": "4.0.10",
         "Microsoft.Win32.Primitives": "4.0.0",
         "Microsoft.Win32.Registry": "4.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.5"
+      ]
     },
     "net46": {
       "dependencies": {
@@ -36,4 +39,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
index 4374d32c7c..3b5b97053c 100644
--- a/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
+++ b/src/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.StackTrace.cs" />
diff --git a/src/System.Diagnostics.StackTrace/ref/project.json b/src/System.Diagnostics.StackTrace/ref/project.json
index fdc6ef2b0b..01e72961a8 100644
--- a/src/System.Diagnostics.StackTrace/ref/project.json
+++ b/src/System.Diagnostics.StackTrace/ref/project.json
@@ -4,6 +4,10 @@
     "System.Reflection": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
index 9724463b15..fd97401588 100644
--- a/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
+++ b/src/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
@@ -6,7 +6,7 @@
     <ProjectGuid>{02304469-722E-4723-92A1-820B9A37D275}</ProjectGuid>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'!='netcore50aot'">true</IsPartialFacadeAssembly>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj b/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
index bcde8749ec..b79dbaed48 100644
--- a/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
+++ b/src/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.TextWriterTraceListener.cs" />
diff --git a/src/System.Diagnostics.TextWriterTraceListener/ref/project.json b/src/System.Diagnostics.TextWriterTraceListener/ref/project.json
index 476a898ed8..c462bb9e21 100644
--- a/src/System.Diagnostics.TextWriterTraceListener/ref/project.json
+++ b/src/System.Diagnostics.TextWriterTraceListener/ref/project.json
@@ -5,6 +5,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj b/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
index 34283a1d9a..aba0353f1c 100644
--- a/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
+++ b/src/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Tools.cs" />
diff --git a/src/System.Diagnostics.Tools/ref/project.json b/src/System.Diagnostics.Tools/ref/project.json
index 03ac86ceb8..b60f939a11 100644
--- a/src/System.Diagnostics.Tools/ref/project.json
+++ b/src/System.Diagnostics.Tools/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
index 0534168d04..f6baa1773c 100644
--- a/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
+++ b/src/System.Diagnostics.Tools/src/System.Diagnostics.Tools.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.Diagnostics.Tools</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
index 6301a6e271..b5700ca7d6 100644
--- a/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
+++ b/src/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.TraceSource.cs" />
diff --git a/src/System.Diagnostics.TraceSource/ref/project.json b/src/System.Diagnostics.TraceSource/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Diagnostics.TraceSource/ref/project.json
+++ b/src/System.Diagnostics.TraceSource/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
index 050d67ed2b..15735e9e32 100644
--- a/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
+++ b/src/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
@@ -11,7 +11,7 @@
     <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
     <ProjectGuid>{5380420C-EB1D-4C53-9CFC-916578C18334}</ProjectGuid>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <UsePackageTargetRuntimeDefaults Condition="'$(TargetGroup)' == ''">true</UsePackageTargetRuntimeDefaults>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Diagnostics.Tracing/ref/4.0.0/System.Diagnostics.Tracing.depproj b/src/System.Diagnostics.Tracing/ref/4.0.0/System.Diagnostics.Tracing.depproj
index bcd5a848db..29f2b6abda 100644
--- a/src/System.Diagnostics.Tracing/ref/4.0.0/System.Diagnostics.Tracing.depproj
+++ b/src/System.Diagnostics.Tracing/ref/4.0.0/System.Diagnostics.Tracing.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Diagnostics.Tracing/ref/4.0.0/project.json b/src/System.Diagnostics.Tracing/ref/4.0.0/project.json
index 349dc3fdd2..ed8e369761 100644
--- a/src/System.Diagnostics.Tracing/ref/4.0.0/project.json
+++ b/src/System.Diagnostics.Tracing/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Diagnostics.Tracing": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Tracing/ref/4.0.10/System.Diagnostics.Tracing.depproj b/src/System.Diagnostics.Tracing/ref/4.0.10/System.Diagnostics.Tracing.depproj
index b14d7e6c03..7aa0e70c3a 100644
--- a/src/System.Diagnostics.Tracing/ref/4.0.10/System.Diagnostics.Tracing.depproj
+++ b/src/System.Diagnostics.Tracing/ref/4.0.10/System.Diagnostics.Tracing.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.2</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Diagnostics.Tracing/ref/4.0.10/project.json b/src/System.Diagnostics.Tracing/ref/4.0.10/project.json
index 766f48ab06..e5d2ad49d9 100644
--- a/src/System.Diagnostics.Tracing/ref/4.0.10/project.json
+++ b/src/System.Diagnostics.Tracing/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Diagnostics.Tracing": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.3": {}
+    "netstandard1.2": {
+      "imports": [
+        "dotnet5.3"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Tracing/ref/4.0.20/System.Diagnostics.Tracing.depproj b/src/System.Diagnostics.Tracing/ref/4.0.20/System.Diagnostics.Tracing.depproj
index a679733fce..2c8e3437c1 100644
--- a/src/System.Diagnostics.Tracing/ref/4.0.20/System.Diagnostics.Tracing.depproj
+++ b/src/System.Diagnostics.Tracing/ref/4.0.20/System.Diagnostics.Tracing.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.20.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Diagnostics.Tracing/ref/4.0.20/project.json b/src/System.Diagnostics.Tracing/ref/4.0.20/project.json
index d5da06d00b..7779a1acde 100644
--- a/src/System.Diagnostics.Tracing/ref/4.0.20/project.json
+++ b/src/System.Diagnostics.Tracing/ref/4.0.20/project.json
@@ -3,6 +3,10 @@
     "System.Diagnostics.Tracing": "4.0.20"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj b/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
index 34f640a6f7..376a96e04b 100644
--- a/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
+++ b/src/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.6</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.6</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Diagnostics.Tracing.cs" />
diff --git a/src/System.Diagnostics.Tracing/ref/project.json b/src/System.Diagnostics.Tracing/ref/project.json
index 563779f4e9..9c66bb28d8 100644
--- a/src/System.Diagnostics.Tracing/ref/project.json
+++ b/src/System.Diagnostics.Tracing/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.6": {}
+    "netstandard1.5": {
+      "imports": [
+        "dotnet5.6"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
index 9004a77382..6426ccfe01 100644
--- a/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
+++ b/src/System.Diagnostics.Tracing/src/System.Diagnostics.Tracing.csproj
@@ -21,10 +21,10 @@
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
     <!-- Remove when resolving https://github.com/dotnet/corefx/issues/5471 
          And replace with property 
-         <PackageTargetFramework >dotnet5.6</PackageTargetFramework>
+         <PackageTargetFramework >netstandard1.5</PackageTargetFramework>
     -->
-    <PackageDestination Include="lib/dotnet5.6">
-      <TargetFramework>dotnet5.6</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.5">
+      <TargetFramework>netstandard1.5</TargetFramework>
     </PackageDestination>
     <PackageDestination Include="lib/dnxcore50">
       <TargetFramework>dnxcore50</TargetFramework>
diff --git a/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj
index e0d5d768de..c7951f5bce 100644
--- a/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj
+++ b/src/System.Drawing.Primitives/ref/System.Drawing.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Drawing.Primitives.cs" />
diff --git a/src/System.Drawing.Primitives/ref/project.json b/src/System.Drawing.Primitives/ref/project.json
index 8d808f21f4..d27e26db76 100644
--- a/src/System.Drawing.Primitives/ref/project.json
+++ b/src/System.Drawing.Primitives/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Dynamic.Runtime/ref/4.0.0/System.Dynamic.Runtime.depproj b/src/System.Dynamic.Runtime/ref/4.0.0/System.Dynamic.Runtime.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Dynamic.Runtime/ref/4.0.0/System.Dynamic.Runtime.depproj
+++ b/src/System.Dynamic.Runtime/ref/4.0.0/System.Dynamic.Runtime.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Dynamic.Runtime/ref/4.0.0/project.json b/src/System.Dynamic.Runtime/ref/4.0.0/project.json
index 565993e704..355e1d3cc7 100644
--- a/src/System.Dynamic.Runtime/ref/4.0.0/project.json
+++ b/src/System.Dynamic.Runtime/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Dynamic.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Dynamic.Runtime/ref/4.0.10/System.Dynamic.Runtime.depproj b/src/System.Dynamic.Runtime/ref/4.0.10/System.Dynamic.Runtime.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.Dynamic.Runtime/ref/4.0.10/System.Dynamic.Runtime.depproj
+++ b/src/System.Dynamic.Runtime/ref/4.0.10/System.Dynamic.Runtime.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Dynamic.Runtime/ref/4.0.10/project.json b/src/System.Dynamic.Runtime/ref/4.0.10/project.json
index 425f255f45..e51b9c388c 100644
--- a/src/System.Dynamic.Runtime/ref/4.0.10/project.json
+++ b/src/System.Dynamic.Runtime/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Dynamic.Runtime": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj
index 2febe5a5b7..e209334e75 100644
--- a/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj
+++ b/src/System.Dynamic.Runtime/ref/System.Dynamic.Runtime.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Dynamic.Runtime.cs" />
diff --git a/src/System.Dynamic.Runtime/ref/project.json b/src/System.Dynamic.Runtime/ref/project.json
index 4ba5b30569..dd5b0179e1 100644
--- a/src/System.Dynamic.Runtime/ref/project.json
+++ b/src/System.Dynamic.Runtime/ref/project.json
@@ -6,6 +6,10 @@
     "System.Reflection": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
index ce54a12517..83345e193a 100644
--- a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
+++ b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj
@@ -9,7 +9,7 @@
     <IsInterpreting Condition="'$(TargetGroup)' == 'netcore50' or '$(TargetGroup)' == 'netcore50aot'">true</IsInterpreting>
     <DefineConstants Condition="'$(IsInterpreting)' != 'true'">$(DefineConstants);FEATURE_COMPILER</DefineConstants>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj b/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
index 918b7a2399..20ab9b605c 100644
--- a/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
+++ b/src/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Globalization.Calendars.cs" />
diff --git a/src/System.Globalization.Calendars/ref/project.json b/src/System.Globalization.Calendars/ref/project.json
index 21352d85fc..5fc47b36d1 100644
--- a/src/System.Globalization.Calendars/ref/project.json
+++ b/src/System.Globalization.Calendars/ref/project.json
@@ -4,6 +4,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
index 804090420d..613410837c 100644
--- a/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
+++ b/src/System.Globalization.Calendars/src/System.Globalization.Calendars.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Globalization.Calendars</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
index fb30cec76d..f7d43024fd 100644
--- a/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
+++ b/src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Globalization.Extensions.cs" />
diff --git a/src/System.Globalization.Extensions/ref/project.json b/src/System.Globalization.Extensions/ref/project.json
index 0ed8c59440..46853b7178 100644
--- a/src/System.Globalization.Extensions/ref/project.json
+++ b/src/System.Globalization.Extensions/ref/project.json
@@ -5,6 +5,10 @@
     "System.Globalization": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
index b673a1ba60..c74ccf214b 100644
--- a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
+++ b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
@@ -12,8 +12,8 @@
     <AssemblyName>System.Globalization.Extensions</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <ProjectGuid>{2B96AA10-84C0-4927-8611-8D2474B990E8}</ProjectGuid>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' == ''">win7</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true' and '$(TargetGroup)' == ''">unix</PackageTargetRuntime> 
diff --git a/src/System.Globalization.Extensions/src/project.json b/src/System.Globalization.Extensions/src/project.json
index dd59e7bc28..ea0287e387 100644
--- a/src/System.Globalization.Extensions/src/project.json
+++ b/src/System.Globalization.Extensions/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Diagnostics.Contracts": "4.0.0",
         "System.Diagnostics.Debug": "4.0.10",
@@ -11,11 +11,14 @@
         "System.Runtime.Extensions": "4.0.10",
         "System.Runtime.InteropServices": "4.0.20",
         "System.Threading.Tasks": "4.0.10"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
-    "net46":{
+    "net46": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
     }
   }
diff --git a/src/System.Globalization/ref/4.0.0/System.Globalization.depproj b/src/System.Globalization/ref/4.0.0/System.Globalization.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Globalization/ref/4.0.0/System.Globalization.depproj
+++ b/src/System.Globalization/ref/4.0.0/System.Globalization.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Globalization/ref/4.0.0/project.json b/src/System.Globalization/ref/4.0.0/project.json
index 53e12cb4b5..412dbf3132 100644
--- a/src/System.Globalization/ref/4.0.0/project.json
+++ b/src/System.Globalization/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Globalization": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Globalization/ref/System.Globalization.csproj b/src/System.Globalization/ref/System.Globalization.csproj
index 9d2abf0fb6..57e0c99f49 100644
--- a/src/System.Globalization/ref/System.Globalization.csproj
+++ b/src/System.Globalization/ref/System.Globalization.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Globalization.cs" />
diff --git a/src/System.Globalization/ref/project.json b/src/System.Globalization/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Globalization/ref/project.json
+++ b/src/System.Globalization/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Globalization/src/System.Globalization.csproj b/src/System.Globalization/src/System.Globalization.csproj
index 13f2b0fa45..1e06e3031c 100644
--- a/src/System.Globalization/src/System.Globalization.csproj
+++ b/src/System.Globalization/src/System.Globalization.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Globalization</AssemblyName>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj b/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
index 347aa0f8ae..f646c17237 100644
--- a/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
+++ b/src/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Compression.ZipFile.cs" />
diff --git a/src/System.IO.Compression.ZipFile/ref/project.json b/src/System.IO.Compression.ZipFile/ref/project.json
index 134de15f93..3e1505426f 100644
--- a/src/System.IO.Compression.ZipFile/ref/project.json
+++ b/src/System.IO.Compression.ZipFile/ref/project.json
@@ -6,6 +6,10 @@
     "System.Text.Encoding": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
index 2758616aa9..d687a6cace 100644
--- a/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
+++ b/src/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
@@ -8,7 +8,7 @@
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.IO.Compression/ref/4.0.0/System.IO.Compression.depproj b/src/System.IO.Compression/ref/4.0.0/System.IO.Compression.depproj
index bcd5a848db..29f2b6abda 100644
--- a/src/System.IO.Compression/ref/4.0.0/System.IO.Compression.depproj
+++ b/src/System.IO.Compression/ref/4.0.0/System.IO.Compression.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.IO.Compression/ref/4.0.0/project.json b/src/System.IO.Compression/ref/4.0.0/project.json
index 84de59a525..02c66507ce 100644
--- a/src/System.IO.Compression/ref/4.0.0/project.json
+++ b/src/System.IO.Compression/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.IO.Compression": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.Compression/ref/System.IO.Compression.csproj b/src/System.IO.Compression/ref/System.IO.Compression.csproj
index 27d22b6b4a..976002b231 100644
--- a/src/System.IO.Compression/ref/System.IO.Compression.csproj
+++ b/src/System.IO.Compression/ref/System.IO.Compression.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Compression.cs" />
diff --git a/src/System.IO.Compression/ref/project.json b/src/System.IO.Compression/ref/project.json
index 54e4a1d728..3d93ec09cb 100644
--- a/src/System.IO.Compression/ref/project.json
+++ b/src/System.IO.Compression/ref/project.json
@@ -6,6 +6,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.Compression/src/System.IO.Compression.csproj b/src/System.IO.Compression/src/System.IO.Compression.csproj
index 40074c8266..7c6f147f60 100644
--- a/src/System.IO.Compression/src/System.IO.Compression.csproj
+++ b/src/System.IO.Compression/src/System.IO.Compression.csproj
@@ -11,7 +11,7 @@
     <ProjectGuid>{5471BFE8-8071-466F-838E-5ADAA779E742}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <UseECMAKey Condition="'$(UseECMAKey)'==''">true</UseECMAKey>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <DefineConstants Condition="'$(TargetGroup)' != 'net46'">$(DefineConstants);FEATURE_ZLIB</DefineConstants>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' == ''">win7</PackageTargetRuntime> 
diff --git a/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
index 8ebfb0db4f..6fa776d8a3 100644
--- a/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
+++ b/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.AccessControl.cs" />
diff --git a/src/System.IO.FileSystem.AccessControl/ref/project.json b/src/System.IO.FileSystem.AccessControl/ref/project.json
index 1be335259f..a8d10c0a31 100644
--- a/src/System.IO.FileSystem.AccessControl/ref/project.json
+++ b/src/System.IO.FileSystem.AccessControl/ref/project.json
@@ -8,6 +8,10 @@
     "System.Security.Principal.Windows": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
index 5a2dce47d9..e886e81254 100644
--- a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
+++ b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks Condition="'$(TargetGroup)'==''">true</AllowUnsafeBlocks>
     <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dnxcore50</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.IO.FileSystem.AccessControl/src/project.json b/src/System.IO.FileSystem.AccessControl/src/project.json
index 5fef619199..c8698f09c1 100644
--- a/src/System.IO.FileSystem.AccessControl/src/project.json
+++ b/src/System.IO.FileSystem.AccessControl/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.0.0",
         "System.Diagnostics.Contracts": "4.0.0.0",
@@ -16,7 +16,10 @@
         "System.Security.AccessControl": "4.0.0-rc3-23818",
         "System.Security.Principal": "4.0.0.0",
         "System.Security.Principal.Windows": "4.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
     "net46": {
       "dependencies": {
@@ -24,4 +27,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj b/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
index c1c06234e4..9e3711f9e6 100644
--- a/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.DriveInfo.cs" />
diff --git a/src/System.IO.FileSystem.DriveInfo/ref/project.json b/src/System.IO.FileSystem.DriveInfo/ref/project.json
index e3f6ed9b92..ea0c9f9547 100644
--- a/src/System.IO.FileSystem.DriveInfo/ref/project.json
+++ b/src/System.IO.FileSystem.DriveInfo/ref/project.json
@@ -6,6 +6,10 @@
     "System.IO.FileSystem": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
index b5a971fa01..f339670076 100644
--- a/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
@@ -12,7 +12,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLSCompliant>false</CLSCompliant>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''">win7</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsLinux)' == 'true'">linux</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsOSX)' == 'true'">osx</PackageTargetRuntime> 
diff --git a/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj b/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
index 5a4fd6bd92..1aa99dcc0b 100644
--- a/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
+++ b/src/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.Primitives.cs" />
diff --git a/src/System.IO.FileSystem.Primitives/ref/project.json b/src/System.IO.FileSystem.Primitives/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.IO.FileSystem.Primitives/ref/project.json
+++ b/src/System.IO.FileSystem.Primitives/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj b/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj
index dbf30da526..3b481fbc41 100644
--- a/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj
+++ b/src/System.IO.FileSystem.Primitives/src/System.IO.FileSystem.Primitives.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.IO.FileSystem.Primitives</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
index ed9e8a3d45..c40d27829f 100644
--- a/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
+++ b/src/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.Watcher.cs" />
diff --git a/src/System.IO.FileSystem.Watcher/ref/project.json b/src/System.IO.FileSystem.Watcher/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.IO.FileSystem.Watcher/ref/project.json
+++ b/src/System.IO.FileSystem.Watcher/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index 3b02de0247..c2937ec823 100644
--- a/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -9,8 +9,8 @@
     <ProjectGuid>{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''">win7</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsLinux)' == 'true'">linux</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsOSX)' == 'true'">osx</PackageTargetRuntime> 
diff --git a/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
index ae8c7b319f..9fd351cbf8 100644
--- a/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
+++ b/src/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.FileSystem.cs" />
diff --git a/src/System.IO.FileSystem/ref/project.json b/src/System.IO.FileSystem/ref/project.json
index 3b27f3bf65..64b9eacdba 100644
--- a/src/System.IO.FileSystem/ref/project.json
+++ b/src/System.IO.FileSystem/ref/project.json
@@ -8,6 +8,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj
index 8682835252..260f69ef81 100644
--- a/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj
+++ b/src/System.IO.FileSystem/src/System.IO.FileSystem.csproj
@@ -12,7 +12,7 @@
     <EnableWinRT Condition="'$(PackageTargetFramework)' == 'netcore50'">true</EnableWinRT>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''">win7</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime>
   </PropertyGroup>
diff --git a/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
index 98c218c757..bb55efad8d 100644
--- a/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
+++ b/src/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.6</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.6</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.IsolatedStorage.cs" />
diff --git a/src/System.IO.IsolatedStorage/ref/project.json b/src/System.IO.IsolatedStorage/ref/project.json
index 9f1703113b..f32a5167dd 100644
--- a/src/System.IO.IsolatedStorage/ref/project.json
+++ b/src/System.IO.IsolatedStorage/ref/project.json
@@ -6,6 +6,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.6": {}
+    "netstandard1.5": {
+      "imports": [
+        "dotnet5.6"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
index e88fbe2399..721f557989 100644
--- a/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+++ b/src/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
@@ -9,7 +9,7 @@
     <ProjectGuid>{FAF5D1E4-BA43-4663-8429-C069066D75CB}</ProjectGuid>
     <EnableWinRT>true</EnableWinRT>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.6</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.5</PackageTargetFramework> 
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50_Debug|AnyCPU'" />
diff --git a/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
index b4fc3054ea..1d5395c31e 100644
--- a/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
+++ b/src/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.MemoryMappedFiles.cs" />
diff --git a/src/System.IO.MemoryMappedFiles/ref/project.json b/src/System.IO.MemoryMappedFiles/ref/project.json
index a4023a139f..a7565efd29 100644
--- a/src/System.IO.MemoryMappedFiles/ref/project.json
+++ b/src/System.IO.MemoryMappedFiles/ref/project.json
@@ -9,6 +9,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
index 0170cb5719..f1b28c354e 100644
--- a/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
+++ b/src/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
@@ -11,7 +11,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''">win7</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsLinux)' == 'true'">linux</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsOSX)' == 'true'">osx</PackageTargetRuntime> 
diff --git a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj
index e18158d7ff..91342011d1 100644
--- a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj
+++ b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Packaging.cs" />
diff --git a/src/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/System.IO.Packaging/src/System.IO.Packaging.csproj
index 3aeb585632..a0e4d47a5d 100644
--- a/src/System.IO.Packaging/src/System.IO.Packaging.csproj
+++ b/src/System.IO.Packaging/src/System.IO.Packaging.csproj
@@ -7,9 +7,9 @@
     <RootNamespace>System.IO.Packaging</RootNamespace>
     <AssemblyName>System.IO.Packaging</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.IO.Packaging/src/project.json b/src/System.IO.Packaging/src/project.json
index 94e68223e1..f03e654adc 100644
--- a/src/System.IO.Packaging/src/project.json
+++ b/src/System.IO.Packaging/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.10",
         "System.Diagnostics.Debug": "4.0.10",
@@ -9,11 +9,14 @@
         "System.IO.FileSystem.Primitives": "4.0.0",
         "System.Runtime": "4.0.0",
         "System.Xml.ReaderWriter": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
-    "net46":{
+    "net46": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
     }
   }
diff --git a/src/System.IO.Pipes/ref/System.IO.Pipes.csproj b/src/System.IO.Pipes/ref/System.IO.Pipes.csproj
index 8e9150080a..20d5cf4786 100644
--- a/src/System.IO.Pipes/ref/System.IO.Pipes.csproj
+++ b/src/System.IO.Pipes/ref/System.IO.Pipes.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.Pipes.cs" />
diff --git a/src/System.IO.Pipes/ref/project.json b/src/System.IO.Pipes/ref/project.json
index 1ee66fff67..2c099c2c25 100644
--- a/src/System.IO.Pipes/ref/project.json
+++ b/src/System.IO.Pipes/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/System.IO.Pipes/src/System.IO.Pipes.csproj
index d3cf1999ef..2477b8984d 100644
--- a/src/System.IO.Pipes/src/System.IO.Pipes.csproj
+++ b/src/System.IO.Pipes/src/System.IO.Pipes.csproj
@@ -12,7 +12,7 @@
     <DefineConstants>$(DefineConstants)</DefineConstants>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <UsePackageTargetRuntimeDefaults Condition="'$(TargetGroup)' == ''">true</UsePackageTargetRuntimeDefaults>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
diff --git a/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj b/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
index 8f93e87c15..8a0e5fbfce 100644
--- a/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
+++ b/src/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.UnmanagedMemoryStream.cs" />
diff --git a/src/System.IO.UnmanagedMemoryStream/ref/project.json b/src/System.IO.UnmanagedMemoryStream/ref/project.json
index 44c6b43fc4..630c77a178 100644
--- a/src/System.IO.UnmanagedMemoryStream/ref/project.json
+++ b/src/System.IO.UnmanagedMemoryStream/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
index ef83adfd8c..807dda4687 100644
--- a/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
+++ b/src/System.IO.UnmanagedMemoryStream/src/System.IO.UnmanagedMemoryStream.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.IO/ref/4.0.0/System.IO.depproj b/src/System.IO/ref/4.0.0/System.IO.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.IO/ref/4.0.0/System.IO.depproj
+++ b/src/System.IO/ref/4.0.0/System.IO.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.IO/ref/4.0.0/project.json b/src/System.IO/ref/4.0.0/project.json
index 322263245f..52dc4a286a 100644
--- a/src/System.IO/ref/4.0.0/project.json
+++ b/src/System.IO/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO/ref/4.0.10/System.IO.depproj b/src/System.IO/ref/4.0.10/System.IO.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.IO/ref/4.0.10/System.IO.depproj
+++ b/src/System.IO/ref/4.0.10/System.IO.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.IO/ref/4.0.10/project.json b/src/System.IO/ref/4.0.10/project.json
index 275fb43833..883bc1c892 100644
--- a/src/System.IO/ref/4.0.10/project.json
+++ b/src/System.IO/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.IO": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO/ref/System.IO.csproj b/src/System.IO/ref/System.IO.csproj
index 04c3aa249a..523ab66801 100644
--- a/src/System.IO/ref/System.IO.csproj
+++ b/src/System.IO/ref/System.IO.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.IO.cs" />
diff --git a/src/System.IO/ref/project.json b/src/System.IO/ref/project.json
index 8a91691dd5..1beb2a21d9 100644
--- a/src/System.IO/ref/project.json
+++ b/src/System.IO/ref/project.json
@@ -5,6 +5,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.IO/src/System.IO.csproj b/src/System.IO/src/System.IO.csproj
index 6e99f7028d..b3b344de5d 100644
--- a/src/System.IO/src/System.IO.csproj
+++ b/src/System.IO/src/System.IO.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -6,7 +6,7 @@
     <ProjectGuid>{07390899-C8F6-4e83-A3A9-6867B8CB46A0}</ProjectGuid>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Default configurations to help VS understand the options -->
diff --git a/src/System.Linq.Expressions/ref/4.0.0/System.Linq.Expressions.depproj b/src/System.Linq.Expressions/ref/4.0.0/System.Linq.Expressions.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Linq.Expressions/ref/4.0.0/System.Linq.Expressions.depproj
+++ b/src/System.Linq.Expressions/ref/4.0.0/System.Linq.Expressions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Linq.Expressions/ref/4.0.0/project.json b/src/System.Linq.Expressions/ref/4.0.0/project.json
index 87033c23a3..4d4567cf5a 100644
--- a/src/System.Linq.Expressions/ref/4.0.0/project.json
+++ b/src/System.Linq.Expressions/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Linq.Expressions": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Linq.Expressions/ref/4.0.10/System.Linq.Expressions.depproj b/src/System.Linq.Expressions/ref/4.0.10/System.Linq.Expressions.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.Linq.Expressions/ref/4.0.10/System.Linq.Expressions.depproj
+++ b/src/System.Linq.Expressions/ref/4.0.10/System.Linq.Expressions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Linq.Expressions/ref/4.0.10/project.json b/src/System.Linq.Expressions/ref/4.0.10/project.json
index d1740160ad..1a7d21462b 100644
--- a/src/System.Linq.Expressions/ref/4.0.10/project.json
+++ b/src/System.Linq.Expressions/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Linq.Expressions": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
index 289f8de663..b3b6b5adb1 100644
--- a/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
+++ b/src/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Linq.Expressions.cs" />
diff --git a/src/System.Linq.Expressions/ref/project.json b/src/System.Linq.Expressions/ref/project.json
index fdc6ef2b0b..01e72961a8 100644
--- a/src/System.Linq.Expressions/ref/project.json
+++ b/src/System.Linq.Expressions/ref/project.json
@@ -4,6 +4,10 @@
     "System.Reflection": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj
index 3167cadd70..aa231d84db 100644
--- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj
+++ b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -10,7 +10,7 @@
     <AssemblyName>System.Linq.Expressions</AssemblyName>
     <RootNamespace>System.Linq.Expressions</RootNamespace>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <IsInterpreting Condition="'$(PackageTargetFramework)' == 'netcore50'">true</IsInterpreting>
     <DefineConstants Condition=" '$(IsInterpreting)' != 'true' ">$(DefineConstants);FEATURE_COMPILE</DefineConstants>
     <DefineConstants Condition=" '$(FeatureInterpret)' == 'true' ">$(DefineConstants);FEATURE_INTERPRET</DefineConstants>
diff --git a/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj b/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
index add62ab649..096cb9931e 100644
--- a/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
+++ b/src/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Linq.Parallel.cs" />
diff --git a/src/System.Linq.Parallel/ref/project.json b/src/System.Linq.Parallel/ref/project.json
index 79d638f224..8c2382e718 100644
--- a/src/System.Linq.Parallel/ref/project.json
+++ b/src/System.Linq.Parallel/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj
index dea01ccd1e..1f42ca4aae 100644
--- a/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj
+++ b/src/System.Linq.Parallel/src/System.Linq.Parallel.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj b/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
index 3715185bfa..5393a6f59d 100644
--- a/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
+++ b/src/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Linq.Queryable.cs" />
diff --git a/src/System.Linq.Queryable/ref/project.json b/src/System.Linq.Queryable/ref/project.json
index 5064066d0c..858488e356 100644
--- a/src/System.Linq.Queryable/ref/project.json
+++ b/src/System.Linq.Queryable/ref/project.json
@@ -5,6 +5,10 @@
     "System.Linq": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj b/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj
index 7096be3fbe..9c6e951bf1 100644
--- a/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj
+++ b/src/System.Linq.Queryable/src/System.Linq.Queryable.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>System.Linq.Queryable</RootNamespace>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Linq/ref/4.0.0/System.Linq.depproj b/src/System.Linq/ref/4.0.0/System.Linq.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Linq/ref/4.0.0/System.Linq.depproj
+++ b/src/System.Linq/ref/4.0.0/System.Linq.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Linq/ref/4.0.0/project.json b/src/System.Linq/ref/4.0.0/project.json
index 4297e6c853..d4e9769ae6 100644
--- a/src/System.Linq/ref/4.0.0/project.json
+++ b/src/System.Linq/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Linq": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Linq/ref/System.Linq.csproj b/src/System.Linq/ref/System.Linq.csproj
index 62b341e49f..72158f5545 100644
--- a/src/System.Linq/ref/System.Linq.csproj
+++ b/src/System.Linq/ref/System.Linq.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.6</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.6</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Linq.cs" />
diff --git a/src/System.Linq/ref/project.json b/src/System.Linq/ref/project.json
index 91c04b1018..1430148354 100644
--- a/src/System.Linq/ref/project.json
+++ b/src/System.Linq/ref/project.json
@@ -4,6 +4,10 @@
     "System.Collections": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.6": {}
+    "netstandard1.5": {
+      "imports": [
+        "dotnet5.6"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Linq/src/System.Linq.csproj b/src/System.Linq/src/System.Linq.csproj
index a8414436c4..53e88544e0 100644
--- a/src/System.Linq/src/System.Linq.csproj
+++ b/src/System.Linq/src/System.Linq.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -13,10 +13,10 @@
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
     <!-- Remove when resolving https://github.com/dotnet/corefx/issues/5471 
          And replace with property 
-         <PackageTargetFramework >dotnet5.6</PackageTargetFramework>
+         <PackageTargetFramework >netstandard1.5</PackageTargetFramework>
     -->
-    <PackageDestination Include="lib/dotnet5.6">
-      <TargetFramework>dotnet5.6</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.5">
+      <TargetFramework>netstandard1.5</TargetFramework>
     </PackageDestination>
     <PackageDestination Include="lib/dnxcore50">
       <TargetFramework>dnxcore50</TargetFramework>
diff --git a/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj b/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj
index 113502391a..3fa6068efc 100644
--- a/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj
+++ b/src/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Http.Rtc.cs" />
diff --git a/src/System.Net.Http.Rtc/ref/project.json b/src/System.Net.Http.Rtc/ref/project.json
index abb4a54ce0..f370a3cefb 100644
--- a/src/System.Net.Http.Rtc/ref/project.json
+++ b/src/System.Net.Http.Rtc/ref/project.json
@@ -5,6 +5,10 @@
     "System.Net.Http": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj
index b642442558..50b31f4f83 100644
--- a/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj
+++ b/src/System.Net.Http.Rtc/src/System.Net.Http.Rtc.csproj
@@ -7,7 +7,7 @@
   <PropertyGroup>
     <AssemblyName>System.Net.Http.Rtc</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.2</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.1</PackageTargetFramework> 
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_netcore50_Debug|AnyCPU'" />
diff --git a/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj b/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj
index 5af5db7f82..00f5adbc7c 100644
--- a/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj
+++ b/src/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Http.WinHttpHandler.cs" />
diff --git a/src/System.Net.Http.WinHttpHandler/ref/project.json b/src/System.Net.Http.WinHttpHandler/ref/project.json
index f175fda882..a28652d96e 100644
--- a/src/System.Net.Http.WinHttpHandler/ref/project.json
+++ b/src/System.Net.Http.WinHttpHandler/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Net.Http/ref/System.Net.Http.csproj b/src/System.Net.Http/ref/System.Net.Http.csproj
index 8ea23bb58e..7a5b55bf3f 100644
--- a/src/System.Net.Http/ref/System.Net.Http.csproj
+++ b/src/System.Net.Http/ref/System.Net.Http.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Http.cs" />
diff --git a/src/System.Net.Http/ref/project.json b/src/System.Net.Http/ref/project.json
index cb9f6049da..d7a97ba0c1 100644
--- a/src/System.Net.Http/ref/project.json
+++ b/src/System.Net.Http/ref/project.json
@@ -7,6 +7,10 @@
     "System.Text.Encoding": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
index bc885a6c82..39808a7396 100644
--- a/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
+++ b/src/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.NameResolution.cs" />
diff --git a/src/System.Net.NameResolution/ref/project.json b/src/System.Net.NameResolution/ref/project.json
index 1f632527af..dc1eb8f955 100644
--- a/src/System.Net.NameResolution/ref/project.json
+++ b/src/System.Net.NameResolution/ref/project.json
@@ -5,6 +5,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj
index 04677042d5..3d87fca6f7 100644
--- a/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj
+++ b/src/System.Net.NameResolution/src/System.Net.NameResolution.csproj
@@ -12,7 +12,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
     <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'net46'">win7</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true' and '$(TargetGroup)' != 'net46'">unix</PackageTargetRuntime>
   </PropertyGroup>
diff --git a/src/System.Net.NetworkInformation/ref/4.0.0/System.Net.NetworkInformation.depproj b/src/System.Net.NetworkInformation/ref/4.0.0/System.Net.NetworkInformation.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Net.NetworkInformation/ref/4.0.0/System.Net.NetworkInformation.depproj
+++ b/src/System.Net.NetworkInformation/ref/4.0.0/System.Net.NetworkInformation.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Net.NetworkInformation/ref/4.0.0/project.json b/src/System.Net.NetworkInformation/ref/4.0.0/project.json
index df35979466..6f92d802c2 100644
--- a/src/System.Net.NetworkInformation/ref/4.0.0/project.json
+++ b/src/System.Net.NetworkInformation/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Net.NetworkInformation": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
index 106ca5a43a..5d5571193d 100644
--- a/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
+++ b/src/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.NetworkInformation.cs" />
diff --git a/src/System.Net.NetworkInformation/ref/project.json b/src/System.Net.NetworkInformation/ref/project.json
index caab7c7f43..7b59781d33 100644
--- a/src/System.Net.NetworkInformation/ref/project.json
+++ b/src/System.Net.NetworkInformation/ref/project.json
@@ -5,6 +5,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.5": {}
+    "netstandard1.4": {
+      "imports": [
+        "dotnet5.5"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
index feda80deec..6187529dec 100644
--- a/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+++ b/src/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
@@ -11,9 +11,9 @@
     <ProjectGuid>{3CA89D6C-F8D1-4813-9775-F8D249686E31}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetFramework Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' == 'true'">netcore50</PackageTargetFramework>
-    <PackageTargetRuntime Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''">win7</PackageTargetRuntime>
+    <PackageTargetRuntime Condition=" '$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net46'">win7</PackageTargetRuntime>
     <PackageTargetRuntime Condition=" '$(TargetsOSX)' == 'true'">osx.10.10</PackageTargetRuntime>
     <PackageTargetRuntime Condition=" '$(TargetsLinux)' == 'true'">linux</PackageTargetRuntime>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
diff --git a/src/System.Net.Ping/ref/System.Net.Ping.csproj b/src/System.Net.Ping/ref/System.Net.Ping.csproj
index 4168537b30..9cb0080244 100644
--- a/src/System.Net.Ping/ref/System.Net.Ping.csproj
+++ b/src/System.Net.Ping/ref/System.Net.Ping.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Ping.cs" />
diff --git a/src/System.Net.Ping/ref/project.json b/src/System.Net.Ping/ref/project.json
index 1f632527af..dc1eb8f955 100644
--- a/src/System.Net.Ping/ref/project.json
+++ b/src/System.Net.Ping/ref/project.json
@@ -5,6 +5,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Primitives/ref/3.9.0/System.Net.Primitives.depproj b/src/System.Net.Primitives/ref/3.9.0/System.Net.Primitives.depproj
index 16c83600f5..b0ee27b58c 100644
--- a/src/System.Net.Primitives/ref/3.9.0/System.Net.Primitives.depproj
+++ b/src/System.Net.Primitives/ref/3.9.0/System.Net.Primitives.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>3.9.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Net.Primitives/ref/3.9.0/project.json b/src/System.Net.Primitives/ref/3.9.0/project.json
index 503dd4330f..01cf163cc7 100644
--- a/src/System.Net.Primitives/ref/3.9.0/project.json
+++ b/src/System.Net.Primitives/ref/3.9.0/project.json
@@ -3,6 +3,10 @@
     "System.Net.Primitives": "3.9.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Primitives/ref/4.0.0/System.Net.Primitives.depproj b/src/System.Net.Primitives/ref/4.0.0/System.Net.Primitives.depproj
index bcd5a848db..29f2b6abda 100644
--- a/src/System.Net.Primitives/ref/4.0.0/System.Net.Primitives.depproj
+++ b/src/System.Net.Primitives/ref/4.0.0/System.Net.Primitives.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Net.Primitives/ref/4.0.0/project.json b/src/System.Net.Primitives/ref/4.0.0/project.json
index 5bde47c954..f22ac69740 100644
--- a/src/System.Net.Primitives/ref/4.0.0/project.json
+++ b/src/System.Net.Primitives/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Net.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj
index 5aca6d0b58..9bdeec85a8 100644
--- a/src/System.Net.Primitives/ref/System.Net.Primitives.csproj
+++ b/src/System.Net.Primitives/ref/System.Net.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Primitives.cs" />
diff --git a/src/System.Net.Primitives/ref/project.json b/src/System.Net.Primitives/ref/project.json
index 330f88a68e..f112c278ac 100644
--- a/src/System.Net.Primitives/ref/project.json
+++ b/src/System.Net.Primitives/ref/project.json
@@ -4,6 +4,10 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Requests/ref/3.9.0/System.Net.Requests.depproj b/src/System.Net.Requests/ref/3.9.0/System.Net.Requests.depproj
index 16c83600f5..b0ee27b58c 100644
--- a/src/System.Net.Requests/ref/3.9.0/System.Net.Requests.depproj
+++ b/src/System.Net.Requests/ref/3.9.0/System.Net.Requests.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>3.9.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Net.Requests/ref/3.9.0/project.json b/src/System.Net.Requests/ref/3.9.0/project.json
index 21acebacb6..18bbb6ce9f 100644
--- a/src/System.Net.Requests/ref/3.9.0/project.json
+++ b/src/System.Net.Requests/ref/3.9.0/project.json
@@ -3,6 +3,10 @@
     "System.Net.Requests": "3.9.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Requests/ref/4.0.0/System.Net.Requests.depproj b/src/System.Net.Requests/ref/4.0.0/System.Net.Requests.depproj
index bcd5a848db..29f2b6abda 100644
--- a/src/System.Net.Requests/ref/4.0.0/System.Net.Requests.depproj
+++ b/src/System.Net.Requests/ref/4.0.0/System.Net.Requests.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Net.Requests/ref/4.0.0/project.json b/src/System.Net.Requests/ref/4.0.0/project.json
index b8aacef13e..f430a39819 100644
--- a/src/System.Net.Requests/ref/4.0.0/project.json
+++ b/src/System.Net.Requests/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Net.Requests": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Requests/ref/System.Net.Requests.csproj b/src/System.Net.Requests/ref/System.Net.Requests.csproj
index 832c70cb88..9da91d0acc 100644
--- a/src/System.Net.Requests/ref/System.Net.Requests.csproj
+++ b/src/System.Net.Requests/ref/System.Net.Requests.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Requests.cs" />
diff --git a/src/System.Net.Requests/ref/project.json b/src/System.Net.Requests/ref/project.json
index 6c7c932f3e..9943c52834 100644
--- a/src/System.Net.Requests/ref/project.json
+++ b/src/System.Net.Requests/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Requests/src/System.Net.Requests.csproj b/src/System.Net.Requests/src/System.Net.Requests.csproj
index 3d1cf2a6bd..fbe3dd1310 100644
--- a/src/System.Net.Requests/src/System.Net.Requests.csproj
+++ b/src/System.Net.Requests/src/System.Net.Requests.csproj
@@ -12,7 +12,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
     <UsePackageTargetRuntimeDefaults>true</UsePackageTargetRuntimeDefaults>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Net.Security/ref/System.Net.Security.csproj b/src/System.Net.Security/ref/System.Net.Security.csproj
index ea178f4104..dd1d78b88e 100644
--- a/src/System.Net.Security/ref/System.Net.Security.csproj
+++ b/src/System.Net.Security/ref/System.Net.Security.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Security.cs" />
diff --git a/src/System.Net.Security/ref/project.json b/src/System.Net.Security/ref/project.json
index 54ba3437cd..e4ff8ff590 100644
--- a/src/System.Net.Security/ref/project.json
+++ b/src/System.Net.Security/ref/project.json
@@ -9,6 +9,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Net.Sockets/ref/System.Net.Sockets.csproj b/src/System.Net.Sockets/ref/System.Net.Sockets.csproj
index 92da14fa22..cca9ec5789 100644
--- a/src/System.Net.Sockets/ref/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/ref/System.Net.Sockets.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.Sockets.cs" />
diff --git a/src/System.Net.Sockets/ref/project.json b/src/System.Net.Sockets/ref/project.json
index cd72c5bb00..aa5631a161 100644
--- a/src/System.Net.Sockets/ref/project.json
+++ b/src/System.Net.Sockets/ref/project.json
@@ -6,6 +6,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
index e5830ae416..4f9cb7fdfc 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
@@ -9,7 +9,7 @@
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <ProjectGuid>{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <PackageTargetFramework Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' == 'true'">netcore50</PackageTargetFramework>
diff --git a/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj b/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
index 233e415606..7fce4004dc 100644
--- a/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
+++ b/src/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.WebHeaderCollection.cs" />
diff --git a/src/System.Net.WebHeaderCollection/ref/project.json b/src/System.Net.WebHeaderCollection/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Net.WebHeaderCollection/ref/project.json
+++ b/src/System.Net.WebHeaderCollection/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
index f6fabab560..6dba9f7ed2 100644
--- a/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
+++ b/src/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
@@ -10,7 +10,7 @@
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj b/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
index c595a58e91..a1b10885bb 100644
--- a/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
+++ b/src/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.WebSockets.Client.cs" />
diff --git a/src/System.Net.WebSockets.Client/ref/project.json b/src/System.Net.WebSockets.Client/ref/project.json
index 95aa08d71b..caf1319940 100644
--- a/src/System.Net.WebSockets.Client/ref/project.json
+++ b/src/System.Net.WebSockets.Client/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
index d5f2f6bab3..0d283f7b06 100644
--- a/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
+++ b/src/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
@@ -11,7 +11,7 @@
     <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net46'">win7</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime>
   </PropertyGroup>
diff --git a/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj b/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
index f607a4d5dd..2a33587392 100644
--- a/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
+++ b/src/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Net.WebSockets.cs" />
diff --git a/src/System.Net.WebSockets/ref/project.json b/src/System.Net.WebSockets/ref/project.json
index f3a2263603..b4da3de3ec 100644
--- a/src/System.Net.WebSockets/ref/project.json
+++ b/src/System.Net.WebSockets/ref/project.json
@@ -4,6 +4,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj
index c21d05705f..846305b543 100644
--- a/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj
+++ b/src/System.Net.WebSockets/src/System.Net.WebSockets.csproj
@@ -7,7 +7,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj b/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj
index d989b45789..936df44f24 100644
--- a/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj
+++ b/src/System.Numerics.Vectors/ref/4.0.0/System.Numerics.Vectors.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Numerics.Vectors/ref/4.0.0/project.json b/src/System.Numerics.Vectors/ref/4.0.0/project.json
index 39056e65e1..c525f988e5 100644
--- a/src/System.Numerics.Vectors/ref/4.0.0/project.json
+++ b/src/System.Numerics.Vectors/ref/4.0.0/project.json
@@ -3,8 +3,11 @@
     "System.Numerics.Vectors": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {
-      "imports": "portable-net45+win8"
+    "netstandard1.3": {
+      "imports": [
+        "portable-net45+win8",
+        "dotnet5.4"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
index 65f08d9e6f..0f1eabbce1 100644
--- a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
+++ b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
     <!-- remove when fixing https://github.com/dotnet/corefx/issues/5900 -->
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
-    <PackageDestination Include="ref/dotnet5.2">
-      <TargetFramework>dotnet5.2</TargetFramework>
+    <PackageDestination Include="ref/netstandard1.1">
+      <TargetFramework>netstandard1.1</TargetFramework>
     </PackageDestination>
     <PackageDestination Include="ref/portable-net45+win8">
       <TargetFramework>portable-net45+win8</TargetFramework>
diff --git a/src/System.Numerics.Vectors/ref/project.json b/src/System.Numerics.Vectors/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Numerics.Vectors/ref/project.json
+++ b/src/System.Numerics.Vectors/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 2e8ad6bf5b..5137338db1 100644
--- a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -9,12 +9,12 @@
     <DocumentationFile>$(OutputPath)System.Numerics.Vectors.xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
-    <PackageDestination Include="lib/dotnet5.4">
-      <TargetFramework>dotnet5.4</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.3">
+      <TargetFramework>netstandard1.3</TargetFramework>
     </PackageDestination>
     <PackageDestination Include="lib/portable-net45+win8">
       <TargetFramework>portable-net45+win8</TargetFramework>
diff --git a/src/System.Numerics.Vectors/src/project.json b/src/System.Numerics.Vectors/src/project.json
index 8ccfcbb218..2cc89b41b6 100644
--- a/src/System.Numerics.Vectors/src/project.json
+++ b/src/System.Numerics.Vectors/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Runtime": "4.0.0",
         "System.Resources.ResourceManager": "4.0.0",
@@ -8,11 +8,14 @@
         "System.Runtime.Extensions": "4.0.0",
         "System.Diagnostics.Tools": "4.0.0",
         "System.Diagnostics.Contracts": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
-    "net46":{
+    "net46": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
     }
   }
diff --git a/src/System.ObjectModel/ref/4.0.0/System.ObjectModel.depproj b/src/System.ObjectModel/ref/4.0.0/System.ObjectModel.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.ObjectModel/ref/4.0.0/System.ObjectModel.depproj
+++ b/src/System.ObjectModel/ref/4.0.0/System.ObjectModel.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.ObjectModel/ref/4.0.0/project.json b/src/System.ObjectModel/ref/4.0.0/project.json
index db5e78456c..7092382dfd 100644
--- a/src/System.ObjectModel/ref/4.0.0/project.json
+++ b/src/System.ObjectModel/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.ObjectModel": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ObjectModel/ref/4.0.10/System.ObjectModel.depproj b/src/System.ObjectModel/ref/4.0.10/System.ObjectModel.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.ObjectModel/ref/4.0.10/System.ObjectModel.depproj
+++ b/src/System.ObjectModel/ref/4.0.10/System.ObjectModel.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.ObjectModel/ref/4.0.10/project.json b/src/System.ObjectModel/ref/4.0.10/project.json
index d4703689b9..ad89b2601c 100644
--- a/src/System.ObjectModel/ref/4.0.10/project.json
+++ b/src/System.ObjectModel/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.ObjectModel": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ObjectModel/ref/System.ObjectModel.csproj b/src/System.ObjectModel/ref/System.ObjectModel.csproj
index 73068f2c5d..6fe13746cb 100644
--- a/src/System.ObjectModel/ref/System.ObjectModel.csproj
+++ b/src/System.ObjectModel/ref/System.ObjectModel.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.12.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ObjectModel.cs" />
diff --git a/src/System.ObjectModel/ref/project.json b/src/System.ObjectModel/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.ObjectModel/ref/project.json
+++ b/src/System.ObjectModel/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.ObjectModel/src/System.ObjectModel.csproj b/src/System.ObjectModel/src/System.ObjectModel.csproj
index d7098dbd6c..09c7dcae3e 100644
--- a/src/System.ObjectModel/src/System.ObjectModel.csproj
+++ b/src/System.ObjectModel/src/System.ObjectModel.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Private.Uri/src/System.Private.Uri.csproj b/src/System.Private.Uri/src/System.Private.Uri.csproj
index 3a2787f8f4..7cbc640feb 100644
--- a/src/System.Private.Uri/src/System.Private.Uri.csproj
+++ b/src/System.Private.Uri/src/System.Private.Uri.csproj
@@ -12,9 +12,9 @@
     <DefineConstants>$(DefineConstants);INTERNAL_GLOBALIZATION_EXTENSIONS</DefineConstants>
     <!-- Suppress warnings for type conflicts between SafeFileHandle in partial facade and mscorlib -->
     <NoWarn>0436</NoWarn>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.1</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.0</PackageTargetFramework>
     <SkipCommonResourcesIncludes Condition="'$(TargetGroup)'=='netcore50aot'">true</SkipCommonResourcesIncludes>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'"/>
diff --git a/src/System.Private.Uri/src/project.json b/src/System.Private.Uri/src/project.json
index 04e8fcb499..72ca7ee9a5 100644
--- a/src/System.Private.Uri/src/project.json
+++ b/src/System.Private.Uri/src/project.json
@@ -1,9 +1,12 @@
 {
   "frameworks": {
-    "dotnet5.1": {
+    "netstandard1.0": {
       "dependencies": {
         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.1"
+      ]
     },
     "netcore50": {
       "dependencies": {
@@ -11,4 +14,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/System.Reflection.Context/ref/System.Reflection.Context.csproj
index 9134cee789..d543bf56c2 100644
--- a/src/System.Reflection.Context/ref/System.Reflection.Context.csproj
+++ b/src/System.Reflection.Context/ref/System.Reflection.Context.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Context.cs" />
diff --git a/src/System.Reflection.Context/ref/project.json b/src/System.Reflection.Context/ref/project.json
index 1894f66c85..9b9afbdee9 100644
--- a/src/System.Reflection.Context/ref/project.json
+++ b/src/System.Reflection.Context/ref/project.json
@@ -5,6 +5,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Context/src/System.Reflection.Context.csproj b/src/System.Reflection.Context/src/System.Reflection.Context.csproj
index e7acbcc252..2def4132b3 100644
--- a/src/System.Reflection.Context/src/System.Reflection.Context.csproj
+++ b/src/System.Reflection.Context/src/System.Reflection.Context.csproj
@@ -8,8 +8,8 @@
     <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.2</PackageTargetFramework> 
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.1</PackageTargetFramework> 
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
     <ProjectGuid>{404DB891-B5AF-41E6-B89D-29E3F4573C4F}</ProjectGuid>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
diff --git a/src/System.Reflection.Context/src/project.json b/src/System.Reflection.Context/src/project.json
index 1894f66c85..9b9afbdee9 100644
--- a/src/System.Reflection.Context/src/project.json
+++ b/src/System.Reflection.Context/src/project.json
@@ -5,6 +5,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
index 27d2e34e82..041cdea14f 100644
--- a/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
+++ b/src/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <ProjectGuid>{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}</ProjectGuid>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.DispatchProxy.cs" />
diff --git a/src/System.Reflection.DispatchProxy/ref/project.json b/src/System.Reflection.DispatchProxy/ref/project.json
index 5bc9a235a1..318af9a9fc 100644
--- a/src/System.Reflection.DispatchProxy/ref/project.json
+++ b/src/System.Reflection.DispatchProxy/ref/project.json
@@ -5,6 +5,10 @@
     "System.Reflection": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
index 718217d84d..c579eaa35d 100644
--- a/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
+++ b/src/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netcore50aot'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netcore50aot'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj b/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
index 6e18711f20..b3871dbe40 100644
--- a/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
+++ b/src/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Emit.ILGeneration.cs" />
diff --git a/src/System.Reflection.Emit.ILGeneration/ref/project.json b/src/System.Reflection.Emit.ILGeneration/ref/project.json
index d0c5ada292..57cd4fa70b 100644
--- a/src/System.Reflection.Emit.ILGeneration/ref/project.json
+++ b/src/System.Reflection.Emit.ILGeneration/ref/project.json
@@ -5,6 +5,10 @@
     "System.Reflection.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj b/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
index 714b241f16..3a42cbef59 100644
--- a/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
+++ b/src/System.Reflection.Emit.ILGeneration/src/System.Reflection.Emit.ILGeneration.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Reflection.Emit.ILGeneration</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj b/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
index 658f8418f5..8736ed2f75 100644
--- a/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
+++ b/src/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Emit.Lightweight.cs" />
diff --git a/src/System.Reflection.Emit.Lightweight/ref/project.json b/src/System.Reflection.Emit.Lightweight/ref/project.json
index fd67ba4d9c..6a5dfd1acc 100644
--- a/src/System.Reflection.Emit.Lightweight/ref/project.json
+++ b/src/System.Reflection.Emit.Lightweight/ref/project.json
@@ -6,6 +6,10 @@
     "System.Reflection.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj b/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
index 4a5572cfda..8bb05bfd97 100644
--- a/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
+++ b/src/System.Reflection.Emit.Lightweight/src/System.Reflection.Emit.Lightweight.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Reflection.Emit.Lightweight</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj b/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
index d7ce9c0523..f25da351fd 100644
--- a/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
+++ b/src/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Emit.cs" />
diff --git a/src/System.Reflection.Emit/ref/project.json b/src/System.Reflection.Emit/ref/project.json
index 939931c280..d3b0c4a9ee 100644
--- a/src/System.Reflection.Emit/ref/project.json
+++ b/src/System.Reflection.Emit/ref/project.json
@@ -7,6 +7,10 @@
     "System.Reflection.Emit.ILGeneration": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Extensions/ref/4.0.0/System.Reflection.Extensions.depproj b/src/System.Reflection.Extensions/ref/4.0.0/System.Reflection.Extensions.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Reflection.Extensions/ref/4.0.0/System.Reflection.Extensions.depproj
+++ b/src/System.Reflection.Extensions/ref/4.0.0/System.Reflection.Extensions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Reflection.Extensions/ref/4.0.0/project.json b/src/System.Reflection.Extensions/ref/4.0.0/project.json
index 6e4cc16cfd..3ad5998fae 100644
--- a/src/System.Reflection.Extensions/ref/4.0.0/project.json
+++ b/src/System.Reflection.Extensions/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Reflection.Extensions": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
index 65ee851302..d50886f7cc 100644
--- a/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
+++ b/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Extensions.cs" />
diff --git a/src/System.Reflection.Extensions/ref/project.json b/src/System.Reflection.Extensions/ref/project.json
index d0c5ada292..57cd4fa70b 100644
--- a/src/System.Reflection.Extensions/ref/project.json
+++ b/src/System.Reflection.Extensions/ref/project.json
@@ -5,6 +5,10 @@
     "System.Reflection.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
index 679eb2d3cf..3bddc59543 100644
--- a/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
+++ b/src/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Reflection.Extensions</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
index be91eecd44..94bf5802df 100644
--- a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
+++ b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -15,8 +15,8 @@
     <DefineConstants>$(DefineConstants);SRM</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageDestination Include="lib/dotnet5.2">
-      <TargetFramework>dotnet5.2</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.1">
+      <TargetFramework>netstandard1.1</TargetFramework>
     </PackageDestination>
     <!-- Support targets that were supported in previous package versions -->
     <PackageDestination Include="lib/portable-net45+win8">
diff --git a/src/System.Reflection.Primitives/ref/4.0.0/System.Reflection.Primitives.depproj b/src/System.Reflection.Primitives/ref/4.0.0/System.Reflection.Primitives.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Reflection.Primitives/ref/4.0.0/System.Reflection.Primitives.depproj
+++ b/src/System.Reflection.Primitives/ref/4.0.0/System.Reflection.Primitives.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Reflection.Primitives/ref/4.0.0/project.json b/src/System.Reflection.Primitives/ref/4.0.0/project.json
index e00bf0a144..ebc5555908 100644
--- a/src/System.Reflection.Primitives/ref/4.0.0/project.json
+++ b/src/System.Reflection.Primitives/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Reflection.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
index 8700f699cc..191e42d5e9 100644
--- a/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
+++ b/src/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.Primitives.cs" />
diff --git a/src/System.Reflection.Primitives/ref/project.json b/src/System.Reflection.Primitives/ref/project.json
index 03ac86ceb8..b60f939a11 100644
--- a/src/System.Reflection.Primitives/ref/project.json
+++ b/src/System.Reflection.Primitives/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
index bbfb1cf17b..d9bc227dde 100644
--- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
+++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
@@ -5,8 +5,8 @@
     <AssemblyName>System.Reflection.Primitives</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'!='netcore50'">true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Reflection.Primitives/src/project.json b/src/System.Reflection.Primitives/src/project.json
index 3574830d9d..af13f9aacc 100644
--- a/src/System.Reflection.Primitives/src/project.json
+++ b/src/System.Reflection.Primitives/src/project.json
@@ -1,10 +1,13 @@
 {
   "frameworks": {
-    "dotnet5.1": {
+    "netstandard1.0": {
       "dependencies": {
         "Microsoft.NETCore.Platforms": "1.0.1-rc3-23818",
         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.1"
+      ]
     },
     "netcore50": {
       "dependencies": {
@@ -20,4 +23,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Reflection.TypeExtensions/ref/4.0.0/System.Reflection.TypeExtensions.depproj b/src/System.Reflection.TypeExtensions/ref/4.0.0/System.Reflection.TypeExtensions.depproj
index d989b45789..936df44f24 100644
--- a/src/System.Reflection.TypeExtensions/ref/4.0.0/System.Reflection.TypeExtensions.depproj
+++ b/src/System.Reflection.TypeExtensions/ref/4.0.0/System.Reflection.TypeExtensions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Reflection.TypeExtensions/ref/4.0.0/project.json b/src/System.Reflection.TypeExtensions/ref/4.0.0/project.json
index f2857169eb..3dedb3a2dc 100644
--- a/src/System.Reflection.TypeExtensions/ref/4.0.0/project.json
+++ b/src/System.Reflection.TypeExtensions/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Reflection.TypeExtensions": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
index 8a83cea4c7..c1fb8c3ab8 100644
--- a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
+++ b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.TypeExtensions.cs" />
diff --git a/src/System.Reflection.TypeExtensions/ref/project.json b/src/System.Reflection.TypeExtensions/ref/project.json
index dc0bff3398..ab88dcac71 100644
--- a/src/System.Reflection.TypeExtensions/ref/project.json
+++ b/src/System.Reflection.TypeExtensions/ref/project.json
@@ -5,6 +5,10 @@
     "System.Reflection.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
index e8792836a0..287c20629e 100644
--- a/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
+++ b/src/System.Reflection.TypeExtensions/src/System.Reflection.TypeExtensions.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,7 +7,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' != 'netcore50aot'">true</IsPartialFacadeAssembly>
     <NuGetTargetFrameworkMoniker>DNXCore,Version=v5.0</NuGetTargetFrameworkMoniker>
     <ProjectGuid>{1E689C1B-690C-4799-BDE9-6E7990585894}</ProjectGuid>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Reflection/ref/4.0.0/System.Reflection.depproj b/src/System.Reflection/ref/4.0.0/System.Reflection.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Reflection/ref/4.0.0/System.Reflection.depproj
+++ b/src/System.Reflection/ref/4.0.0/System.Reflection.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Reflection/ref/4.0.0/project.json b/src/System.Reflection/ref/4.0.0/project.json
index 90e5ca367b..a436aa30d4 100644
--- a/src/System.Reflection/ref/4.0.0/project.json
+++ b/src/System.Reflection/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Reflection": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection/ref/4.0.10/System.Reflection.depproj b/src/System.Reflection/ref/4.0.10/System.Reflection.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.Reflection/ref/4.0.10/System.Reflection.depproj
+++ b/src/System.Reflection/ref/4.0.10/System.Reflection.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Reflection/ref/4.0.10/project.json b/src/System.Reflection/ref/4.0.10/project.json
index fc268da808..7ba35d9583 100644
--- a/src/System.Reflection/ref/4.0.10/project.json
+++ b/src/System.Reflection/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Reflection": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection/ref/System.Reflection.csproj b/src/System.Reflection/ref/System.Reflection.csproj
index f74cbf63e1..e63a361dfc 100644
--- a/src/System.Reflection/ref/System.Reflection.csproj
+++ b/src/System.Reflection/ref/System.Reflection.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Reflection.cs" />
diff --git a/src/System.Reflection/ref/project.json b/src/System.Reflection/ref/project.json
index 5c1dc01583..54648b8440 100644
--- a/src/System.Reflection/ref/project.json
+++ b/src/System.Reflection/ref/project.json
@@ -5,6 +5,10 @@
     "System.Reflection.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Reflection/src/System.Reflection.csproj b/src/System.Reflection/src/System.Reflection.csproj
index 536da83136..c83e14b0d4 100644
--- a/src/System.Reflection/src/System.Reflection.csproj
+++ b/src/System.Reflection/src/System.Reflection.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Reflection</AssemblyName>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Resources.Reader/ref/System.Resources.Reader.csproj b/src/System.Resources.Reader/ref/System.Resources.Reader.csproj
index 7119b8542b..b21147c865 100644
--- a/src/System.Resources.Reader/ref/System.Resources.Reader.csproj
+++ b/src/System.Resources.Reader/ref/System.Resources.Reader.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Resources.Reader.cs" />
diff --git a/src/System.Resources.Reader/ref/project.json b/src/System.Resources.Reader/ref/project.json
index 5d5964f9e1..7a31f10a4d 100644
--- a/src/System.Resources.Reader/ref/project.json
+++ b/src/System.Resources.Reader/ref/project.json
@@ -4,6 +4,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Resources.Reader/src/System.Resources.Reader.csproj b/src/System.Resources.Reader/src/System.Resources.Reader.csproj
index f855d37644..28341e8a45 100644
--- a/src/System.Resources.Reader/src/System.Resources.Reader.csproj
+++ b/src/System.Resources.Reader/src/System.Resources.Reader.csproj
@@ -7,7 +7,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <RootNamespace>System.Resources</RootNamespace>
     <ProjectGuid>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</ProjectGuid>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/System.Resources.ReaderWriter/ref/System.Resources.ReaderWriter.csproj b/src/System.Resources.ReaderWriter/ref/System.Resources.ReaderWriter.csproj
index e7541b717b..a34a6e322e 100644
--- a/src/System.Resources.ReaderWriter/ref/System.Resources.ReaderWriter.csproj
+++ b/src/System.Resources.ReaderWriter/ref/System.Resources.ReaderWriter.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Resources.ReaderWriter.cs" />
diff --git a/src/System.Resources.ReaderWriter/ref/project.json b/src/System.Resources.ReaderWriter/ref/project.json
index 5d5964f9e1..7a31f10a4d 100644
--- a/src/System.Resources.ReaderWriter/ref/project.json
+++ b/src/System.Resources.ReaderWriter/ref/project.json
@@ -4,6 +4,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Resources.ResourceManager/ref/4.0.0/System.Resources.ResourceManager.depproj b/src/System.Resources.ResourceManager/ref/4.0.0/System.Resources.ResourceManager.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Resources.ResourceManager/ref/4.0.0/System.Resources.ResourceManager.depproj
+++ b/src/System.Resources.ResourceManager/ref/4.0.0/System.Resources.ResourceManager.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Resources.ResourceManager/ref/4.0.0/project.json b/src/System.Resources.ResourceManager/ref/4.0.0/project.json
index 6f4adefec3..dc13fea3fb 100644
--- a/src/System.Resources.ResourceManager/ref/4.0.0/project.json
+++ b/src/System.Resources.ResourceManager/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Resources.ResourceManager": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
index fef7f363f4..82ad8622b1 100644
--- a/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
+++ b/src/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Resources.ResourceManager.cs" />
diff --git a/src/System.Resources.ResourceManager/ref/project.json b/src/System.Resources.ResourceManager/ref/project.json
index f572700cc5..48306b09d0 100644
--- a/src/System.Resources.ResourceManager/ref/project.json
+++ b/src/System.Resources.ResourceManager/ref/project.json
@@ -5,6 +5,10 @@
     "System.Globalization": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
index f838dbac9c..4d54edb966 100644
--- a/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
+++ b/src/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
@@ -8,7 +8,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' != 'netcore50aot'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != 'netcore50aot'">None</ResourcesSourceOutputDirectory>
     <SkipCommonResourcesIncludes Condition="'$(TargetGroup)'=='netcore50aot'">true</SkipCommonResourcesIncludes>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.1</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.0</PackageTargetFramework> 
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Resources.Writer/ref/System.Resources.Writer.csproj b/src/System.Resources.Writer/ref/System.Resources.Writer.csproj
index 69c652a75f..30e13f626b 100644
--- a/src/System.Resources.Writer/ref/System.Resources.Writer.csproj
+++ b/src/System.Resources.Writer/ref/System.Resources.Writer.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Resources.Writer.cs" />
diff --git a/src/System.Resources.Writer/ref/project.json b/src/System.Resources.Writer/ref/project.json
index 5d5964f9e1..7a31f10a4d 100644
--- a/src/System.Resources.Writer/ref/project.json
+++ b/src/System.Resources.Writer/ref/project.json
@@ -4,6 +4,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Resources.Writer/src/System.Resources.Writer.csproj b/src/System.Resources.Writer/src/System.Resources.Writer.csproj
index 6ed4c6e382..db093e02a5 100644
--- a/src/System.Resources.Writer/src/System.Resources.Writer.csproj
+++ b/src/System.Resources.Writer/src/System.Resources.Writer.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.Resources.Writer</AssemblyName>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <RootNamespace>System.Resources</RootNamespace>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj b/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
index 10f6a3de60..84aabb32c7 100644
--- a/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
+++ b/src/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.CompilerServices.VisualC.cs" />
diff --git a/src/System.Runtime.CompilerServices.VisualC/ref/project.json b/src/System.Runtime.CompilerServices.VisualC/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Runtime.CompilerServices.VisualC/ref/project.json
+++ b/src/System.Runtime.CompilerServices.VisualC/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/ref/4.0.0/System.Runtime.Extensions.depproj b/src/System.Runtime.Extensions/ref/4.0.0/System.Runtime.Extensions.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Runtime.Extensions/ref/4.0.0/System.Runtime.Extensions.depproj
+++ b/src/System.Runtime.Extensions/ref/4.0.0/System.Runtime.Extensions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime.Extensions/ref/4.0.0/project.json b/src/System.Runtime.Extensions/ref/4.0.0/project.json
index d260eb60b9..c21a47312f 100644
--- a/src/System.Runtime.Extensions/ref/4.0.0/project.json
+++ b/src/System.Runtime.Extensions/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Runtime.Extensions": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/ref/4.0.10/System.Runtime.Extensions.depproj b/src/System.Runtime.Extensions/ref/4.0.10/System.Runtime.Extensions.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.Runtime.Extensions/ref/4.0.10/System.Runtime.Extensions.depproj
+++ b/src/System.Runtime.Extensions/ref/4.0.10/System.Runtime.Extensions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime.Extensions/ref/4.0.10/project.json b/src/System.Runtime.Extensions/ref/4.0.10/project.json
index 7bf011cc67..64de3201cb 100644
--- a/src/System.Runtime.Extensions/ref/4.0.10/project.json
+++ b/src/System.Runtime.Extensions/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Runtime.Extensions": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
index d5406a300b..a7c1d0b4d9 100644
--- a/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
+++ b/src/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Extensions.cs" />
diff --git a/src/System.Runtime.Extensions/ref/project.json b/src/System.Runtime.Extensions/ref/project.json
index 27ea0deebe..d536f835dd 100644
--- a/src/System.Runtime.Extensions/ref/project.json
+++ b/src/System.Runtime.Extensions/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.20"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index a833bac0c0..bec26d0409 100644
--- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -14,7 +14,7 @@
     <NuGetTargetFrameworkMoniker>DNXCore,Version=v5.0</NuGetTargetFrameworkMoniker>
     <!-- System.IO.Path conflicts between type in partial facade and in mscorlib -->
     <NoWarn>0436</NoWarn>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'net46'">win7</PackageTargetRuntime >
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime >
   </PropertyGroup>
diff --git a/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
index e57ce7918f..851256c5d8 100644
--- a/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
+++ b/src/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Handles.cs" />
diff --git a/src/System.Runtime.Handles/ref/project.json b/src/System.Runtime.Handles/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Runtime.Handles/ref/project.json
+++ b/src/System.Runtime.Handles/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj
index e682aa111f..c679fcd0eb 100644
--- a/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj
+++ b/src/System.Runtime.Handles/src/System.Runtime.Handles.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.Runtime.Handles</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Runtime.InteropServices.PInvoke/ref/System.Runtime.InteropServices.PInvoke.csproj b/src/System.Runtime.InteropServices.PInvoke/ref/System.Runtime.InteropServices.PInvoke.csproj
index a406bc595e..48da4168c1 100644
--- a/src/System.Runtime.InteropServices.PInvoke/ref/System.Runtime.InteropServices.PInvoke.csproj
+++ b/src/System.Runtime.InteropServices.PInvoke/ref/System.Runtime.InteropServices.PInvoke.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,8 +8,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.InteropServices.PInvoke.cs" />
diff --git a/src/System.Runtime.InteropServices.PInvoke/ref/project.json b/src/System.Runtime.InteropServices.PInvoke/ref/project.json
index c27d02275a..82775a7ca5 100644
--- a/src/System.Runtime.InteropServices.PInvoke/ref/project.json
+++ b/src/System.Runtime.InteropServices.PInvoke/ref/project.json
@@ -6,6 +6,10 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices.PInvoke/src/System.Runtime.InteropServices.PInvoke.csproj b/src/System.Runtime.InteropServices.PInvoke/src/System.Runtime.InteropServices.PInvoke.csproj
index 137c7ee1c6..2b07968a19 100644
--- a/src/System.Runtime.InteropServices.PInvoke/src/System.Runtime.InteropServices.PInvoke.csproj
+++ b/src/System.Runtime.InteropServices.PInvoke/src/System.Runtime.InteropServices.PInvoke.csproj
@@ -9,7 +9,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <!-- Force string resources to be excluded for full facades. -->
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
index 32627b1b47..79d7208de9 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.InteropServices.RuntimeInformation.cs" />
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/ref/project.json b/src/System.Runtime.InteropServices.RuntimeInformation/ref/project.json
index 8d808f21f4..d27e26db76 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/ref/project.json
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
index d4b4d9332c..5136e27540 100644
--- a/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>System.Runtime.InteropServices.RuntimeInformation</AssemblyName>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <ProjectGuid>{F9DF2357-81B4-4317-908E-512DA9395583}</ProjectGuid>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.2</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.1</PackageTargetFramework> 
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true'">win</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsLinux)' == 'true'">linux</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsOSX)' == 'true'">osx</PackageTargetRuntime> 
diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
index 346f632183..f5e9f99d4e 100644
--- a/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/src/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.InteropServices.WindowsRuntime.cs" />
diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/ref/project.json b/src/System.Runtime.InteropServices.WindowsRuntime/ref/project.json
index 03ac86ceb8..b60f939a11 100644
--- a/src/System.Runtime.InteropServices.WindowsRuntime/ref/project.json
+++ b/src/System.Runtime.InteropServices.WindowsRuntime/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
index 9594c9e413..5d0690f1f8 100644
--- a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>System.Runtime.InteropServices.WindowsRuntime</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
     <PackageTargetRuntime>win8</PackageTargetRuntime>
   </PropertyGroup>
 
diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json b/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json
index 44bda8d4cf..e4b5290d90 100644
--- a/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json
+++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json
@@ -1,9 +1,12 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
     "netcore50": {
       "dependencies": {
@@ -16,4 +19,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj
index bcd5a848db..29f2b6abda 100644
--- a/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj
+++ b/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime.InteropServices/ref/4.0.0/project.json b/src/System.Runtime.InteropServices/ref/4.0.0/project.json
index 6ccf0a7bfa..99463c6867 100644
--- a/src/System.Runtime.InteropServices/ref/4.0.0/project.json
+++ b/src/System.Runtime.InteropServices/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Runtime.InteropServices": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj
index b14d7e6c03..7aa0e70c3a 100644
--- a/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj
+++ b/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.2</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime.InteropServices/ref/4.0.10/project.json b/src/System.Runtime.InteropServices/ref/4.0.10/project.json
index 9ce4ffd2bd..991e3db1d6 100644
--- a/src/System.Runtime.InteropServices/ref/4.0.10/project.json
+++ b/src/System.Runtime.InteropServices/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Runtime.InteropServices": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.3": {}
+    "netstandard1.2": {
+      "imports": [
+        "dotnet5.3"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
index 6ee0de06ac..6f34dbd111 100644
--- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
+++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,8 +8,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
     <ProjectGuid>{B17014F1-D902-417F-89B0-271204695831}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/System.Runtime.InteropServices/ref/project.json b/src/System.Runtime.InteropServices/ref/project.json
index c27d02275a..82775a7ca5 100644
--- a/src/System.Runtime.InteropServices/ref/project.json
+++ b/src/System.Runtime.InteropServices/ref/project.json
@@ -6,6 +6,10 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
index 63381ddb62..56cd85bad6 100644
--- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
+++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
@@ -9,7 +9,7 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <!-- Force string resources to be excluded for full facades. -->
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj b/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
index e3de1a8f27..5bb6b58e5f 100644
--- a/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
+++ b/src/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework>dotnet5.6</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.6</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Loader.cs" />
diff --git a/src/System.Runtime.Loader/ref/project.json b/src/System.Runtime.Loader/ref/project.json
index 88be445d74..46da918c57 100644
--- a/src/System.Runtime.Loader/ref/project.json
+++ b/src/System.Runtime.Loader/ref/project.json
@@ -6,6 +6,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.6": {}
+    "netstandard1.5": {
+      "imports": [
+        "dotnet5.6"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj b/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
index 1529bfde8e..24e850d6de 100644
--- a/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
+++ b/src/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Numerics.cs" />
diff --git a/src/System.Runtime.Numerics/ref/project.json b/src/System.Runtime.Numerics/ref/project.json
index 8d808f21f4..d27e26db76 100644
--- a/src/System.Runtime.Numerics/ref/project.json
+++ b/src/System.Runtime.Numerics/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj
index 61cb97006e..684ac26778 100644
--- a/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj
+++ b/src/System.Runtime.Numerics/src/System.Runtime.Numerics.csproj
@@ -10,7 +10,7 @@
     <ProjectGuid>{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}</ProjectGuid>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj b/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
index 06bc424520..888081fa93 100644
--- a/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
+++ b/src/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Json.cs" />
diff --git a/src/System.Runtime.Serialization.Json/ref/project.json b/src/System.Runtime.Serialization.Json/ref/project.json
index d19e8d0044..0d09048183 100644
--- a/src/System.Runtime.Serialization.Json/ref/project.json
+++ b/src/System.Runtime.Serialization.Json/ref/project.json
@@ -4,6 +4,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Serialization.Primitives/ref/4.0.0/System.Runtime.Serialization.Primitives.depproj b/src/System.Runtime.Serialization.Primitives/ref/4.0.0/System.Runtime.Serialization.Primitives.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Runtime.Serialization.Primitives/ref/4.0.0/System.Runtime.Serialization.Primitives.depproj
+++ b/src/System.Runtime.Serialization.Primitives/ref/4.0.0/System.Runtime.Serialization.Primitives.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime.Serialization.Primitives/ref/4.0.0/project.json b/src/System.Runtime.Serialization.Primitives/ref/4.0.0/project.json
index 02feaa7ddf..533a6ebaec 100644
--- a/src/System.Runtime.Serialization.Primitives/ref/4.0.0/project.json
+++ b/src/System.Runtime.Serialization.Primitives/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Runtime.Serialization.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
index 8abbec386b..dc6724c99e 100644
--- a/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
+++ b/src/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Primitives.cs" />
diff --git a/src/System.Runtime.Serialization.Primitives/ref/project.json b/src/System.Runtime.Serialization.Primitives/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Runtime.Serialization.Primitives/ref/project.json
+++ b/src/System.Runtime.Serialization.Primitives/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
index e3fc14cbc8..1cfdc810b2 100644
--- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
+++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
@@ -10,9 +10,9 @@
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ProjectGuid>{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}</ProjectGuid>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Runtime.Serialization.Primitives/src/project.json b/src/System.Runtime.Serialization.Primitives/src/project.json
index b4e9286624..6ec519057a 100644
--- a/src/System.Runtime.Serialization.Primitives/src/project.json
+++ b/src/System.Runtime.Serialization.Primitives/src/project.json
@@ -1,11 +1,14 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Runtime": "4.0.20",
         "System.Resources.ResourceManager": "4.0.0",
         "System.Threading.Tasks": "4.0.10"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
     "netcore50": {
       "dependencies": {
@@ -21,4 +24,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Runtime.Serialization.Xml/ref/4.0.0/System.Runtime.Serialization.Xml.depproj b/src/System.Runtime.Serialization.Xml/ref/4.0.0/System.Runtime.Serialization.Xml.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Runtime.Serialization.Xml/ref/4.0.0/System.Runtime.Serialization.Xml.depproj
+++ b/src/System.Runtime.Serialization.Xml/ref/4.0.0/System.Runtime.Serialization.Xml.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime.Serialization.Xml/ref/4.0.0/project.json b/src/System.Runtime.Serialization.Xml/ref/4.0.0/project.json
index ff322e5c70..53e797dfef 100644
--- a/src/System.Runtime.Serialization.Xml/ref/4.0.0/project.json
+++ b/src/System.Runtime.Serialization.Xml/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Runtime.Serialization.Xml": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj b/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
index 91ea04dc4e..232b38d367 100644
--- a/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
+++ b/src/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.Serialization.Xml.cs" />
diff --git a/src/System.Runtime.Serialization.Xml/ref/project.json b/src/System.Runtime.Serialization.Xml/ref/project.json
index 49054d2b6b..b46651e5bc 100644
--- a/src/System.Runtime.Serialization.Xml/ref/project.json
+++ b/src/System.Runtime.Serialization.Xml/ref/project.json
@@ -7,6 +7,10 @@
     "System.Text.Encoding": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Runtime.Serialization.Xml/src/project.json b/src/System.Runtime.Serialization.Xml/src/project.json
index 25fc523228..5fa276e37e 100644
--- a/src/System.Runtime.Serialization.Xml/src/project.json
+++ b/src/System.Runtime.Serialization.Xml/src/project.json
@@ -1,9 +1,12 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
     "netcore50": {
       "dependencies": {
@@ -16,4 +19,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
index fbb1b5a7a0..40ce6838b7 100644
--- a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
+++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.WindowsRuntime.UI.Xaml.cs" />
diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/project.json b/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/project.json
index 42d1a012e6..7d6e68116f 100644
--- a/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/project.json
+++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/ref/project.json
@@ -4,6 +4,10 @@
     "System.Runtime.WindowsRuntime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
index c0d0a85182..61b9f6f0b7 100644
--- a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
+++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -6,7 +6,7 @@
     <ProjectGuid>{263DA4F1-C3BC-4B43-98E7-9F38B419A131}</ProjectGuid>
     <UseECMAKey Condition="'$(UseECMAKey)' == ''">true</UseECMAKey>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime>win8</PackageTargetRuntime>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
diff --git a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/project.json b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/project.json
index ae3e677d98..269ec72920 100644
--- a/src/System.Runtime.WindowsRuntime.UI.Xaml/src/project.json
+++ b/src/System.Runtime.WindowsRuntime.UI.Xaml/src/project.json
@@ -1,13 +1,16 @@
 {
   "frameworks": {
-    "dotnet5.3":{
+    "netstandard1.2": {
       "dependencies": {
-        "System.Globalization":"4.0.0.0",
-        "System.Resources.ResourceManager":"4.0.0.0",
-        "System.Runtime":"4.0.0.0",
-        "System.Runtime.Extensions":"4.0.0.0",
-        "System.Runtime.WindowsRuntime":"4.0.0.0"
-      }
+        "System.Globalization": "4.0.0.0",
+        "System.Resources.ResourceManager": "4.0.0.0",
+        "System.Runtime": "4.0.0.0",
+        "System.Runtime.Extensions": "4.0.0.0",
+        "System.Runtime.WindowsRuntime": "4.0.0.0"
+      },
+      "imports": [
+        "dotnet5.3"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj b/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj
+++ b/src/System.Runtime.WindowsRuntime/ref/4.0.0/System.Runtime.WindowsRuntime.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json b/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json
index 28a49604ee..db30218429 100644
--- a/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json
+++ b/src/System.Runtime.WindowsRuntime/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Runtime.WindowsRuntime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index 7304e6c666..a2ea5c943a 100644
--- a/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -15,8 +15,8 @@
     <NoWarn>1698</NoWarn>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.2</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.WindowsRuntime.cs" />
diff --git a/src/System.Runtime.WindowsRuntime/ref/project.json b/src/System.Runtime.WindowsRuntime/ref/project.json
index e8d5545390..479f26e0f0 100644
--- a/src/System.Runtime.WindowsRuntime/ref/project.json
+++ b/src/System.Runtime.WindowsRuntime/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.3": {}
+    "netstandard1.2": {
+      "imports": [
+        "dotnet5.3"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 810c71feb5..1b6fa37290 100644
--- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -12,13 +12,13 @@
     <!-- CS1698 - Disable warning about reference to 4.0.0.0 System.Runtime.WindowsRuntime having same simple name as target assembly -->
     <NoWarn>$(NoWarn)1698</NoWarn>
     <ProjectGuid>{844A2A0B-4169-49C3-B367-AFDC4894E487}</ProjectGuid>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
     <PackageTargetRuntime>win8</PackageTargetRuntime>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetGroup)'==''">
-    <DefineConstants>$(DefineConstants);dotnet53;FEATURE_APPX</DefineConstants>
+    <DefineConstants>$(DefineConstants);netstandard;FEATURE_APPX</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
@@ -38,12 +38,12 @@
     <ProjectReference Include="..\..\System.Private.Uri\src\System.Private.Uri.csproj" />
     <ProjectReference Include="..\..\System.Runtime.InteropServices.WindowsRuntime\src\System.Runtime.InteropServices.WindowsRuntime.csproj" />
     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
-    <Compile Include="System\IO\StreamOperationAsyncResult.dotnet53.cs" />
+    <Compile Include="System\IO\StreamOperationAsyncResult.netstandard.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\MarshalingHelpers.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\RestrictedErrorInfoHelper.cs" />
-    <Compile Include="System\Threading\Tasks\AsyncInfoToTaskBridge.dotnet53.cs" />
+    <Compile Include="System\Threading\Tasks\AsyncInfoToTaskBridge.netstandard.cs" />
     <Compile Include="System\Threading\WindowsRuntimeSynchronizationContext.cs" />
-    <Compile Include="System\WindowsRuntimeSystemExtensions.dotnet53.cs" />
+    <Compile Include="System\WindowsRuntimeSystemExtensions.netstandard.cs" />
     <Compile Include="$(CommonPath)\Interop\Windows\mincore\Interop.GetRestrictedErrorInfo.cs">
       <Link>Common\Interop\Windows\mincore\Interop.GetRestrictedErrorInfo.cs</Link>
     </Compile>
diff --git a/src/System.Runtime.WindowsRuntime/src/System/IO/StreamOperationAsyncResult.dotnet53.cs b/src/System.Runtime.WindowsRuntime/src/System/IO/StreamOperationAsyncResult.netstandard.cs
index 59b483fee3..59b483fee3 100644
--- a/src/System.Runtime.WindowsRuntime/src/System/IO/StreamOperationAsyncResult.dotnet53.cs
+++ b/src/System.Runtime.WindowsRuntime/src/System/IO/StreamOperationAsyncResult.netstandard.cs
diff --git a/src/System.Runtime.WindowsRuntime/src/System/IO/WinRtToNetFxStreamAdapter.cs b/src/System.Runtime.WindowsRuntime/src/System/IO/WinRtToNetFxStreamAdapter.cs
index fb96dfe9db..d4a14882c1 100644
--- a/src/System.Runtime.WindowsRuntime/src/System/IO/WinRtToNetFxStreamAdapter.cs
+++ b/src/System.Runtime.WindowsRuntime/src/System/IO/WinRtToNetFxStreamAdapter.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -479,7 +479,7 @@ namespace System.IO
             return asyncResult;
         }
 
-#if dotnet53
+#if netstandard
         public override Int32 EndRead(IAsyncResult asyncResult)
 #else
         public Int32 EndRead(IAsyncResult asyncResult)
@@ -589,7 +589,7 @@ namespace System.IO
         #region Writing
 
 
-#if dotnet53
+#if netstandard
         public override IAsyncResult BeginWrite(Byte[] buffer, Int32 offset, Int32 count, AsyncCallback callback, Object state)
 #else
         public IAsyncResult BeginWrite(Byte[] buffer, Int32 offset, Int32 count, AsyncCallback callback, Object state)
@@ -640,7 +640,7 @@ namespace System.IO
             return asyncResult;
         }
 
-#if dotnet53
+#if netstandard
         public override void EndWrite(IAsyncResult asyncResult)
 #else
         public void EndWrite(IAsyncResult asyncResult)
diff --git a/src/System.Runtime.WindowsRuntime/src/System/Resources/WindowsRuntimeResourceManager.cs b/src/System.Runtime.WindowsRuntime/src/System/Resources/WindowsRuntimeResourceManager.cs
index ed92eac648..181e40ae70 100644
--- a/src/System.Runtime.WindowsRuntime/src/System/Resources/WindowsRuntimeResourceManager.cs
+++ b/src/System.Runtime.WindowsRuntime/src/System/Resources/WindowsRuntimeResourceManager.cs
@@ -248,7 +248,7 @@ namespace System.Resources
                    (libpath[packagepath.Length] == '\\' || packagepath.EndsWith("\\"));
         }
 
-#if dotnet53
+#if netstandard
         /* Returns true if libpath is path to an ni image and if the path contains packagename as a subfolder */
         private static bool LibpathContainsPackagename(String libpath, String packagename)
         {
@@ -280,7 +280,7 @@ namespace System.Resources
                 }
             }
 
-#if dotnet53
+#if netstandard
             /* On phone libpath is usually ni path and not IL path as we do not touch the IL on phone.
                On Phone NI images are no longer under package root. Due to this above logic fails to
                find the package to which the library belongs. We assume that NI paths usually have
@@ -338,7 +338,7 @@ namespace System.Resources
                 {
                     string packageSimpleName = FindPackageSimpleNameForFilename(libpath);
 
-#if dotnet53
+#if netstandard
                     // If we have found a simple package name for the assembly, lets make sure it is not *.resource.dll that
                     // an application may have packaged in its AppX. This is to enforce AppX apps to use PRI resources.
                     if (packageSimpleName != null)
@@ -351,7 +351,7 @@ namespace System.Resources
                             packageSimpleName = null;
                         }
                     }
-#endif //  dotnet53
+#endif //  netstandard
                     if (packageSimpleName != null)
                     {
                         ResourceMap packageResourceMap = null;
diff --git a/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.dotnet53.cs b/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.netstandard.cs
index b9ac3b815f..b9ac3b815f 100644
--- a/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.dotnet53.cs
+++ b/src/System.Runtime.WindowsRuntime/src/System/Threading/Tasks/AsyncInfoToTaskBridge.netstandard.cs
diff --git a/src/System.Runtime.WindowsRuntime/src/System/WindowsRuntimeSystemExtensions.dotnet53.cs b/src/System.Runtime.WindowsRuntime/src/System/WindowsRuntimeSystemExtensions.netstandard.cs
index 31da4c8440..31da4c8440 100644
--- a/src/System.Runtime.WindowsRuntime/src/System/WindowsRuntimeSystemExtensions.dotnet53.cs
+++ b/src/System.Runtime.WindowsRuntime/src/System/WindowsRuntimeSystemExtensions.netstandard.cs
diff --git a/src/System.Runtime.WindowsRuntime/src/project.json b/src/System.Runtime.WindowsRuntime/src/project.json
index 6732bd322b..a72086f771 100644
--- a/src/System.Runtime.WindowsRuntime/src/project.json
+++ b/src/System.Runtime.WindowsRuntime/src/project.json
@@ -1,10 +1,13 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23818",
         "Microsoft.TargetingPack.Private.WinRT": "1.0.1"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Runtime/ref/4.0.0/System.Runtime.depproj b/src/System.Runtime/ref/4.0.0/System.Runtime.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Runtime/ref/4.0.0/System.Runtime.depproj
+++ b/src/System.Runtime/ref/4.0.0/System.Runtime.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime/ref/4.0.0/project.json b/src/System.Runtime/ref/4.0.0/project.json
index 03ac86ceb8..b60f939a11 100644
--- a/src/System.Runtime/ref/4.0.0/project.json
+++ b/src/System.Runtime/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime/ref/4.0.10/System.Runtime.depproj b/src/System.Runtime/ref/4.0.10/System.Runtime.depproj
index b14d7e6c03..7aa0e70c3a 100644
--- a/src/System.Runtime/ref/4.0.10/System.Runtime.depproj
+++ b/src/System.Runtime/ref/4.0.10/System.Runtime.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.2</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime/ref/4.0.10/project.json b/src/System.Runtime/ref/4.0.10/project.json
index 7f9de11df0..985467a4eb 100644
--- a/src/System.Runtime/ref/4.0.10/project.json
+++ b/src/System.Runtime/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.3": {}
+    "netstandard1.2": {
+      "imports": [
+        "dotnet5.3"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime/ref/4.0.20/System.Runtime.depproj b/src/System.Runtime/ref/4.0.20/System.Runtime.depproj
index a679733fce..2c8e3437c1 100644
--- a/src/System.Runtime/ref/4.0.20/System.Runtime.depproj
+++ b/src/System.Runtime/ref/4.0.20/System.Runtime.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.20.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Runtime/ref/4.0.20/project.json b/src/System.Runtime/ref/4.0.20/project.json
index 27ea0deebe..d536f835dd 100644
--- a/src/System.Runtime/ref/4.0.20/project.json
+++ b/src/System.Runtime/ref/4.0.20/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.20"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime/ref/System.Runtime.csproj b/src/System.Runtime/ref/System.Runtime.csproj
index faf8adb4d2..240d741777 100644
--- a/src/System.Runtime/ref/System.Runtime.csproj
+++ b/src/System.Runtime/ref/System.Runtime.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -6,8 +6,8 @@
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
     <IsCoreAssembly>true</IsCoreAssembly>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.cs" />
diff --git a/src/System.Runtime/ref/project.json b/src/System.Runtime/ref/project.json
index f0bda9c7c6..4be1abc148 100644
--- a/src/System.Runtime/ref/project.json
+++ b/src/System.Runtime/ref/project.json
@@ -1,6 +1,10 @@
 {
   "dependencies": {},
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Runtime/src/System.Runtime.csproj b/src/System.Runtime/src/System.Runtime.csproj
index e9aa79f8bb..60770b8850 100644
--- a/src/System.Runtime/src/System.Runtime.csproj
+++ b/src/System.Runtime/src/System.Runtime.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.Runtime</AssemblyName>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
index a96d1e3e24..dfaf15c684 100644
--- a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
+++ b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.AccessControl.cs" />
diff --git a/src/System.Security.AccessControl/ref/project.json b/src/System.Security.AccessControl/ref/project.json
index fbecc50dab..dfbe93263b 100644
--- a/src/System.Security.AccessControl/ref/project.json
+++ b/src/System.Security.AccessControl/ref/project.json
@@ -5,6 +5,10 @@
     "System.Security.Principal.Windows": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj
index fc8832365b..898364ea63 100644
--- a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj
+++ b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'" >true</IsPartialFacadeAssembly>
     <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dnxcore50</PackageTargetFramework> 
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Security.AccessControl/src/project.json b/src/System.Security.AccessControl/src/project.json
index 63df060470..26c640c39e 100644
--- a/src/System.Security.AccessControl/src/project.json
+++ b/src/System.Security.AccessControl/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.0",
         "System.Diagnostics.Contracts": "4.0.0",
@@ -16,7 +16,10 @@
         "System.Reflection": "4.0.0",
         "System.Threading": "4.0.10",
         "System.Threading.Thread": "4.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
     "net46": {
       "dependencies": {
@@ -24,4 +27,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Claims/ref/System.Security.Claims.csproj b/src/System.Security.Claims/ref/System.Security.Claims.csproj
index 74e2f43c95..84f20e8510 100644
--- a/src/System.Security.Claims/ref/System.Security.Claims.csproj
+++ b/src/System.Security.Claims/ref/System.Security.Claims.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Claims.cs" />
diff --git a/src/System.Security.Claims/ref/project.json b/src/System.Security.Claims/ref/project.json
index e89ed53e22..881f3bee3f 100644
--- a/src/System.Security.Claims/ref/project.json
+++ b/src/System.Security.Claims/ref/project.json
@@ -5,6 +5,10 @@
     "System.Security.Principal": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Security.Claims/src/System.Security.Claims.csproj b/src/System.Security.Claims/src/System.Security.Claims.csproj
index 1b38bc72e9..a78344438a 100644
--- a/src/System.Security.Claims/src/System.Security.Claims.csproj
+++ b/src/System.Security.Claims/src/System.Security.Claims.csproj
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>System.Security.Claims</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <ProjectGuid>{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}</ProjectGuid>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Security.Claims/src/project.json b/src/System.Security.Claims/src/project.json
index d0771c10a0..5a7b0641db 100644
--- a/src/System.Security.Claims/src/project.json
+++ b/src/System.Security.Claims/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.0",
         "System.Diagnostics.Contracts": "4.0.0",
@@ -10,11 +10,14 @@
         "System.Runtime": "4.0.20",
         "System.Runtime.Extensions": "4.0.0",
         "System.Security.Principal": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
-    "net46":{
+    "net46": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
     }
   }
diff --git a/src/System.Security.Cryptography.Algorithms/pkg/unix/System.Security.Cryptography.Algorithms.pkgproj b/src/System.Security.Cryptography.Algorithms/pkg/unix/System.Security.Cryptography.Algorithms.pkgproj
index 1995e7aaeb..414f79a03a 100644
--- a/src/System.Security.Cryptography.Algorithms/pkg/unix/System.Security.Cryptography.Algorithms.pkgproj
+++ b/src/System.Security.Cryptography.Algorithms/pkg/unix/System.Security.Cryptography.Algorithms.pkgproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
@@ -16,7 +16,7 @@
   <!-- The runtime.native.System.Security.Cryptography package hasn't moved to open yet-->
   <ItemGroup>
     <_FilePackageReference Include="runtime.native.System.Security.Cryptography">
-      <TargetFramework>dotnet54</TargetFramework>
+      <TargetFramework>netstandard1.3</TargetFramework>
       <Version>4.0.0</Version>
     </_FilePackageReference>
   </ItemGroup>
diff --git a/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj b/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
index 2e1b4cddfb..79d7c0f3bf 100644
--- a/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
+++ b/src/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Algorithms.cs" />
diff --git a/src/System.Security.Cryptography.Algorithms/ref/project.json b/src/System.Security.Cryptography.Algorithms/ref/project.json
index a0824d5be2..3e162d5ba5 100644
--- a/src/System.Security.Cryptography.Algorithms/ref/project.json
+++ b/src/System.Security.Cryptography.Algorithms/ref/project.json
@@ -5,6 +5,10 @@
     "System.Security.Cryptography.Primitives": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
index d29dfa43eb..4b094425f0 100644
--- a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
+++ b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
@@ -14,12 +14,12 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLSCompliant>false</CLSCompliant>
     <DefineConstants>INTERNAL_ASYMMETRIC_IMPLEMENTATIONS</DefineConstants>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
     <PackageTargetRuntime Condition=" '$(TargetsWindows)' == 'true'">win7</PackageTargetRuntime>
     <PackageTargetRuntime Condition=" '$(TargetGroup)' == 'net46'"></PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Release|AnyCPU'" />
diff --git a/src/System.Security.Cryptography.Algorithms/src/project.json b/src/System.Security.Cryptography.Algorithms/src/project.json
index 6ac6fb6f9b..e999060cf6 100644
--- a/src/System.Security.Cryptography.Algorithms/src/project.json
+++ b/src/System.Security.Cryptography.Algorithms/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Diagnostics.Contracts": "4.0.0",
         "System.Diagnostics.Debug": "4.0.10",
@@ -11,7 +11,10 @@
         "System.Runtime.InteropServices": "4.0.20",
         "System.Security.Cryptography.Primitives": "4.0.0-rc3-23818",
         "System.Text.Encoding.Extensions": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
     "net46": {
       "dependencies": {
@@ -19,4 +22,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
index b1ceee324c..460ef358c9 100644
--- a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
+++ b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Cng.cs" />
diff --git a/src/System.Security.Cryptography.Cng/ref/project.json b/src/System.Security.Cryptography.Cng/ref/project.json
index 67eda8d259..6854e10288 100644
--- a/src/System.Security.Cryptography.Cng/ref/project.json
+++ b/src/System.Security.Cryptography.Cng/ref/project.json
@@ -7,6 +7,10 @@
     "System.Security.Cryptography.Primitives": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
index 379bb6ae2b..3c71ea68bd 100644
--- a/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
+++ b/src/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -10,7 +10,7 @@
     <CLSCompliant>false</CLSCompliant>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj b/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
index 870f365a8f..233135d082 100644
--- a/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
+++ b/src/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Csp.cs" />
diff --git a/src/System.Security.Cryptography.Csp/ref/project.json b/src/System.Security.Cryptography.Csp/ref/project.json
index 5b8e9dcefb..7f742526b1 100644
--- a/src/System.Security.Cryptography.Csp/ref/project.json
+++ b/src/System.Security.Cryptography.Csp/ref/project.json
@@ -6,6 +6,10 @@
     "System.Security.Cryptography.Primitives": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj b/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
index a4d9789b83..b07161258e 100644
--- a/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
+++ b/src/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Encoding.cs" />
diff --git a/src/System.Security.Cryptography.Encoding/ref/project.json b/src/System.Security.Cryptography.Encoding/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Security.Cryptography.Encoding/ref/project.json
+++ b/src/System.Security.Cryptography.Encoding/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
index 22c94e9c2b..2751b0cee0 100644
--- a/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
+++ b/src/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
@@ -12,7 +12,7 @@
     <CLSCompliant>false</CLSCompliant>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' == ''">win7</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime> 
   </PropertyGroup>
diff --git a/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/System.Security.Cryptography.Encryption.ECDiffieHellman.csproj b/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
index aeb5f09a0e..e51370fee9 100644
--- a/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
+++ b/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NugetTargetMoniker>.NETPlatform,Version=v5.4</NugetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Encryption.ECDiffieHellman.cs" />
diff --git a/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/project.json b/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/project.json
index 73ca19c16d..b373c8c675 100644
--- a/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/project.json
+++ b/src/System.Security.Cryptography.Encryption.ECDiffieHellman/ref/project.json
@@ -5,6 +5,10 @@
     "System.Security.Cryptography.Primitives": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Encryption.ECDsa/ref/System.Security.Cryptography.Encryption.ECDsa.csproj b/src/System.Security.Cryptography.Encryption.ECDsa/ref/System.Security.Cryptography.Encryption.ECDsa.csproj
index af065fa6f0..4cfc1b54ac 100644
--- a/src/System.Security.Cryptography.Encryption.ECDsa/ref/System.Security.Cryptography.Encryption.ECDsa.csproj
+++ b/src/System.Security.Cryptography.Encryption.ECDsa/ref/System.Security.Cryptography.Encryption.ECDsa.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NugetTargetMoniker>.NETPlatform,Version=v5.4</NugetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Encryption.ECDsa.cs" />
diff --git a/src/System.Security.Cryptography.Encryption.ECDsa/ref/project.json b/src/System.Security.Cryptography.Encryption.ECDsa/ref/project.json
index 73ca19c16d..b373c8c675 100644
--- a/src/System.Security.Cryptography.Encryption.ECDsa/ref/project.json
+++ b/src/System.Security.Cryptography.Encryption.ECDsa/ref/project.json
@@ -5,6 +5,10 @@
     "System.Security.Cryptography.Primitives": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
index 22e2d36c14..b5365fa593 100644
--- a/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
+++ b/src/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.OpenSsl.cs" />
diff --git a/src/System.Security.Cryptography.OpenSsl/ref/project.json b/src/System.Security.Cryptography.OpenSsl/ref/project.json
index 2398bbb6f5..994b627760 100644
--- a/src/System.Security.Cryptography.OpenSsl/ref/project.json
+++ b/src/System.Security.Cryptography.OpenSsl/ref/project.json
@@ -7,6 +7,10 @@
     "System.Security.Cryptography.Primitives": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
index 879ede0b10..bc30f00504 100644
--- a/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
+++ b/src/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
@@ -11,7 +11,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLSCompliant>false</CLSCompliant>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
     <!-- Temporarily remove the RID from this package until we have a  
          cross platform API to use RSA https://github.com/dotnet/corefx/issues/2953 -->  
     <!-- PackageTargetRuntime>unix</PackageTargetRuntime -->  
diff --git a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
index 97f567b07a..fb84642251 100644
--- a/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
+++ b/src/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.Primitives.cs" />
diff --git a/src/System.Security.Cryptography.Primitives/ref/project.json b/src/System.Security.Cryptography.Primitives/ref/project.json
index d987c40df5..6d9b7f338f 100644
--- a/src/System.Security.Cryptography.Primitives/ref/project.json
+++ b/src/System.Security.Cryptography.Primitives/ref/project.json
@@ -5,6 +5,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
index e3c29c8605..b8a2eb1224 100644
--- a/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
+++ b/src/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
@@ -7,7 +7,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
index 2043d04f19..fd7c1f6ab2 100644
--- a/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Cryptography.X509Certificates.cs" />
diff --git a/src/System.Security.Cryptography.X509Certificates/ref/project.json b/src/System.Security.Cryptography.X509Certificates/ref/project.json
index 40895f8ad1..c49d3c2712 100644
--- a/src/System.Security.Cryptography.X509Certificates/ref/project.json
+++ b/src/System.Security.Cryptography.X509Certificates/ref/project.json
@@ -8,6 +8,10 @@
     "System.Security.Cryptography.Encoding": "4.0.0-rc3-23818"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
index aaa08a610f..afa68aa8ac 100644
--- a/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
@@ -13,7 +13,7 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLSCompliant>false</CLSCompliant>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'net461'">win7</PackageTargetRuntime> 
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true' and '$(TargetGroup)' != 'net461'">unix</PackageTargetRuntime> 
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net461'">true</IsPartialFacadeAssembly>
diff --git a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
index 0e0050385e..bb1b374ab6 100644
--- a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
+++ b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Principal.Windows.cs" />
diff --git a/src/System.Security.Principal.Windows/ref/project.json b/src/System.Security.Principal.Windows/ref/project.json
index 796b738e3f..3f60ec73a6 100644
--- a/src/System.Security.Principal.Windows/ref/project.json
+++ b/src/System.Security.Principal.Windows/ref/project.json
@@ -6,6 +6,10 @@
     "System.Security.Principal": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
index 25830fa09c..96a9737f3f 100644
--- a/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
+++ b/src/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
@@ -11,7 +11,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <!-- Temporarily remove the RID from this package until nuget has a way for folks
          to consume platform-specific packages https://github.com/dotnet/corefx/issues/4925 -->
     <!-- PackageTargetRuntime>win7</PackageTargetRuntime -->
diff --git a/src/System.Security.Principal/ref/System.Security.Principal.csproj b/src/System.Security.Principal/ref/System.Security.Principal.csproj
index 70cbfcb534..af3a00c24c 100644
--- a/src/System.Security.Principal/ref/System.Security.Principal.csproj
+++ b/src/System.Security.Principal/ref/System.Security.Principal.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Security.Principal.cs" />
diff --git a/src/System.Security.Principal/ref/project.json b/src/System.Security.Principal/ref/project.json
index 03ac86ceb8..b60f939a11 100644
--- a/src/System.Security.Principal/ref/project.json
+++ b/src/System.Security.Principal/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Security.Principal/src/System.Security.Principal.csproj b/src/System.Security.Principal/src/System.Security.Principal.csproj
index f775e774b6..3fd016b1cb 100644
--- a/src/System.Security.Principal/src/System.Security.Principal.csproj
+++ b/src/System.Security.Principal/src/System.Security.Principal.csproj
@@ -11,7 +11,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.1</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.0</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" />
diff --git a/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
index 1247e890e1..3b4bb81c02 100644
--- a/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
+++ b/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ServiceProcess.ServiceController.cs" />
diff --git a/src/System.ServiceProcess.ServiceController/ref/project.json b/src/System.ServiceProcess.ServiceController/ref/project.json
index 330f88a68e..f112c278ac 100644
--- a/src/System.ServiceProcess.ServiceController/ref/project.json
+++ b/src/System.ServiceProcess.ServiceController/ref/project.json
@@ -4,6 +4,10 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj
index 1bd4a11bd2..fdc2f95405 100644
--- a/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj
+++ b/src/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.Encoding.CodePages.cs" />
diff --git a/src/System.Text.Encoding.CodePages/ref/project.json b/src/System.Text.Encoding.CodePages/ref/project.json
index 6359400daf..3315848003 100644
--- a/src/System.Text.Encoding.CodePages/ref/project.json
+++ b/src/System.Text.Encoding.CodePages/ref/project.json
@@ -4,6 +4,10 @@
     "System.Text.Encoding": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
index 2bf64bff63..ecb6d37052 100644
--- a/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
+++ b/src/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
@@ -13,7 +13,7 @@
     <AssemblyName>System.Text.Encoding.CodePages</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
     <PackageTargetRuntime Condition="'$(TargetsWindows)' == 'true'">win</PackageTargetRuntime>
     <PackageTargetRuntime Condition="'$(TargetsUnix)' == 'true'">unix</PackageTargetRuntime>
   </PropertyGroup>
diff --git a/src/System.Text.Encoding.Extensions/ref/4.0.0/System.Text.Encoding.Extensions.depproj b/src/System.Text.Encoding.Extensions/ref/4.0.0/System.Text.Encoding.Extensions.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Text.Encoding.Extensions/ref/4.0.0/System.Text.Encoding.Extensions.depproj
+++ b/src/System.Text.Encoding.Extensions/ref/4.0.0/System.Text.Encoding.Extensions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Text.Encoding.Extensions/ref/4.0.0/project.json b/src/System.Text.Encoding.Extensions/ref/4.0.0/project.json
index ebfa626ecf..436eb49bf3 100644
--- a/src/System.Text.Encoding.Extensions/ref/4.0.0/project.json
+++ b/src/System.Text.Encoding.Extensions/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Text.Encoding.Extensions": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj b/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
index 4df05b4951..abab9712c5 100644
--- a/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
+++ b/src/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.Encoding.Extensions.cs" />
diff --git a/src/System.Text.Encoding.Extensions/ref/project.json b/src/System.Text.Encoding.Extensions/ref/project.json
index 6359400daf..3315848003 100644
--- a/src/System.Text.Encoding.Extensions/ref/project.json
+++ b/src/System.Text.Encoding.Extensions/ref/project.json
@@ -4,6 +4,10 @@
     "System.Text.Encoding": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
index 9ef805509c..6cbf940cad 100644
--- a/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
+++ b/src/System.Text.Encoding.Extensions/src/System.Text.Encoding.Extensions.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Text.Encoding.Extensions</AssemblyName>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Text.Encoding/ref/4.0.0/System.Text.Encoding.depproj b/src/System.Text.Encoding/ref/4.0.0/System.Text.Encoding.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Text.Encoding/ref/4.0.0/System.Text.Encoding.depproj
+++ b/src/System.Text.Encoding/ref/4.0.0/System.Text.Encoding.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Text.Encoding/ref/4.0.0/project.json b/src/System.Text.Encoding/ref/4.0.0/project.json
index 09af1997ea..3ea296b689 100644
--- a/src/System.Text.Encoding/ref/4.0.0/project.json
+++ b/src/System.Text.Encoding/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Text.Encoding": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.Encoding/ref/System.Text.Encoding.csproj b/src/System.Text.Encoding/ref/System.Text.Encoding.csproj
index c921e8302c..580c62f4f1 100644
--- a/src/System.Text.Encoding/ref/System.Text.Encoding.csproj
+++ b/src/System.Text.Encoding/ref/System.Text.Encoding.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.Encoding.cs" />
diff --git a/src/System.Text.Encoding/ref/project.json b/src/System.Text.Encoding/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Text.Encoding/ref/project.json
+++ b/src/System.Text.Encoding/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/System.Text.Encoding/src/System.Text.Encoding.csproj
index 4f72ac4553..bdddead249 100644
--- a/src/System.Text.Encoding/src/System.Text.Encoding.csproj
+++ b/src/System.Text.Encoding/src/System.Text.Encoding.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Text.Encoding</AssemblyName>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index 8ef2eeee0d..c62b252531 100644
--- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,7 +7,7 @@
     <AssemblyName>System.Text.Encodings.Web</AssemblyName>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
     <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
diff --git a/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj
+++ b/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Text.RegularExpressions/ref/4.0.0/project.json b/src/System.Text.RegularExpressions/ref/4.0.0/project.json
index f4411eb3b4..f1dbb08880 100644
--- a/src/System.Text.RegularExpressions/ref/4.0.0/project.json
+++ b/src/System.Text.RegularExpressions/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Text.RegularExpressions": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj
index 93a1315ae4..61ed42e3a5 100644
--- a/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj
+++ b/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Text.RegularExpressions/ref/4.0.10/project.json b/src/System.Text.RegularExpressions/ref/4.0.10/project.json
index a65a7d8f68..7424b6b7d0 100644
--- a/src/System.Text.RegularExpressions/ref/4.0.10/project.json
+++ b/src/System.Text.RegularExpressions/ref/4.0.10/project.json
@@ -3,6 +3,10 @@
     "System.Text.RegularExpressions": "4.0.10"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
index 4f2b6351ee..2902a2c289 100644
--- a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
+++ b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.12.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.RegularExpressions.cs" />
diff --git a/src/System.Text.RegularExpressions/ref/project.json b/src/System.Text.RegularExpressions/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Text.RegularExpressions/ref/project.json
+++ b/src/System.Text.RegularExpressions/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
index 61b7554507..1f2551c16b 100644
--- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
+++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
@@ -7,7 +7,7 @@
     <AssemblyVersion>4.0.12.0</AssemblyVersion>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
index a8183081bc..5602338d35 100644
--- a/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
+++ b/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.AccessControl.cs" />
diff --git a/src/System.Threading.AccessControl/ref/project.json b/src/System.Threading.AccessControl/ref/project.json
index b3b032b194..bcc6ddda71 100644
--- a/src/System.Threading.AccessControl/ref/project.json
+++ b/src/System.Threading.AccessControl/ref/project.json
@@ -7,6 +7,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
index b10e546afa..23ba9795bb 100644
--- a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
+++ b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,7 +7,7 @@
     <ProjectGuid>{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}</ProjectGuid>
     <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dnxcore50</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Threading.AccessControl/src/project.json b/src/System.Threading.AccessControl/src/project.json
index 9b9b6ed479..7d9894dac6 100644
--- a/src/System.Threading.AccessControl/src/project.json
+++ b/src/System.Threading.AccessControl/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Diagnostics.Contracts": "4.0.0",
         "System.Runtime.Handles": "4.0.0",
@@ -11,7 +11,10 @@
         "System.Security.Principal.Windows": "4.0.0-rc3-23818",
         "System.Threading": "4.0.10",
         "System.Threading.Tasks": "4.0.0"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
     "net46": {
       "dependencies": {
@@ -19,4 +22,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
index 765a3b3298..e2cd69ec24 100644
--- a/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
+++ b/src/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.Overlapped.cs" />
diff --git a/src/System.Threading.Overlapped/ref/project.json b/src/System.Threading.Overlapped/ref/project.json
index 330f88a68e..f112c278ac 100644
--- a/src/System.Threading.Overlapped/ref/project.json
+++ b/src/System.Threading.Overlapped/ref/project.json
@@ -4,6 +4,10 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
index ef4c2f13ef..c32a3f60cc 100644
--- a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
+++ b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj
@@ -11,7 +11,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='' OR '$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
     <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dnxcore50</PackageTargetFramework> 
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" />
diff --git a/src/System.Threading.Overlapped/src/project.json b/src/System.Threading.Overlapped/src/project.json
index 1d35532a00..1149f7feb9 100644
--- a/src/System.Threading.Overlapped/src/project.json
+++ b/src/System.Threading.Overlapped/src/project.json
@@ -1,10 +1,13 @@
 {
   "frameworks": {
-    "dotnet5.1": {
+    "netstandard1.0": {
       "dependencies": {
         "Microsoft.NETCore.Platforms": "1.0.1-rc3-23818",
         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23818"
-      }
+      },
+      "imports": [
+        "dotnet5.1"
+      ]
     },
     "netcore50": {
       "dependencies": {
@@ -24,4 +27,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.WP8.csproj b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.WP8.csproj
index 7d4474c2cc..e79ed741c2 100644
--- a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.WP8.csproj
+++ b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.WP8.csproj
@@ -12,7 +12,7 @@
     <FileAlignment>512</FileAlignment>
     <DocumentationFile>$(OutputPath)System.Threading.Tasks.Dataflow.XML</DocumentationFile>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
index b8aef88b7f..9037b697ec 100644
--- a/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
+++ b/src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
@@ -15,8 +15,8 @@
     <DefineConstants>$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageDestination Include="lib/dotnet5.2">
-      <TargetFramework>dotnet5.2</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.1">
+      <TargetFramework>netstandard1.1</TargetFramework>
     </PackageDestination>
     <!-- Support targets that were supported in previous package versions -->
     <PackageDestination Include="lib/portable-net45+win8+wpa81">
diff --git a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
index 461d6497e3..a9eae912be 100644
--- a/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
+++ b/src/System.Threading.Tasks.Extensions/src/System.Threading.Tasks.Extensions.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -9,8 +9,8 @@
     <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
   </PropertyGroup>
   <ItemGroup Condition="'$(PackageTargetFramework)' == ''">
-    <PackageDestination Include="lib/dotnet5.1">
-      <TargetFramework>dotnet5.1</TargetFramework>
+    <PackageDestination Include="lib/netstandard1.0">
+      <TargetFramework>netstandard1.0</TargetFramework>
     </PackageDestination>
     <!-- Support downlevel targets -->
     <PackageDestination Include="lib/portable-net45+win8+wp8+wpa81">
diff --git a/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj b/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
index 8790fbb4a3..d870d8205d 100644
--- a/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
+++ b/src/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.2</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.Tasks.Parallel.cs" />
diff --git a/src/System.Threading.Tasks.Parallel/ref/project.json b/src/System.Threading.Tasks.Parallel/ref/project.json
index ef33118f8f..b4326eb9a8 100644
--- a/src/System.Threading.Tasks.Parallel/ref/project.json
+++ b/src/System.Threading.Tasks.Parallel/ref/project.json
@@ -5,6 +5,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.2": {}
+    "netstandard1.1": {
+      "imports": [
+        "dotnet5.2"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
index f1fe81e206..4dbfa4ff3d 100644
--- a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
+++ b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
@@ -11,7 +11,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/System.Threading.Tasks/ref/4.0.0/System.Threading.Tasks.depproj b/src/System.Threading.Tasks/ref/4.0.0/System.Threading.Tasks.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Threading.Tasks/ref/4.0.0/System.Threading.Tasks.depproj
+++ b/src/System.Threading.Tasks/ref/4.0.0/System.Threading.Tasks.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Threading.Tasks/ref/4.0.0/project.json b/src/System.Threading.Tasks/ref/4.0.0/project.json
index 6e12dfd008..44e8e06fb3 100644
--- a/src/System.Threading.Tasks/ref/4.0.0/project.json
+++ b/src/System.Threading.Tasks/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
index ff2c7056c2..8e1c0dc90f 100644
--- a/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
+++ b/src/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.Tasks.cs" />
diff --git a/src/System.Threading.Tasks/ref/project.json b/src/System.Threading.Tasks/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Threading.Tasks/ref/project.json
+++ b/src/System.Threading.Tasks/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
index 29a8196bfb..e82cfcd63d 100644
--- a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
+++ b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.Threading.Tasks</AssemblyName>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Threading.Thread/ref/System.Threading.Thread.csproj b/src/System.Threading.Thread/ref/System.Threading.Thread.csproj
index 505e383245..279cdd45ab 100644
--- a/src/System.Threading.Thread/ref/System.Threading.Thread.csproj
+++ b/src/System.Threading.Thread/ref/System.Threading.Thread.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.Thread.cs" />
diff --git a/src/System.Threading.Thread/ref/project.json b/src/System.Threading.Thread/ref/project.json
index 04ba7dde3a..1debae2d47 100644
--- a/src/System.Threading.Thread/ref/project.json
+++ b/src/System.Threading.Thread/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj b/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
index 99263d55a6..12c67354c8 100644
--- a/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
+++ b/src/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.10.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.ThreadPool.cs" />
diff --git a/src/System.Threading.ThreadPool/ref/project.json b/src/System.Threading.ThreadPool/ref/project.json
index 330f88a68e..f112c278ac 100644
--- a/src/System.Threading.ThreadPool/ref/project.json
+++ b/src/System.Threading.ThreadPool/ref/project.json
@@ -4,6 +4,10 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading.Timer/ref/System.Threading.Timer.csproj b/src/System.Threading.Timer/ref/System.Threading.Timer.csproj
index 20acd742be..b77e365824 100644
--- a/src/System.Threading.Timer/ref/System.Threading.Timer.csproj
+++ b/src/System.Threading.Timer/ref/System.Threading.Timer.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.2</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.Timer.cs" />
diff --git a/src/System.Threading.Timer/ref/project.json b/src/System.Threading.Timer/ref/project.json
index 92ba70daf0..8aef7967b8 100644
--- a/src/System.Threading.Timer/ref/project.json
+++ b/src/System.Threading.Timer/ref/project.json
@@ -3,6 +3,10 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.3": {}
+    "netstandard1.2": {
+      "imports": [
+        "dotnet5.3"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading.Timer/src/System.Threading.Timer.csproj b/src/System.Threading.Timer/src/System.Threading.Timer.csproj
index 82b9b7d567..31f0da9384 100644
--- a/src/System.Threading.Timer/src/System.Threading.Timer.csproj
+++ b/src/System.Threading.Timer/src/System.Threading.Timer.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>System.Threading.Timer</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
 
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Threading/ref/4.0.0/System.Threading.depproj b/src/System.Threading/ref/4.0.0/System.Threading.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Threading/ref/4.0.0/System.Threading.depproj
+++ b/src/System.Threading/ref/4.0.0/System.Threading.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Threading/ref/4.0.0/project.json b/src/System.Threading/ref/4.0.0/project.json
index e8948be71e..10a8b4e5b1 100644
--- a/src/System.Threading/ref/4.0.0/project.json
+++ b/src/System.Threading/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Threading": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading/ref/System.Threading.csproj b/src/System.Threading/ref/System.Threading.csproj
index 3ab29fd07d..a2ff2480dc 100644
--- a/src/System.Threading/ref/System.Threading.csproj
+++ b/src/System.Threading/ref/System.Threading.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Threading.cs" />
diff --git a/src/System.Threading/ref/project.json b/src/System.Threading/ref/project.json
index f3a2263603..b4da3de3ec 100644
--- a/src/System.Threading/ref/project.json
+++ b/src/System.Threading/ref/project.json
@@ -4,6 +4,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Threading/src/System.Threading.csproj b/src/System.Threading/src/System.Threading.csproj
index 3ea26375ea..5e3c28ce3a 100644
--- a/src/System.Threading/src/System.Threading.csproj
+++ b/src/System.Threading/src/System.Threading.csproj
@@ -7,7 +7,7 @@
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
     <UsePackageTargetRuntimeDefaults>true</UsePackageTargetRuntimeDefaults>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' != ''">None</ResourcesSourceOutputDirectory>
   </PropertyGroup>
diff --git a/src/System.Xml.ReaderWriter/ref/4.0.0/System.Xml.ReaderWriter.depproj b/src/System.Xml.ReaderWriter/ref/4.0.0/System.Xml.ReaderWriter.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Xml.ReaderWriter/ref/4.0.0/System.Xml.ReaderWriter.depproj
+++ b/src/System.Xml.ReaderWriter/ref/4.0.0/System.Xml.ReaderWriter.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Xml.ReaderWriter/ref/4.0.0/project.json b/src/System.Xml.ReaderWriter/ref/4.0.0/project.json
index 7d138771e1..ce2996b2fa 100644
--- a/src/System.Xml.ReaderWriter/ref/4.0.0/project.json
+++ b/src/System.Xml.ReaderWriter/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Xml.ReaderWriter": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj b/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
index cb06f92389..ef36847aac 100644
--- a/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
+++ b/src/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.ReaderWriter.cs" />
diff --git a/src/System.Xml.ReaderWriter/ref/project.json b/src/System.Xml.ReaderWriter/ref/project.json
index 2e35006cde..0d9cdce446 100644
--- a/src/System.Xml.ReaderWriter/ref/project.json
+++ b/src/System.Xml.ReaderWriter/ref/project.json
@@ -6,6 +6,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj b/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj
index 97d2a39189..70e3fb64f9 100644
--- a/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj
+++ b/src/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj
@@ -9,7 +9,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
diff --git a/src/System.Xml.XDocument/ref/4.0.0/System.Xml.XDocument.depproj b/src/System.Xml.XDocument/ref/4.0.0/System.Xml.XDocument.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Xml.XDocument/ref/4.0.0/System.Xml.XDocument.depproj
+++ b/src/System.Xml.XDocument/ref/4.0.0/System.Xml.XDocument.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Xml.XDocument/ref/4.0.0/project.json b/src/System.Xml.XDocument/ref/4.0.0/project.json
index 977921420d..869f138f46 100644
--- a/src/System.Xml.XDocument/ref/4.0.0/project.json
+++ b/src/System.Xml.XDocument/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Xml.XDocument": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
index fd61ee5821..773d001c59 100644
--- a/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
+++ b/src/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XDocument.cs" />
diff --git a/src/System.Xml.XDocument/ref/project.json b/src/System.Xml.XDocument/ref/project.json
index 3e9c053491..f9c4965bba 100644
--- a/src/System.Xml.XDocument/ref/project.json
+++ b/src/System.Xml.XDocument/ref/project.json
@@ -5,6 +5,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj b/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj
index a7d3e1f304..87bc2d5dac 100644
--- a/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj
+++ b/src/System.Xml.XDocument/src/System.Xml.XDocument.csproj
@@ -9,7 +9,7 @@
     <DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj b/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
index 21a92e4737..fcf8404f97 100644
--- a/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
+++ b/src/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XPath.XDocument.cs" />
diff --git a/src/System.Xml.XPath.XDocument/ref/project.json b/src/System.Xml.XPath.XDocument/ref/project.json
index ee82890280..0a6afbd6eb 100644
--- a/src/System.Xml.XPath.XDocument/ref/project.json
+++ b/src/System.Xml.XPath.XDocument/ref/project.json
@@ -6,6 +6,10 @@
     "System.Xml.ReaderWriter": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj b/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj
index 76fcdc444c..a3812e5ca3 100644
--- a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj
+++ b/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>System.Xml.XPath.XDocument</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)'==''">netstandard1.3</PackageTargetFramework>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Xml.XPath.XDocument/src/project.json b/src/System.Xml.XPath.XDocument/src/project.json
index 7dc2c6d898..ed74b5519d 100644
--- a/src/System.Xml.XPath.XDocument/src/project.json
+++ b/src/System.Xml.XPath.XDocument/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Diagnostics.Debug": "4.0.10",
         "System.Diagnostics.Tools": "4.0.0",
@@ -11,11 +11,14 @@
         "System.Threading": "4.0.10",
         "System.Xml.ReaderWriter": "4.0.10",
         "System.Xml.XDocument": "4.0.10"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     },
-    "net46":{
+    "net46": {
       "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1",
+        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
     }
   }
diff --git a/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj b/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj
index 4275b6eca8..4e8817d86e 100644
--- a/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj
+++ b/src/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XPath.XmlDocument.Manual.cs" />
diff --git a/src/System.Xml.XPath.XmlDocument/ref/project.json b/src/System.Xml.XPath.XmlDocument/ref/project.json
index 50c759fe8d..89c301ae46 100644
--- a/src/System.Xml.XPath.XmlDocument/ref/project.json
+++ b/src/System.Xml.XPath.XmlDocument/ref/project.json
@@ -6,6 +6,10 @@
     "System.Xml.ReaderWriter": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj b/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj
index 44ecd2f0c6..f7cbcd1388 100644
--- a/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj
+++ b/src/System.Xml.XPath.XmlDocument/src/System.Xml.XPath.XmlDocument.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>System.Xml.XPath.XmlDocument</AssemblyName>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/System.Xml.XPath/ref/System.Xml.XPath.csproj b/src/System.Xml.XPath/ref/System.Xml.XPath.csproj
index af779dd2c5..6364037454 100644
--- a/src/System.Xml.XPath/ref/System.Xml.XPath.csproj
+++ b/src/System.Xml.XPath/ref/System.Xml.XPath.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XPath.cs" />
diff --git a/src/System.Xml.XPath/ref/project.json b/src/System.Xml.XPath/ref/project.json
index 2167b17b0b..216e6cefcf 100644
--- a/src/System.Xml.XPath/ref/project.json
+++ b/src/System.Xml.XPath/ref/project.json
@@ -5,6 +5,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XPath/src/System.Xml.XPath.csproj b/src/System.Xml.XPath/src/System.Xml.XPath.csproj
index 0c389d3f07..e048ea9a46 100644
--- a/src/System.Xml.XPath/src/System.Xml.XPath.csproj
+++ b/src/System.Xml.XPath/src/System.Xml.XPath.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj b/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
index 054ac62c9a..aba3492503 100644
--- a/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
+++ b/src/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XmlDocument.cs" />
diff --git a/src/System.Xml.XmlDocument/ref/project.json b/src/System.Xml.XmlDocument/ref/project.json
index 8938a3f38e..a291887840 100644
--- a/src/System.Xml.XmlDocument/ref/project.json
+++ b/src/System.Xml.XmlDocument/ref/project.json
@@ -6,6 +6,10 @@
     "System.Threading.Tasks": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj b/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
index 4ce974a91f..410a61efb3 100644
--- a/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
+++ b/src/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
@@ -9,7 +9,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework> 
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework> 
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
diff --git a/src/System.Xml.XmlSerializer/ref/4.0.0/System.Xml.XmlSerializer.depproj b/src/System.Xml.XmlSerializer/ref/4.0.0/System.Xml.XmlSerializer.depproj
index 66b3818eba..f1c59486ed 100644
--- a/src/System.Xml.XmlSerializer/ref/4.0.0/System.Xml.XmlSerializer.depproj
+++ b/src/System.Xml.XmlSerializer/ref/4.0.0/System.Xml.XmlSerializer.depproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.1</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
diff --git a/src/System.Xml.XmlSerializer/ref/4.0.0/project.json b/src/System.Xml.XmlSerializer/ref/4.0.0/project.json
index 57603a8edc..df77104b2e 100644
--- a/src/System.Xml.XmlSerializer/ref/4.0.0/project.json
+++ b/src/System.Xml.XmlSerializer/ref/4.0.0/project.json
@@ -3,6 +3,10 @@
     "System.Xml.XmlSerializer": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.1": {}
+    "netstandard1.0": {
+      "imports": [
+        "dotnet5.1"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj b/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
index 958ed31d62..31192ac7c2 100644
--- a/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
+++ b/src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Xml.XmlSerializer.cs" />
diff --git a/src/System.Xml.XmlSerializer/ref/project.json b/src/System.Xml.XmlSerializer/ref/project.json
index 3e9c053491..f9c4965bba 100644
--- a/src/System.Xml.XmlSerializer/ref/project.json
+++ b/src/System.Xml.XmlSerializer/ref/project.json
@@ -5,6 +5,10 @@
     "System.IO": "4.0.0"
   },
   "frameworks": {
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
index 2b23ea173b..2c4d1c3d2b 100644
--- a/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
+++ b/src/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
@@ -10,11 +10,11 @@
     <FileAlignment>512</FileAlignment>
     <DebugSymbols>true</DebugSymbols>
     <ProjectGuid>{D62A6082-5229-4845-8BE9-75753E08C65A}</ProjectGuid>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcore50'">$(DefineConstants);NET_NATIVE</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)' == 'netcore50aot'">$(DefineConstants);NET_NATIVE</DefineConstants>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
     <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet5.4</PackageTargetFramework>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' != 'net46'">.NETPlatform,Version=v5.4</NuGetTargetMoniker>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.3</PackageTargetFramework>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
@@ -84,7 +84,7 @@
     <Compile Include="System\Xml\Serialization\SourceInfo.cs" />
     <Compile Include="System\Xml\Serialization\XmlSchema.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcore50'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'netcore50aot'">
     <EmbeddedResource Include="$(MsBuildThisFileDirectory)Resources\$(AssemblyName).rd.xml" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'net46'">
diff --git a/src/System.Xml.XmlSerializer/src/project.json b/src/System.Xml.XmlSerializer/src/project.json
index 038e07c45c..758db65a87 100644
--- a/src/System.Xml.XmlSerializer/src/project.json
+++ b/src/System.Xml.XmlSerializer/src/project.json
@@ -1,7 +1,8 @@
 {
   "frameworks": {
-    "dotnet5.4": {
+    "netcore50": {
       "dependencies": {
+        "Microsoft.NETCore.Targets": "1.0.0",
         "System.Collections": "4.0.10",
         "System.Diagnostics.Debug": "4.0.10",
         "System.Diagnostics.Tools": "4.0.0",
@@ -24,6 +25,33 @@
         "System.Xml.XmlDocument": "4.0.0"
       }
     },
+    "netstandard1.3": {
+      "dependencies": {
+        "System.Collections": "4.0.10",
+        "System.Diagnostics.Debug": "4.0.10",
+        "System.Diagnostics.Tools": "4.0.0",
+        "System.Globalization": "4.0.10",
+        "System.IO": "4.0.10",
+        "System.Linq": "4.0.0",
+        "System.Reflection": "4.0.10",
+        "System.Reflection.Emit": "4.0.0",
+        "System.Reflection.Emit.ILGeneration": "4.0.0",
+        "System.Reflection.Extensions": "4.0.0",
+        "System.Reflection.Primitives": "4.0.0",
+        "System.Reflection.TypeExtensions": "4.0.0",
+        "System.Resources.ResourceManager": "4.0.0",
+        "System.Runtime": "4.0.20",
+        "System.Runtime.Extensions": "4.0.10",
+        "System.Text.RegularExpressions": "4.0.10",
+        "System.Threading": "4.0.10",
+        "System.Threading.Tasks": "4.0.10",
+        "System.Xml.ReaderWriter": "4.0.10",
+        "System.Xml.XmlDocument": "4.0.0"
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
+    },
     "net46": {
       "dependencies": {
         "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"