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]

11 files changed, 36 insertions, 25 deletions

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