huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update System.Net.Sockets dependency in test project to 4.1.0 

- This only affects the test project
- The Socket.*Async extension methods are available for net46 but not net451
  so we ifdef.
This commit is contained in:
Stephen Halter 2015-10-26 18:57:46 -07:00
parent fe654598f6
commit 777f523135
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/Microsoft.AspNet.Server.KestrelTests/NetworkingTests.cs
View File

@ -92,12 +92,16 @@ namespace Microsoft.AspNet.Server.KestrelTests
AddressFamily.InterNetwork, AddressFamily.InterNetwork,
SocketType.Stream, SocketType.Stream,
ProtocolType.Tcp); ProtocolType.Tcp);
#if DNX451
await Task.Factory.FromAsync( await Task.Factory.FromAsync(
socket.BeginConnect, socket.BeginConnect,
socket.EndConnect, socket.EndConnect,
new IPEndPoint(IPAddress.Loopback, 54321), new IPEndPoint(IPAddress.Loopback, 54321),
null, null,
TaskCreationOptions.None); TaskCreationOptions.None);
#else
await socket.ConnectAsync(new IPEndPoint(IPAddress.Loopback, 54321));
#endif
socket.Dispose(); socket.Dispose();
}); });
loop.Run(); loop.Run();
@ -141,6 +145,7 @@ namespace Microsoft.AspNet.Server.KestrelTests
AddressFamily.InterNetwork, AddressFamily.InterNetwork,
SocketType.Stream, SocketType.Stream,
ProtocolType.Tcp); ProtocolType.Tcp);
#if DNX451
await Task.Factory.FromAsync( await Task.Factory.FromAsync(
socket.BeginConnect, socket.BeginConnect,
socket.EndConnect, socket.EndConnect,
@ -154,6 +159,11 @@ namespace Microsoft.AspNet.Server.KestrelTests
SocketFlags.None, SocketFlags.None,
null, null,
TaskCreationOptions.None); TaskCreationOptions.None);
#else
await socket.ConnectAsync(new IPEndPoint(IPAddress.Loopback, 54321));
await socket.SendAsync(new[] { new ArraySegment<byte>(new byte[] { 1, 2, 3, 4, 5 }) },
SocketFlags.None);
#endif
socket.Dispose(); socket.Dispose();
}); });
loop.Run(); loop.Run();
@ -211,6 +221,7 @@ namespace Microsoft.AspNet.Server.KestrelTests
AddressFamily.InterNetwork, AddressFamily.InterNetwork,
SocketType.Stream, SocketType.Stream,
ProtocolType.Tcp); ProtocolType.Tcp);
#if DNX451
await Task.Factory.FromAsync( await Task.Factory.FromAsync(
socket.BeginConnect, socket.BeginConnect,
socket.EndConnect, socket.EndConnect,
@ -224,10 +235,16 @@ namespace Microsoft.AspNet.Server.KestrelTests
SocketFlags.None, SocketFlags.None,
null, null,
TaskCreationOptions.None); TaskCreationOptions.None);
#else
await socket.ConnectAsync(new IPEndPoint(IPAddress.Loopback, 54321));
await socket.SendAsync(new[] { new ArraySegment<byte>(new byte[] { 1, 2, 3, 4, 5 }) },
SocketFlags.None);
#endif
socket.Shutdown(SocketShutdown.Send); socket.Shutdown(SocketShutdown.Send);
var buffer = new ArraySegment<byte>(new byte[2048]); var buffer = new ArraySegment<byte>(new byte[2048]);
while (true) while (true)
{ {
#if DNX451
var count = await Task.Factory.FromAsync( var count = await Task.Factory.FromAsync(
socket.BeginReceive, socket.BeginReceive,
socket.EndReceive, socket.EndReceive,
@ -235,6 +252,9 @@ namespace Microsoft.AspNet.Server.KestrelTests
SocketFlags.None, SocketFlags.None,
null, null,
TaskCreationOptions.None); TaskCreationOptions.None);
#else
var count = await socket.ReceiveAsync(new[] { buffer }, SocketFlags.None);
#endif
Console.WriteLine("count {0} {1}", Console.WriteLine("count {0} {1}",
count, count,
System.Text.Encoding.ASCII.GetString(buffer.Array, 0, count)); System.Text.Encoding.ASCII.GetString(buffer.Array, 0, count));

2
test/Microsoft.AspNet.Server.KestrelTests/project.json
View File

@ -16,7 +16,7 @@
"dependencies": { "dependencies": {
"System.Diagnostics.TraceSource": "4.0.0-beta-*", "System.Diagnostics.TraceSource": "4.0.0-beta-*",
"System.IO": "4.0.11-beta-*", "System.IO": "4.0.11-beta-*",
"System.Net.Sockets": "4.0.10-beta-*", "System.Net.Sockets": "4.1.0-beta-*",
"System.Runtime.Handles": "4.0.1-beta-*" "System.Runtime.Handles": "4.0.1-beta-*"
} }
} }