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

Updating test TFMs for custom test discovery

This commit is contained in:
John Luo 2016-02-18 16:00:59 -08:00
parent e14b86ebe0
commit 99ccae64eb
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
View File

@ -15,7 +15,7 @@
}, },
"imports": "portable-net451+win8" "imports": "portable-net451+win8"
}, },
"dnx451": { "net451": {
"dependencies": { "dependencies": {
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
} }

20
test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs
View File

@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
try try
{ {
#if DNX451 #if NET451
var handler = new HttpClientHandler(); var handler = new HttpClientHandler();
ServicePointManager.ServerCertificateValidationCallback += validationCallback; ServicePointManager.ServerCertificateValidationCallback += validationCallback;
#else #else
@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
finally finally
{ {
#if DNX451 #if NET451
ServicePointManager.ServerCertificateValidationCallback -= validationCallback; ServicePointManager.ServerCertificateValidationCallback -= validationCallback;
#endif #endif
} }
@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
try try
{ {
#if DNX451 #if NET451
var handler = new HttpClientHandler(); var handler = new HttpClientHandler();
ServicePointManager.ServerCertificateValidationCallback += validationCallback; ServicePointManager.ServerCertificateValidationCallback += validationCallback;
#else #else
@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
finally finally
{ {
#if DNX451 #if NET451
ServicePointManager.ServerCertificateValidationCallback -= validationCallback; ServicePointManager.ServerCertificateValidationCallback -= validationCallback;
#endif #endif
} }
@ -144,7 +144,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
try try
{ {
#if DNX451 #if NET451
var handler = new HttpClientHandler(); var handler = new HttpClientHandler();
ServicePointManager.ServerCertificateValidationCallback += validationCallback; ServicePointManager.ServerCertificateValidationCallback += validationCallback;
#else #else
@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
finally finally
{ {
#if DNX451 #if NET451
ServicePointManager.ServerCertificateValidationCallback -= validationCallback; ServicePointManager.ServerCertificateValidationCallback -= validationCallback;
#endif #endif
} }
@ -198,7 +198,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
try try
{ {
#if DNX451 #if NET451
ServicePointManager.ServerCertificateValidationCallback += validationCallback; ServicePointManager.ServerCertificateValidationCallback += validationCallback;
#endif #endif
@ -246,7 +246,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
finally finally
{ {
#if DNX451 #if NET451
ServicePointManager.ServerCertificateValidationCallback -= validationCallback; ServicePointManager.ServerCertificateValidationCallback -= validationCallback;
#endif #endif
} }
@ -264,7 +264,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
try try
{ {
#if DNX451 #if NET451
var handler = new HttpClientHandler(); var handler = new HttpClientHandler();
ServicePointManager.ServerCertificateValidationCallback += validationCallback; ServicePointManager.ServerCertificateValidationCallback += validationCallback;
#else #else
@ -296,7 +296,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
} }
finally finally
{ {
#if DNX451 #if NET451
ServicePointManager.ServerCertificateValidationCallback -= validationCallback; ServicePointManager.ServerCertificateValidationCallback -= validationCallback;
#endif #endif
} }

6
test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs
View File

@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var t = Task.Run(async () => var t = Task.Run(async () =>
{ {
var socket = TestConnection.CreateConnectedLoopbackSocket(port); var socket = TestConnection.CreateConnectedLoopbackSocket(port);
#if DNX451 #if NET451
await Task.Factory.FromAsync( await Task.Factory.FromAsync(
socket.BeginSend, socket.BeginSend,
socket.EndSend, socket.EndSend,
@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var t = Task.Run(async () => var t = Task.Run(async () =>
{ {
var socket = TestConnection.CreateConnectedLoopbackSocket(port); var socket = TestConnection.CreateConnectedLoopbackSocket(port);
#if DNX451 #if NET451
await Task.Factory.FromAsync( await Task.Factory.FromAsync(
socket.BeginSend, socket.BeginSend,
socket.EndSend, socket.EndSend,
@ -220,7 +220,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var buffer = new ArraySegment<byte>(new byte[2048]); var buffer = new ArraySegment<byte>(new byte[2048]);
while (true) while (true)
{ {
#if DNX451 #if NET451
var count = await Task.Factory.FromAsync( var count = await Task.Factory.FromAsync(
socket.BeginReceive, socket.BeginReceive,
socket.EndReceive, socket.EndReceive,

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

@ -21,7 +21,7 @@
}, },
"imports": "portable-net451+win8" "imports": "portable-net451+win8"
}, },
"dnx451": { "net451": {
"dependencies": { "dependencies": {
"xunit.runner.console": "2.1.0" "xunit.runner.console": "2.1.0"
} }