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/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/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 @@
- net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)
+ net463;netcoreapp1.1;$(AllXamarinFrameworks)
- net46
+ net463
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 @@
Library
- .NETStandard,Version=v1.3
+ .NETStandard,Version=v1.7
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..4a76f4d2d4af 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.builds
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.builds
@@ -9,7 +9,7 @@
Windows_NT
- net46
+ net463
Windows_NT
diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
index 698e1bbce067..13a83f7700f9 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -9,19 +9,15 @@
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}
true
true
- true
- .NETStandard,Version=v1.3
+ true
+ .NETStandard,Version=v1.7
+ 4.1.1.0
+ $(DefineConstants);netcore50
win/project.json
win/project.lock.json
-
- $(DefineConstants);FEATURE_CORECLR
-
-
- $(DefineConstants);NETNATIVE
-
@@ -29,8 +25,8 @@
-
-
+
+
@@ -43,7 +39,7 @@
-
+
@@ -159,17 +155,11 @@
Common\System\Net\Sockets\SocketType.cs
-
- Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs
-
-
- Common\Microsoft\Win32\SafeHandles\SafeHandleMinusOneIsInvalid.cs
-
Common\System\Threading\Tasks\TaskToApm.cs
-
+
@@ -287,7 +277,7 @@
-
+
Interop\Windows\Winsock\SafeOverlappedFree.cs
@@ -441,7 +431,15 @@
Interop\Unix\System.Native\Interop.Write.cs
-
+
+
+ Common\Microsoft\Win32\SafeHandles\SafeHandleZeroOrMinusOneIsInvalid.cs
+
+
+ Common\Microsoft\Win32\SafeHandles\SafeHandleMinusOneIsInvalid.cs
+
+
+
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
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
diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json
index 5c1292e81e91..c4858a583e83 100644
--- a/src/System.Net.Sockets/src/project.json
+++ b/src/System.Net.Sockets/src/project.json
@@ -1,32 +1,28 @@
{
"frameworks": {
- "netstandard1.3": {
+ "netstandard1.7": {
"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.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.Security.Principal.Windows": "4.0.0",
- "System.Threading": "4.0.10",
- "System.Threading.Tasks": "4.0.10",
- "System.Threading.ThreadPool": "4.0.10"
- },
- "imports": [
- "dotnet5.4"
- ]
+ "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"
+ }
},
- "net46": {
+ "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..25fd1021c8d1 100644
--- a/src/System.Net.Sockets/src/win/project.json
+++ b/src/System.Net.Sockets/src/win/project.json
@@ -1,31 +1,27 @@
{
"frameworks": {
- "netstandard1.3": {
+ "netstandard1.7": {
"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.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.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.ThreadPool": "4.0.10"
- },
- "imports": [
- "dotnet5.4"
- ]
+ "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"
+ }
}
}
}
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..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
@@ -3,10 +3,11 @@
Debug
- AnyCPU
+ AnyCPU
{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}
Library
- .NETStandard,Version=v1.3
+ .NETStandard,Version=v1.7
+ .NETCoreApp,Version=v1.1
@@ -97,6 +98,7 @@
+
{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}
System.Net.Sockets
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..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,13 +2,11 @@
+
- netcoreapp1.0;net46
+ net463
Windows_NT
-
- Unix
-
netcore50;netcoreapp1.0;net46
Windows_NT