From 2f929994a5cc17d4038cf3df0576c25b33f95e15 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 29 Sep 2016 12:56:37 -0700
Subject: [PATCH 01/10] Make Sockets target ns1.7, maintaining old configs

---
 .../packageIndex.json                         |  9 ++-
 .../pkg/System.Net.Sockets.pkgproj            |  4 +-
 .../pkg/unix/System.Net.Sockets.pkgproj       |  4 ++
 .../pkg/win/System.Net.Sockets.pkgproj        |  4 ++
 .../ref/System.Net.Sockets.csproj             |  2 +-
 src/System.Net.Sockets/ref/project.json       | 14 ++---
 .../src/System.Net.Sockets.builds             | 10 +++-
 .../src/System.Net.Sockets.csproj             | 19 +++---
 src/System.Net.Sockets/src/project.json       | 58 +++++++++++-------
 src/System.Net.Sockets/src/win/project.json   | 59 ++++++++++++-------
 10 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 51c6beca4f0f..a5899bb3f361 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -630,7 +630,8 @@
         "4.1.0"
       ],
       "AssemblyVersionInPackageVersion": {
-        "4.2.0.0": "4.3.0"
+        "4.2.0.0": "4.3.0",
+        "4.1.1.0": "4.3.0"
       }
     },
     "runtime.unix.System.Private.Uri": {
@@ -697,7 +698,8 @@
         "4.1.0"
       ],
       "AssemblyVersionInPackageVersion": {
-        "4.2.0.0": "4.3.0"
+        "4.2.0.0": "4.3.0",
+        "4.1.1.0": "4.3.0"
       }
     },
     "runtime.win.System.Runtime.Extensions": {
@@ -1446,7 +1448,8 @@
         "4.1.0.0": "4.1.0",
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.1.0",
-        "4.2.0.0": "4.3.0"
+        "4.2.0.0": "4.3.0",
+        "4.1.1.0": "4.3.0"
       }
     },
     "System.Net.WebClient": {
diff --git a/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
index eff92496807c..1ad81f5f1139 100644
--- a/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
+++ b/src/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
@@ -3,10 +3,10 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.Sockets.csproj">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.1;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.Sockets.csproj">
-      <TargetGroup>net46</TargetGroup>
+      <TargetGroup>net463</TargetGroup>
     </ProjectReference>
     <ProjectReference Include="win\System.Net.Sockets.pkgproj" />
     <ProjectReference Include="unix\System.Net.Sockets.pkgproj" />
diff --git a/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
index ea1b3d2dffc1..56698a580e33 100644
--- a/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
+++ b/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
@@ -11,6 +11,10 @@
     <ProjectReference Include="..\..\src\System.Net.Sockets.csproj" >
       <OSGroup>Unix</OSGroup>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\System.Net.Sockets.csproj" >
+      <TargetGroup>netstandard1.3</TargetGroup>
+      <OSGroup>Unix</OSGroup>
+    </ProjectReference>
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
index c5782a70305d..27528b642a69 100644
--- a/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
+++ b/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
@@ -11,6 +11,10 @@
     <ProjectReference Include="..\..\src\System.Net.Sockets.csproj">
       <OSGroup>Windows_NT</OSGroup>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\System.Net.Sockets.csproj">
+      <OSGroup>Windows_NT</OSGroup>
+      <TargetGroup>netstandard1.3</TargetGroup>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\System.Net.Sockets.csproj">
       <OSGroup>Windows_NT</OSGroup>
       <TargetGroup>netcore50</TargetGroup>
diff --git a/src/System.Net.Sockets/ref/System.Net.Sockets.csproj b/src/System.Net.Sockets/ref/System.Net.Sockets.csproj
index 76fe5df15ca2..465a57f0704d 100644
--- a/src/System.Net.Sockets/ref/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/ref/System.Net.Sockets.csproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.7</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 2f4bf12c6068..bce8ae3c705c 100644
--- a/src/System.Net.Sockets/ref/project.json
+++ b/src/System.Net.Sockets/ref/project.json
@@ -1,16 +1,12 @@
 {
   "dependencies": {
-    "System.IO": "4.0.0",
+    "System.IO": "4.1.0",
     "System.IO.FileSystem.Primitives": "4.0.1",
-    "System.Net.Primitives": "4.0.10",
-    "System.Runtime": "4.0.0",
-    "System.Threading.Tasks": "4.0.0"
+    "System.Net.Primitives": "4.0.11",
+    "System.Runtime": "4.1.0",
+    "System.Threading.Tasks": "4.0.11"
   },
   "frameworks": {
-    "netstandard1.3": {
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
+    "netstandard1.7": { }
   }
 }
diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.builds b/src/System.Net.Sockets/src/System.Net.Sockets.builds
index 925730019056..d16310a3040d 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.builds
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.builds
@@ -9,7 +9,15 @@
       <OSGroup>Windows_NT</OSGroup>
     </Project>
     <Project Include="System.Net.Sockets.csproj">
-      <TargetGroup>net46</TargetGroup>
+      <TargetGroup>netstandard1.3</TargetGroup>
+      <OSGroup>Unix</OSGroup>
+    </Project>
+    <Project Include="System.Net.Sockets.csproj">
+      <TargetGroup>netstandard1.3</TargetGroup>
+      <OSGroup>Windows_NT</OSGroup>
+    </Project>
+    <Project Include="System.Net.Sockets.csproj">
+      <TargetGroup>net463</TargetGroup>
     </Project>
     <Project Include="System.Net.Sockets.csproj">
       <OSGroup>Windows_NT</OSGroup>
diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
index 698e1bbce067..53a853797cf9 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -9,10 +9,11 @@
     <ProjectGuid>{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT>
-    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
+    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
+    <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3' OR '$(TargetGroup)' == 'netcore50'">4.1.1.0</AssemblyVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == ''">
+  <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND ('$(TargetGroup)' == '' OR '$(TargetGroup)' == 'netstandard1.3')">
     <ProjectJson>win/project.json</ProjectJson>
     <ProjectLockJson>win/project.lock.json</ProjectLockJson>
   </PropertyGroup>
@@ -29,8 +30,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_netcore50_Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_netcore50_Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
   <PropertyGroup>
     <!-- SYSTEM_NET_SOCKETS_DLL is required to allow source-level code sharing for types defined within the 
          System.Net.Internals namespace. -->
@@ -43,7 +44,7 @@
     <Compile Include="System\Net\Sockets\SocketReceiveMessageFromResult.cs" />
     <Compile Include="System\Net\Sockets\SocketTaskExtensions.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'net46'">
+  <ItemGroup Condition="'$(TargetGroup)' != 'net463'">
     <!-- CoreCLR (All Operating Systems), .NET Native -->
     <Compile Include="System\Net\DnsAPMExtensions.cs" />
     <Compile Include="System\Net\SocketPerfCounters.cs" />
@@ -169,7 +170,7 @@
       <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'net46' ">
+  <ItemGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' != 'net463' ">
     <!-- Windows: CoreCLR and .NET Native -->
     <Compile Include="System\Net\Sockets\AcceptOverlappedAsyncResult.Windows.cs" />
     <Compile Include="System\Net\Sockets\BaseOverlappedAsyncResult.Windows.cs" />
@@ -287,7 +288,7 @@
     </Compile>
   </ItemGroup>
   <!-- Windows : Win32 only -->
-  <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND '$(TargetGroup)' != 'net46'">
+  <ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(EnableWinRT)' != 'true' AND '$(TargetGroup)' != 'net463'">
     <Compile Include="$(CommonPath)\Interop\Windows\Winsock\SafeOverlappedFree.cs">
       <Link>Interop\Windows\Winsock\SafeOverlappedFree.cs</Link>
     </Compile>
@@ -441,7 +442,7 @@
       <Link>Interop\Unix\System.Native\Interop.Write.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'net46'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'net463'">
     <!-- .NET Framework -->
     <TargetingPackReference Include="mscorlib" />
     <TargetingPackReference Include="System" />
diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json
index 5c1292e81e91..4022f7480851 100644
--- a/src/System.Net.Sockets/src/project.json
+++ b/src/System.Net.Sockets/src/project.json
@@ -2,31 +2,49 @@
   "frameworks": {
     "netstandard1.3": {
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "System.Collections": "4.0.0",
-        "System.Diagnostics.Debug": "4.0.10",
-        "System.Diagnostics.Tracing": "4.0.20",
-        "System.Globalization": "4.0.0",
-        "System.IO": "4.0.10",
-        "System.IO.FileSystem": "4.0.0",
-        "System.IO.FileSystem.Primitives": "4.0.0",
+        "System.Collections": "4.0.11",
+        "System.Diagnostics.Debug": "4.0.11",
+        "System.Diagnostics.Tracing": "4.1.0",
+        "System.Globalization": "4.0.11",
+        "System.IO": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.IO.FileSystem.Primitives": "4.0.1",
         "System.Net.NameResolution": "4.0.0",
-        "System.Net.Primitives": "4.0.10",
-        "System.Resources.ResourceManager": "4.0.0",
-        "System.Runtime": "4.0.20",
-        "System.Runtime.Extensions": "4.0.10",
-        "System.Runtime.Handles": "4.0.0",
-        "System.Runtime.InteropServices": "4.0.20",
+        "System.Net.Primitives": "4.0.11",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.Handles": "4.0.1",
+        "System.Runtime.InteropServices": "4.1.0",
         "System.Security.Principal.Windows": "4.0.0",
-        "System.Threading": "4.0.10",
-        "System.Threading.Tasks": "4.0.10",
+        "System.Threading": "4.0.11",
+        "System.Threading.Tasks": "4.0.11",
         "System.Threading.ThreadPool": "4.0.10"
       },
-      "imports": [
-        "dotnet5.4"
-      ]
     },
-    "net46": {
+    "netstandard1.7": {
+      "dependencies": {
+        "System.Collections": "4.0.11",
+        "System.Diagnostics.Debug": "4.0.11",
+        "System.Diagnostics.Tracing": "4.1.0",
+        "System.Globalization": "4.0.11",
+        "System.IO": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.IO.FileSystem.Primitives": "4.0.1",
+        "System.Net.NameResolution": "4.0.0",
+        "System.Net.Primitives": "4.0.11",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.Handles": "4.0.1",
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.Security.Principal.Windows": "4.0.0",
+        "System.Threading": "4.0.11",
+        "System.Threading.Tasks": "4.0.11",
+        "System.Threading.ThreadPool": "4.0.10"
+      }
+    },
+    "net463": {
       "dependencies": {
         "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
diff --git a/src/System.Net.Sockets/src/win/project.json b/src/System.Net.Sockets/src/win/project.json
index 258c9fcfe19d..b22c24ae490e 100644
--- a/src/System.Net.Sockets/src/win/project.json
+++ b/src/System.Net.Sockets/src/win/project.json
@@ -2,30 +2,49 @@
   "frameworks": {
     "netstandard1.3": {
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "System.Collections": "4.0.0",
-        "System.Diagnostics.Debug": "4.0.10",
-        "System.Diagnostics.Tracing": "4.0.20",
-        "System.Globalization": "4.0.0",
-        "System.IO": "4.0.10",
-        "System.IO.FileSystem": "4.0.0",
-        "System.IO.FileSystem.Primitives": "4.0.0",
+        "System.Collections": "4.0.11",
+        "System.Diagnostics.Debug": "4.0.11",
+        "System.Diagnostics.Tracing": "4.1.0",
+        "System.Globalization": "4.0.11",
+        "System.IO": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.IO.FileSystem.Primitives": "4.0.1",
         "System.Net.NameResolution": "4.0.0",
-        "System.Net.Primitives": "4.0.10",
-        "System.Resources.ResourceManager": "4.0.0",
-        "System.Runtime": "4.0.20",
-        "System.Runtime.Extensions": "4.0.10",
-        "System.Runtime.Handles": "4.0.0",
-        "System.Runtime.InteropServices": "4.0.20",
+        "System.Net.Primitives": "4.0.11",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.Handles": "4.0.1",
+        "System.Runtime.InteropServices": "4.1.0",
         "System.Security.Principal.Windows": "4.0.0",
-        "System.Threading": "4.0.10",
-        "System.Threading.Overlapped": "4.0.0",
-        "System.Threading.Tasks": "4.0.10",
+        "System.Threading": "4.0.11",
+        "System.Threading.Overlapped": "4.0.1",
+        "System.Threading.Tasks": "4.0.11",
         "System.Threading.ThreadPool": "4.0.10"
       },
-      "imports": [
-        "dotnet5.4"
-      ]
+    },
+    "netstandard1.7": {
+      "dependencies": {
+        "System.Collections": "4.0.11",
+        "System.Diagnostics.Debug": "4.0.11",
+        "System.Diagnostics.Tracing": "4.1.0",
+        "System.Globalization": "4.0.11",
+        "System.IO": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.IO.FileSystem.Primitives": "4.0.1",
+        "System.Net.NameResolution": "4.0.0",
+        "System.Net.Primitives": "4.0.11",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.Handles": "4.0.1",
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.Security.Principal.Windows": "4.0.0",
+        "System.Threading": "4.0.11",
+        "System.Threading.Overlapped": "4.0.1",
+        "System.Threading.Tasks": "4.0.11",
+        "System.Threading.ThreadPool": "4.0.10"
+      }
     }
   }
 }

From 13ccf5af266a621834c207936a8dc6c90a6f2935 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 29 Sep 2016 13:04:58 -0700
Subject: [PATCH 02/10] Remove netstandard1.3 implementations.

---
 .../pkg/unix/System.Net.Sockets.pkgproj       |  4 ----
 .../pkg/win/System.Net.Sockets.pkgproj        |  4 ----
 .../src/System.Net.Sockets.builds             |  8 -------
 .../src/System.Net.Sockets.csproj             |  4 ++--
 src/System.Net.Sockets/src/project.json       | 22 ------------------
 src/System.Net.Sockets/src/win/project.json   | 23 -------------------
 6 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
index 56698a580e33..ea1b3d2dffc1 100644
--- a/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
+++ b/src/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
@@ -11,10 +11,6 @@
     <ProjectReference Include="..\..\src\System.Net.Sockets.csproj" >
       <OSGroup>Unix</OSGroup>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\System.Net.Sockets.csproj" >
-      <TargetGroup>netstandard1.3</TargetGroup>
-      <OSGroup>Unix</OSGroup>
-    </ProjectReference>
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj b/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
index 27528b642a69..c5782a70305d 100644
--- a/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
+++ b/src/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
@@ -11,10 +11,6 @@
     <ProjectReference Include="..\..\src\System.Net.Sockets.csproj">
       <OSGroup>Windows_NT</OSGroup>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\System.Net.Sockets.csproj">
-      <OSGroup>Windows_NT</OSGroup>
-      <TargetGroup>netstandard1.3</TargetGroup>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\System.Net.Sockets.csproj">
       <OSGroup>Windows_NT</OSGroup>
       <TargetGroup>netcore50</TargetGroup>
diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.builds b/src/System.Net.Sockets/src/System.Net.Sockets.builds
index d16310a3040d..4a76f4d2d4af 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.builds
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.builds
@@ -8,14 +8,6 @@
     <Project Include="System.Net.Sockets.csproj">
       <OSGroup>Windows_NT</OSGroup>
     </Project>
-    <Project Include="System.Net.Sockets.csproj">
-      <TargetGroup>netstandard1.3</TargetGroup>
-      <OSGroup>Unix</OSGroup>
-    </Project>
-    <Project Include="System.Net.Sockets.csproj">
-      <TargetGroup>netstandard1.3</TargetGroup>
-      <OSGroup>Windows_NT</OSGroup>
-    </Project>
     <Project Include="System.Net.Sockets.csproj">
       <TargetGroup>net463</TargetGroup>
     </Project>
diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
index 53a853797cf9..f7f44c0d1914 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -11,9 +11,9 @@
     <EnableWinRT Condition="'$(TargetGroup)' == 'netcore50'">true</EnableWinRT>
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
-    <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3' OR '$(TargetGroup)' == 'netcore50'">4.1.1.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(TargetGroup)' == 'netcore50'">4.1.1.0</AssemblyVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND ('$(TargetGroup)' == '' OR '$(TargetGroup)' == 'netstandard1.3')">
+  <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == ''">
     <ProjectJson>win/project.json</ProjectJson>
     <ProjectLockJson>win/project.lock.json</ProjectLockJson>
   </PropertyGroup>
diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json
index 4022f7480851..317eb6f32248 100644
--- a/src/System.Net.Sockets/src/project.json
+++ b/src/System.Net.Sockets/src/project.json
@@ -1,27 +1,5 @@
 {
   "frameworks": {
-    "netstandard1.3": {
-      "dependencies": {
-        "System.Collections": "4.0.11",
-        "System.Diagnostics.Debug": "4.0.11",
-        "System.Diagnostics.Tracing": "4.1.0",
-        "System.Globalization": "4.0.11",
-        "System.IO": "4.1.0",
-        "System.IO.FileSystem": "4.0.1",
-        "System.IO.FileSystem.Primitives": "4.0.1",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.Primitives": "4.0.11",
-        "System.Resources.ResourceManager": "4.0.1",
-        "System.Runtime": "4.1.0",
-        "System.Runtime.Extensions": "4.1.0",
-        "System.Runtime.Handles": "4.0.1",
-        "System.Runtime.InteropServices": "4.1.0",
-        "System.Security.Principal.Windows": "4.0.0",
-        "System.Threading": "4.0.11",
-        "System.Threading.Tasks": "4.0.11",
-        "System.Threading.ThreadPool": "4.0.10"
-      },
-    },
     "netstandard1.7": {
       "dependencies": {
         "System.Collections": "4.0.11",
diff --git a/src/System.Net.Sockets/src/win/project.json b/src/System.Net.Sockets/src/win/project.json
index b22c24ae490e..d379662d6f92 100644
--- a/src/System.Net.Sockets/src/win/project.json
+++ b/src/System.Net.Sockets/src/win/project.json
@@ -1,28 +1,5 @@
 {
   "frameworks": {
-    "netstandard1.3": {
-      "dependencies": {
-        "System.Collections": "4.0.11",
-        "System.Diagnostics.Debug": "4.0.11",
-        "System.Diagnostics.Tracing": "4.1.0",
-        "System.Globalization": "4.0.11",
-        "System.IO": "4.1.0",
-        "System.IO.FileSystem": "4.0.1",
-        "System.IO.FileSystem.Primitives": "4.0.1",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.Primitives": "4.0.11",
-        "System.Resources.ResourceManager": "4.0.1",
-        "System.Runtime": "4.1.0",
-        "System.Runtime.Extensions": "4.1.0",
-        "System.Runtime.Handles": "4.0.1",
-        "System.Runtime.InteropServices": "4.1.0",
-        "System.Security.Principal.Windows": "4.0.0",
-        "System.Threading": "4.0.11",
-        "System.Threading.Overlapped": "4.0.1",
-        "System.Threading.Tasks": "4.0.11",
-        "System.Threading.ThreadPool": "4.0.10"
-      },
-    },
     "netstandard1.7": {
       "dependencies": {
         "System.Collections": "4.0.11",

From 709d6cbbd4dec6576f7cc125e84a20c2d4f1f74a Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Thu, 29 Sep 2016 14:54:06 -0700
Subject: [PATCH 03/10] Upgrade refs in project.json

---
 src/System.Net.Sockets/src/project.json     | 36 +++++++++----------
 src/System.Net.Sockets/src/win/project.json | 38 ++++++++++-----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json
index 317eb6f32248..25724f8350ae 100644
--- a/src/System.Net.Sockets/src/project.json
+++ b/src/System.Net.Sockets/src/project.json
@@ -2,24 +2,24 @@
   "frameworks": {
     "netstandard1.7": {
       "dependencies": {
-        "System.Collections": "4.0.11",
-        "System.Diagnostics.Debug": "4.0.11",
-        "System.Diagnostics.Tracing": "4.1.0",
-        "System.Globalization": "4.0.11",
-        "System.IO": "4.1.0",
-        "System.IO.FileSystem": "4.0.1",
-        "System.IO.FileSystem.Primitives": "4.0.1",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.Primitives": "4.0.11",
-        "System.Resources.ResourceManager": "4.0.1",
-        "System.Runtime": "4.1.0",
-        "System.Runtime.Extensions": "4.1.0",
-        "System.Runtime.Handles": "4.0.1",
-        "System.Runtime.InteropServices": "4.1.0",
-        "System.Security.Principal.Windows": "4.0.0",
-        "System.Threading": "4.0.11",
-        "System.Threading.Tasks": "4.0.11",
-        "System.Threading.ThreadPool": "4.0.10"
+        "System.Collections": "4.3.0-beta-24522-03",
+        "System.Diagnostics.Debug": "4.3.0-beta-24522-03",
+        "System.Diagnostics.Tracing": "4.3.0-beta-24522-03",
+        "System.Globalization": "4.3.0-beta-24522-03",
+        "System.IO": "4.3.0-beta-24522-03",
+        "System.IO.FileSystem": "4.3.0-beta-24522-03",
+        "System.IO.FileSystem.Primitives": "4.3.0-beta-24522-03",
+        "System.Net.NameResolution": "4.3.0-beta-24522-03",
+        "System.Net.Primitives": "4.3.0-beta-24522-03",
+        "System.Resources.ResourceManager": "4.3.0-beta-24522-03",
+        "System.Runtime": "4.3.0-beta-24522-03",
+        "System.Runtime.Extensions": "4.3.0-beta-24522-03",
+        "System.Runtime.Handles": "4.3.0-beta-24522-03",
+        "System.Runtime.InteropServices": "4.3.0-beta-24522-03",
+        "System.Security.Principal.Windows": "4.3.0-beta-24522-03",
+        "System.Threading": "4.3.0-beta-24522-03",
+        "System.Threading.Tasks": "4.3.0-beta-24522-03",
+        "System.Threading.ThreadPool": "4.3.0-beta-24522-03"
       }
     },
     "net463": {
diff --git a/src/System.Net.Sockets/src/win/project.json b/src/System.Net.Sockets/src/win/project.json
index d379662d6f92..4ce7a9781f60 100644
--- a/src/System.Net.Sockets/src/win/project.json
+++ b/src/System.Net.Sockets/src/win/project.json
@@ -2,25 +2,25 @@
   "frameworks": {
     "netstandard1.7": {
       "dependencies": {
-        "System.Collections": "4.0.11",
-        "System.Diagnostics.Debug": "4.0.11",
-        "System.Diagnostics.Tracing": "4.1.0",
-        "System.Globalization": "4.0.11",
-        "System.IO": "4.1.0",
-        "System.IO.FileSystem": "4.0.1",
-        "System.IO.FileSystem.Primitives": "4.0.1",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.Primitives": "4.0.11",
-        "System.Resources.ResourceManager": "4.0.1",
-        "System.Runtime": "4.1.0",
-        "System.Runtime.Extensions": "4.1.0",
-        "System.Runtime.Handles": "4.0.1",
-        "System.Runtime.InteropServices": "4.1.0",
-        "System.Security.Principal.Windows": "4.0.0",
-        "System.Threading": "4.0.11",
-        "System.Threading.Overlapped": "4.0.1",
-        "System.Threading.Tasks": "4.0.11",
-        "System.Threading.ThreadPool": "4.0.10"
+        "System.Collections": "4.3.0-beta-24522-03",
+        "System.Diagnostics.Debug": "4.3.0-beta-24522-03",
+        "System.Diagnostics.Tracing": "4.3.0-beta-24522-03",
+        "System.Globalization": "4.3.0-beta-24522-03",
+        "System.IO": "4.3.0-beta-24522-03",
+        "System.IO.FileSystem": "4.3.0-beta-24522-03",
+        "System.IO.FileSystem.Primitives": "4.3.0-beta-24522-03",
+        "System.Net.NameResolution": "4.3.0-beta-24522-03",
+        "System.Net.Primitives": "4.3.0-beta-24522-03",
+        "System.Resources.ResourceManager": "4.3.0-beta-24522-03",
+        "System.Runtime": "4.3.0-beta-24522-03",
+        "System.Runtime.Extensions": "4.3.0-beta-24522-03",
+        "System.Runtime.Handles": "4.3.0-beta-24522-03",
+        "System.Runtime.InteropServices": "4.3.0-beta-24522-03",
+        "System.Security.Principal.Windows": "4.3.0-beta-24522-03",
+        "System.Threading": "4.3.0-beta-24522-03",
+        "System.Threading.Overlapped": "4.3.0-beta-24522-03",
+        "System.Threading.Tasks": "4.3.0-beta-24522-03",
+        "System.Threading.ThreadPool": "4.3.0-beta-24522-03"
       }
     }
   }

From 8a3027ddb13aa40e10a4f16563aeaf44b04abf9e Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Thu, 29 Sep 2016 15:09:22 -0700
Subject: [PATCH 04/10] Fix NetworkStream overrides

---
 .../src/System.Net.Sockets.csproj             | 21 ++++++++-----------
 .../src/System/Net/Sockets/NetworkStream.cs   | 12 +++++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
index f7f44c0d1914..26d15e738952 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -12,17 +12,12 @@
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
     <AssemblyVersion Condition="'$(TargetGroup)' == 'netcore50'">4.1.1.0</AssemblyVersion>
+    <DefineConstants Condition="'$(TargetGroup)'=='netcore50'">$(DefineConstants);netcore50</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == ''">
     <ProjectJson>win/project.json</ProjectJson>
     <ProjectLockJson>win/project.lock.json</ProjectLockJson>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(EnableWinRT)' != 'true'">
-    <DefineConstants>$(DefineConstants);FEATURE_CORECLR</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(EnableWinRT)' == 'true'">
-    <DefineConstants>$(DefineConstants);NETNATIVE</DefineConstants>
-  </PropertyGroup>
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix_Release|AnyCPU'" />
@@ -160,12 +155,6 @@
       <Link>Common\System\Net\Sockets\SocketType.cs</Link>
     </Compile>
     <!-- Common -->
-    <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleMinusOneIsInvalid.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleMinusOneIsInvalid.cs</Link>
-    </Compile>
     <Compile Include="$(CommonPath)\System\Threading\Tasks\TaskToApm.cs">
       <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
     </Compile>
@@ -442,6 +431,14 @@
       <Link>Interop\Unix\System.Native\Interop.Write.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)'=='netcore50'">
+    <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs">
+      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleMinusOneIsInvalid.cs">
+      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleMinusOneIsInvalid.cs</Link>
+    </Compile>
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'net463'">
     <!-- .NET Framework -->
     <TargetingPackReference Include="mscorlib" />
diff --git a/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs b/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs
index 128dd7b54bd6..dc2f8abb6fac 100644
--- a/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs
+++ b/src/System.Net.Sockets/src/System/Net/Sockets/NetworkStream.cs
@@ -614,6 +614,9 @@ internal bool Connected
         // Returns:
         // 
         //     An IASyncResult, representing the read.
+#if !netcore50
+        override
+#endif
         public IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, Object state)
         {
 #if DEBUG
@@ -727,6 +730,9 @@ internal virtual IAsyncResult UnsafeBeginRead(byte[] buffer, int offset, int siz
         // Returns:
         // 
         //     The number of bytes read. May throw an exception.
+#if !netcore50
+        override
+#endif
         public int EndRead(IAsyncResult asyncResult)
         {
 #if DEBUG
@@ -785,6 +791,9 @@ public int EndRead(IAsyncResult asyncResult)
         // Returns:
         // 
         //     An IASyncResult, representing the write.
+#if !netcore50
+        override
+#endif
         public IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, Object state)
         {
 #if DEBUG
@@ -908,6 +917,9 @@ internal virtual IAsyncResult UnsafeBeginWrite(byte[] buffer, int offset, int si
         // This method is called when an async write is completed. All we
         // do is call through to the core socket EndSend functionality.
         // Returns:  The number of bytes read. May throw an exception.
+#if !netcore50
+        override
+#endif
         public void EndWrite(IAsyncResult asyncResult)
         {
 #if DEBUG

From 096e2b49d0188c8cd20dc1043dd284db0236bb86 Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Thu, 29 Sep 2016 15:11:09 -0700
Subject: [PATCH 05/10] Fix serialization attributes

---
 .../src/System/Net/Sockets/SocketInformation.cs       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/System.Net.Sockets/src/System/Net/Sockets/SocketInformation.cs b/src/System.Net.Sockets/src/System/Net/Sockets/SocketInformation.cs
index 520a647bf6da..a6431731d666 100644
--- a/src/System.Net.Sockets/src/System/Net/Sockets/SocketInformation.cs
+++ b/src/System.Net.Sockets/src/System/Net/Sockets/SocketInformation.cs
@@ -3,16 +3,23 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+#if !netcore50
+using System.Runtime.Serialization;
+#endif
 
 namespace System.Net.Sockets
 {
-    //[Serializable]
+#if !netcore50
+    [Serializable]
+#endif
     public struct SocketInformation
     {
         private byte[] _protocolInformation;
         private SocketInformationOptions _options;
 
-        //[OptionalField]
+#if !netcore50
+        [OptionalField]
+#endif
         private EndPoint _remoteEndPoint;
 
         public byte[] ProtocolInformation

From 52b01296a8bf118f0a0ff629675ade79c0e0f3f7 Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Thu, 29 Sep 2016 16:05:23 -0700
Subject: [PATCH 06/10] Move tests to netstandard1.7

---
 src/System.Net.Sockets/System.Net.Sockets.sln | 20 +++++++++----------
 .../System.Net.Sockets.Tests.csproj           |  7 ++++++-
 .../tests/FunctionalTests/TcpClientTest.cs    |  6 +++---
 .../tests/FunctionalTests/project.json        |  4 +++-
 .../tests/System.Net.Sockets.Tests.builds     |  7 ++++---
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/System.Net.Sockets/System.Net.Sockets.sln b/src/System.Net.Sockets/System.Net.Sockets.sln
index 66cc1c579ed6..8bc5ff5cd5ea 100644
--- a/src/System.Net.Sockets/System.Net.Sockets.sln
+++ b/src/System.Net.Sockets/System.Net.Sockets.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{89BE5448-6E11-4ABC-87C6-988225002CB3}"
 EndProject
@@ -24,57 +24,57 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 		Unix_Debug|Any CPU = Unix_Debug|Any CPU
 		Unix_Release|Any CPU = Unix_Release|Any CPU
-		Release|Any CPU = Release|Any CPU
 		Windows_Debug|Any CPU = Windows_Debug|Any CPU
 		Windows_Release|Any CPU = Windows_Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Unix_Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Unix_Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Unix_Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Unix_Release|Any CPU.Build.0 = Debug|Any CPU
-		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Windows_Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E212427-18B3-4EF4-966C-ED18AAC08422}.Windows_Release|Any CPU.Build.0 = Debug|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
+		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Unix_Debug|Any CPU.ActiveCfg = Unix_Debug|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Unix_Debug|Any CPU.Build.0 = Unix_Debug|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Unix_Release|Any CPU.ActiveCfg = Unix_Release|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Unix_Release|Any CPU.Build.0 = Unix_Release|Any CPU
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
 		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Unix_Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Unix_Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Unix_Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Unix_Release|Any CPU.Build.0 = Release|Any CPU
-		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Windows_Release|Any CPU.Build.0 = Release|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
+		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
+		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Unix_Debug|Any CPU.ActiveCfg = Windows_Release|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Unix_Debug|Any CPU.Build.0 = Windows_Release|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Unix_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Unix_Release|Any CPU.Build.0 = Windows_Release|Any CPU
-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
-		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
 		{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
diff --git a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index a287b2c0582a..57edaaabd0dd 100644
--- a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <TestTFM Condition="'$(TestTFM)' == ''">netcoreapp1.1</TestTFM>
+  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker>
+    <NugetTargetMoniker Condition="'$(NugetTargetMoniker)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker>
+    <RuntimeTargetMonikers>.NETCoreApp,Version=v1.1</RuntimeTargetMonikers>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -97,6 +101,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\System.Security.Principal.Windows\pkg\System.Security.Principal.Windows.pkgproj" />
     <ProjectReference Include="..\..\pkg\System.Net.Sockets.pkgproj">
       <Project>{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}</Project>
       <Name>System.Net.Sockets</Name>
diff --git a/src/System.Net.Sockets/tests/FunctionalTests/TcpClientTest.cs b/src/System.Net.Sockets/tests/FunctionalTests/TcpClientTest.cs
index 0ef07a55ff62..b1bca4252a08 100644
--- a/src/System.Net.Sockets/tests/FunctionalTests/TcpClientTest.cs
+++ b/src/System.Net.Sockets/tests/FunctionalTests/TcpClientTest.cs
@@ -33,8 +33,8 @@ public async Task Connect_DnsEndPoint_Success(int mode)
             {
                 Assert.False(client.Connected);
 
-                string host = Configuration.Sockets.SocketServer.IdnHost;
-                int port = Configuration.Sockets.SocketServer.Port;
+                string host = System.Net.Test.Common.Configuration.Sockets.SocketServer.IdnHost;
+                int port = System.Net.Test.Common.Configuration.Sockets.SocketServer.Port;
 
                 if (mode == 0)
                 {
@@ -237,7 +237,7 @@ public async Task Properties_PersistAfterConnect()
                 client.ReceiveTimeout = 42;
                 client.SendTimeout = 84;
 
-                await client.ConnectAsync(Configuration.Sockets.SocketServer.IdnHost, Configuration.Sockets.SocketServer.Port);
+                await client.ConnectAsync(System.Net.Test.Common.Configuration.Sockets.SocketServer.IdnHost, System.Net.Test.Common.Configuration.Sockets.SocketServer.Port);
 
                 // Verify their values remain as were set before connecting
                 Assert.True(client.LingerState.Enabled);
diff --git a/src/System.Net.Sockets/tests/FunctionalTests/project.json b/src/System.Net.Sockets/tests/FunctionalTests/project.json
index 9824ecb9f89f..ef068117e87e 100644
--- a/src/System.Net.Sockets/tests/FunctionalTests/project.json
+++ b/src/System.Net.Sockets/tests/FunctionalTests/project.json
@@ -24,10 +24,12 @@
     "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00830-02"
   },
   "frameworks": {
-    "netstandard1.3": {}
+    "netstandard1.3": {},
+    "netstandard1.7": {}
   },
   "supports": {
     "coreFx.Test.netcoreapp1.0": {},
+    "coreFx.Test.netcoreapp1.1": {},
     "coreFx.Test.net46": {},
     "coreFx.Test.net461": {},
     "coreFx.Test.net462": {},
diff --git a/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
index 24f8c6f7e1c9..05da64834130 100644
--- a/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
+++ b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
@@ -3,11 +3,12 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj">
-      <TestTFMs>netcoreapp1.0;net46</TestTFMs>
-      <OSGroup>Windows_NT</OSGroup>
+      <TargetGroup>netstandard1.7</TargetGroup>
+      <TestTFMs>netcoreapp1.1</TestTFMs>
     </Project>
     <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj">
-      <OSGroup>Unix</OSGroup>
+      <TestTFMs>net463</TestTFMs>
+      <OSGroup>Windows_NT</OSGroup>
     </Project>
     <Project Include="PerformanceTests\System.Net.Sockets.Async.Performance.Tests.csproj">
       <TestTFMs>netcore50;netcoreapp1.0;net46</TestTFMs>

From b5dcfd3c717efa9ea1ed7d846e3a8d928b7d50b9 Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Fri, 30 Sep 2016 12:33:11 -0700
Subject: [PATCH 07/10] Update versions in project.json

---
 src/System.Net.Sockets/src/project.json     | 36 +++++++++----------
 src/System.Net.Sockets/src/win/project.json | 38 ++++++++++-----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json
index 25724f8350ae..127f0252a956 100644
--- a/src/System.Net.Sockets/src/project.json
+++ b/src/System.Net.Sockets/src/project.json
@@ -2,24 +2,24 @@
   "frameworks": {
     "netstandard1.7": {
       "dependencies": {
-        "System.Collections": "4.3.0-beta-24522-03",
-        "System.Diagnostics.Debug": "4.3.0-beta-24522-03",
-        "System.Diagnostics.Tracing": "4.3.0-beta-24522-03",
-        "System.Globalization": "4.3.0-beta-24522-03",
-        "System.IO": "4.3.0-beta-24522-03",
-        "System.IO.FileSystem": "4.3.0-beta-24522-03",
-        "System.IO.FileSystem.Primitives": "4.3.0-beta-24522-03",
-        "System.Net.NameResolution": "4.3.0-beta-24522-03",
-        "System.Net.Primitives": "4.3.0-beta-24522-03",
-        "System.Resources.ResourceManager": "4.3.0-beta-24522-03",
-        "System.Runtime": "4.3.0-beta-24522-03",
-        "System.Runtime.Extensions": "4.3.0-beta-24522-03",
-        "System.Runtime.Handles": "4.3.0-beta-24522-03",
-        "System.Runtime.InteropServices": "4.3.0-beta-24522-03",
-        "System.Security.Principal.Windows": "4.3.0-beta-24522-03",
-        "System.Threading": "4.3.0-beta-24522-03",
-        "System.Threading.Tasks": "4.3.0-beta-24522-03",
-        "System.Threading.ThreadPool": "4.3.0-beta-24522-03"
+        "System.Collections": "4.3.0-beta-24530-01",
+        "System.Diagnostics.Debug": "4.3.0-beta-24530-01",
+        "System.Diagnostics.Tracing": "4.3.0-beta-24530-01",
+        "System.Globalization": "4.3.0-beta-24530-01",
+        "System.IO": "4.3.0-beta-24530-01",
+        "System.IO.FileSystem": "4.3.0-beta-24530-01",
+        "System.IO.FileSystem.Primitives": "4.3.0-beta-24530-01",
+        "System.Net.NameResolution": "4.3.0-beta-24530-01",
+        "System.Net.Primitives": "4.3.0-beta-24530-01",
+        "System.Resources.ResourceManager": "4.3.0-beta-24530-01",
+        "System.Runtime": "4.3.0-beta-24530-01",
+        "System.Runtime.Extensions": "4.3.0-beta-24530-01",
+        "System.Runtime.Handles": "4.3.0-beta-24530-01",
+        "System.Runtime.InteropServices": "4.3.0-beta-24530-01",
+        "System.Security.Principal.Windows": "4.3.0-beta-24530-01",
+        "System.Threading": "4.3.0-beta-24530-01",
+        "System.Threading.Tasks": "4.3.0-beta-24530-01",
+        "System.Threading.ThreadPool": "4.3.0-beta-24530-01"
       }
     },
     "net463": {
diff --git a/src/System.Net.Sockets/src/win/project.json b/src/System.Net.Sockets/src/win/project.json
index 4ce7a9781f60..bd1829882588 100644
--- a/src/System.Net.Sockets/src/win/project.json
+++ b/src/System.Net.Sockets/src/win/project.json
@@ -2,25 +2,25 @@
   "frameworks": {
     "netstandard1.7": {
       "dependencies": {
-        "System.Collections": "4.3.0-beta-24522-03",
-        "System.Diagnostics.Debug": "4.3.0-beta-24522-03",
-        "System.Diagnostics.Tracing": "4.3.0-beta-24522-03",
-        "System.Globalization": "4.3.0-beta-24522-03",
-        "System.IO": "4.3.0-beta-24522-03",
-        "System.IO.FileSystem": "4.3.0-beta-24522-03",
-        "System.IO.FileSystem.Primitives": "4.3.0-beta-24522-03",
-        "System.Net.NameResolution": "4.3.0-beta-24522-03",
-        "System.Net.Primitives": "4.3.0-beta-24522-03",
-        "System.Resources.ResourceManager": "4.3.0-beta-24522-03",
-        "System.Runtime": "4.3.0-beta-24522-03",
-        "System.Runtime.Extensions": "4.3.0-beta-24522-03",
-        "System.Runtime.Handles": "4.3.0-beta-24522-03",
-        "System.Runtime.InteropServices": "4.3.0-beta-24522-03",
-        "System.Security.Principal.Windows": "4.3.0-beta-24522-03",
-        "System.Threading": "4.3.0-beta-24522-03",
-        "System.Threading.Overlapped": "4.3.0-beta-24522-03",
-        "System.Threading.Tasks": "4.3.0-beta-24522-03",
-        "System.Threading.ThreadPool": "4.3.0-beta-24522-03"
+        "System.Collections": "4.3.0-beta-24530-01",
+        "System.Diagnostics.Debug": "4.3.0-beta-24530-01",
+        "System.Diagnostics.Tracing": "4.3.0-beta-24530-01",
+        "System.Globalization": "4.3.0-beta-24530-01",
+        "System.IO": "4.3.0-beta-24530-01",
+        "System.IO.FileSystem": "4.3.0-beta-24530-01",
+        "System.IO.FileSystem.Primitives": "4.3.0-beta-24530-01",
+        "System.Net.NameResolution": "4.3.0-beta-24530-01",
+        "System.Net.Primitives": "4.3.0-beta-24530-01",
+        "System.Resources.ResourceManager": "4.3.0-beta-24530-01",
+        "System.Runtime": "4.3.0-beta-24530-01",
+        "System.Runtime.Extensions": "4.3.0-beta-24530-01",
+        "System.Runtime.Handles": "4.3.0-beta-24530-01",
+        "System.Runtime.InteropServices": "4.3.0-beta-24530-01",
+        "System.Security.Principal.Windows": "4.3.0-beta-24530-01",
+        "System.Threading": "4.3.0-beta-24530-01",
+        "System.Threading.Overlapped": "4.3.0-beta-24530-01",
+        "System.Threading.Tasks": "4.3.0-beta-24530-01",
+        "System.Threading.ThreadPool": "4.3.0-beta-24530-01"
       }
     }
   }

From 533430214ee967ea30a76fbc922d69714ab1c89f Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Mon, 3 Oct 2016 09:07:57 -0700
Subject: [PATCH 08/10] Fix project.json refs

---
 src/System.Net.Sockets/src/project.json     | 36 +++++++++----------
 src/System.Net.Sockets/src/win/project.json | 38 ++++++++++-----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json
index 127f0252a956..c4858a583e83 100644
--- a/src/System.Net.Sockets/src/project.json
+++ b/src/System.Net.Sockets/src/project.json
@@ -2,24 +2,24 @@
   "frameworks": {
     "netstandard1.7": {
       "dependencies": {
-        "System.Collections": "4.3.0-beta-24530-01",
-        "System.Diagnostics.Debug": "4.3.0-beta-24530-01",
-        "System.Diagnostics.Tracing": "4.3.0-beta-24530-01",
-        "System.Globalization": "4.3.0-beta-24530-01",
-        "System.IO": "4.3.0-beta-24530-01",
-        "System.IO.FileSystem": "4.3.0-beta-24530-01",
-        "System.IO.FileSystem.Primitives": "4.3.0-beta-24530-01",
-        "System.Net.NameResolution": "4.3.0-beta-24530-01",
-        "System.Net.Primitives": "4.3.0-beta-24530-01",
-        "System.Resources.ResourceManager": "4.3.0-beta-24530-01",
-        "System.Runtime": "4.3.0-beta-24530-01",
-        "System.Runtime.Extensions": "4.3.0-beta-24530-01",
-        "System.Runtime.Handles": "4.3.0-beta-24530-01",
-        "System.Runtime.InteropServices": "4.3.0-beta-24530-01",
-        "System.Security.Principal.Windows": "4.3.0-beta-24530-01",
-        "System.Threading": "4.3.0-beta-24530-01",
-        "System.Threading.Tasks": "4.3.0-beta-24530-01",
-        "System.Threading.ThreadPool": "4.3.0-beta-24530-01"
+        "System.Collections": "4.3.0-beta-24601-02",
+        "System.Diagnostics.Debug": "4.3.0-beta-24601-02",
+        "System.Diagnostics.Tracing": "4.3.0-beta-24601-02",
+        "System.Globalization": "4.3.0-beta-24601-02",
+        "System.IO": "4.3.0-beta-24601-02",
+        "System.IO.FileSystem": "4.3.0-beta-24601-02",
+        "System.IO.FileSystem.Primitives": "4.3.0-beta-24601-02",
+        "System.Net.NameResolution": "4.3.0-beta-24601-02",
+        "System.Net.Primitives": "4.3.0-beta-24601-02",
+        "System.Resources.ResourceManager": "4.3.0-beta-24601-02",
+        "System.Runtime": "4.3.0-beta-24601-02",
+        "System.Runtime.Extensions": "4.3.0-beta-24601-02",
+        "System.Runtime.Handles": "4.3.0-beta-24601-02",
+        "System.Runtime.InteropServices": "4.3.0-beta-24601-02",
+        "System.Security.Principal.Windows": "4.3.0-beta-24601-02",
+        "System.Threading": "4.3.0-beta-24601-02",
+        "System.Threading.Tasks": "4.3.0-beta-24601-02",
+        "System.Threading.ThreadPool": "4.3.0-beta-24601-02"
       }
     },
     "net463": {
diff --git a/src/System.Net.Sockets/src/win/project.json b/src/System.Net.Sockets/src/win/project.json
index bd1829882588..25fd1021c8d1 100644
--- a/src/System.Net.Sockets/src/win/project.json
+++ b/src/System.Net.Sockets/src/win/project.json
@@ -2,25 +2,25 @@
   "frameworks": {
     "netstandard1.7": {
       "dependencies": {
-        "System.Collections": "4.3.0-beta-24530-01",
-        "System.Diagnostics.Debug": "4.3.0-beta-24530-01",
-        "System.Diagnostics.Tracing": "4.3.0-beta-24530-01",
-        "System.Globalization": "4.3.0-beta-24530-01",
-        "System.IO": "4.3.0-beta-24530-01",
-        "System.IO.FileSystem": "4.3.0-beta-24530-01",
-        "System.IO.FileSystem.Primitives": "4.3.0-beta-24530-01",
-        "System.Net.NameResolution": "4.3.0-beta-24530-01",
-        "System.Net.Primitives": "4.3.0-beta-24530-01",
-        "System.Resources.ResourceManager": "4.3.0-beta-24530-01",
-        "System.Runtime": "4.3.0-beta-24530-01",
-        "System.Runtime.Extensions": "4.3.0-beta-24530-01",
-        "System.Runtime.Handles": "4.3.0-beta-24530-01",
-        "System.Runtime.InteropServices": "4.3.0-beta-24530-01",
-        "System.Security.Principal.Windows": "4.3.0-beta-24530-01",
-        "System.Threading": "4.3.0-beta-24530-01",
-        "System.Threading.Overlapped": "4.3.0-beta-24530-01",
-        "System.Threading.Tasks": "4.3.0-beta-24530-01",
-        "System.Threading.ThreadPool": "4.3.0-beta-24530-01"
+        "System.Collections": "4.3.0-beta-24601-02",
+        "System.Diagnostics.Debug": "4.3.0-beta-24601-02",
+        "System.Diagnostics.Tracing": "4.3.0-beta-24601-02",
+        "System.Globalization": "4.3.0-beta-24601-02",
+        "System.IO": "4.3.0-beta-24601-02",
+        "System.IO.FileSystem": "4.3.0-beta-24601-02",
+        "System.IO.FileSystem.Primitives": "4.3.0-beta-24601-02",
+        "System.Net.NameResolution": "4.3.0-beta-24601-02",
+        "System.Net.Primitives": "4.3.0-beta-24601-02",
+        "System.Resources.ResourceManager": "4.3.0-beta-24601-02",
+        "System.Runtime": "4.3.0-beta-24601-02",
+        "System.Runtime.Extensions": "4.3.0-beta-24601-02",
+        "System.Runtime.Handles": "4.3.0-beta-24601-02",
+        "System.Runtime.InteropServices": "4.3.0-beta-24601-02",
+        "System.Security.Principal.Windows": "4.3.0-beta-24601-02",
+        "System.Threading": "4.3.0-beta-24601-02",
+        "System.Threading.Overlapped": "4.3.0-beta-24601-02",
+        "System.Threading.Tasks": "4.3.0-beta-24601-02",
+        "System.Threading.ThreadPool": "4.3.0-beta-24601-02"
       }
     }
   }

From d991f1f163ce97535c817f0fa99f10d3e839430d Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Mon, 3 Oct 2016 09:11:27 -0700
Subject: [PATCH 09/10] Make considition formatting consistent

---
 src/System.Net.Sockets/src/System.Net.Sockets.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
index 26d15e738952..13a83f7700f9 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -12,7 +12,7 @@
     <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.7</NuGetTargetMoniker>
     <AssemblyVersion Condition="'$(TargetGroup)' == 'netcore50'">4.1.1.0</AssemblyVersion>
-    <DefineConstants Condition="'$(TargetGroup)'=='netcore50'">$(DefineConstants);netcore50</DefineConstants>
+    <DefineConstants Condition="'$(TargetGroup)' == 'netcore50'">$(DefineConstants);netcore50</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetsWindows)' == 'true' AND '$(TargetGroup)' == ''">
     <ProjectJson>win/project.json</ProjectJson>
@@ -431,7 +431,7 @@
       <Link>Interop\Unix\System.Native\Interop.Write.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)'=='netcore50'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'netcore50'">
     <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs">
       <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs</Link>
     </Compile>

From 943ab9f72668bb157d48ac67dc8460bf9ba24714 Mon Sep 17 00:00:00 2001
From: Eric Eilebrecht <ericeil@microsoft.com>
Date: Mon, 3 Oct 2016 10:35:49 -0700
Subject: [PATCH 10/10] Update projects to account for recent changes elsewhere

---
 .../tests/FunctionalTests/System.Net.Sockets.Tests.csproj  | 7 ++-----
 .../tests/System.Net.Sockets.Tests.builds                  | 5 +----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index 57edaaabd0dd..6a06d446df45 100644
--- a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <TestTFM Condition="'$(TestTFM)' == ''">netcoreapp1.1</TestTFM>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
     <ProjectGuid>{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <NugetTargetMoniker Condition="'$(NugetTargetMoniker)'==''">.NETStandard,Version=v1.7</NugetTargetMoniker>
+    <NugetTargetMoniker Condition="'$(NugetTargetMoniker)' == ''">.NETStandard,Version=v1.7</NugetTargetMoniker>
     <RuntimeTargetMonikers>.NETCoreApp,Version=v1.1</RuntimeTargetMonikers>
   </PropertyGroup>
   <!-- Help VS understand available configurations -->
diff --git a/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
index 05da64834130..7e8e87e6b5bd 100644
--- a/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
+++ b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
@@ -2,10 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj">
-      <TargetGroup>netstandard1.7</TargetGroup>
-      <TestTFMs>netcoreapp1.1</TestTFMs>
-    </Project>
+    <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj"/>
     <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj">
       <TestTFMs>net463</TestTFMs>
       <OSGroup>Windows_NT</OSGroup>