diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/HttpsTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/HttpsTests.cs index 6273a8fcdc..0a240f86fb 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/HttpsTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/HttpsTests.cs @@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys private async Task SendRequestAsync(string uri, X509Certificate cert = null) { -#if NET451 +#if NET452 var handler = new WebRequestHandler(); #else var handler = new WinHttpHandler(); @@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys private async Task SendRequestAsync(string uri, string upload) { -#if NET451 +#if NET452 var handler = new WebRequestHandler(); #else var handler = new WinHttpHandler(); diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/HttpsTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/HttpsTests.cs index c65ada8b93..d2c536ff41 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/HttpsTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/HttpsTests.cs @@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener private async Task SendRequestAsync(string uri, X509Certificate cert = null) { -#if NET451 +#if NET452 WebRequestHandler handler = new WebRequestHandler(); #else WinHttpHandler handler = new WinHttpHandler(); @@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener private async Task SendRequestAsync(string uri, string upload) { -#if NET451 +#if NET452 WebRequestHandler handler = new WebRequestHandler(); #else WinHttpHandler handler = new WinHttpHandler(); diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/RequestBodyTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/RequestBodyTests.cs index 3fca6084c9..e4ff4abaed 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/RequestBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/RequestBodyTests.cs @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener Assert.Equal("Hello World", response); } } -#if NET451 +#if NET452 [ConditionalFact] public async Task RequestBody_ReadBeginEnd_Success() { diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs index fc281ee6d6..fa7705760e 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs @@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener var context = await server.AcceptAsync(Utilities.DefaultTimeout); context.Response.Headers["Content-lenGth"] = " 30 "; var stream = context.Response.Body; -#if NET451 +#if NET452 stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null)); #else await stream.WriteAsync(new byte[10], 0, 10); @@ -282,7 +282,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener var writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#if NET451 +#if NET452 // .NET 4.5 HttpClient automatically retries a request if it does not get a response. context = await server.AcceptAsync(Utilities.DefaultTimeout); cts = new CancellationTokenSource(); @@ -311,7 +311,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener var writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#if NET451 +#if NET452 // .NET 4.5 HttpClient automatically retries a request if it does not get a response. context = await server.AcceptAsync(Utilities.DefaultTimeout); cts = new CancellationTokenSource(); diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs index df3f6ff75d..51967e9699 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs @@ -362,7 +362,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener var writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#if NET451 +#if NET452 // .NET 4.5 HttpClient automatically retries a request if it does not get a response. context = await server.AcceptAsync(Utilities.DefaultTimeout); cts = new CancellationTokenSource(); @@ -391,7 +391,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener var writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token); Assert.True(writeTask.IsCanceled); context.Dispose(); -#if NET451 +#if NET452 // .NET 4.5 HttpClient automatically retries a request if it does not get a response. context = await server.AcceptAsync(Utilities.DefaultTimeout); cts = new CancellationTokenSource(); diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/SkipOffDomainAttribute.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/SkipOffDomainAttribute.cs index 7dc43fabcb..941425bdc3 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/SkipOffDomainAttribute.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/SkipOffDomainAttribute.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener { try { -#if NET451 +#if NET452 return !string.IsNullOrEmpty(System.DirectoryServices.ActiveDirectory.Domain.GetComputerDomain().Name); #endif } diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/Utilities.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/Utilities.cs index a34cd20945..9bcf76d333 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/Utilities.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/Utilities.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener { var win8Version = new Version(6, 2); -#if NET451 +#if NET452 IsWin8orLater = (Environment.OSVersion.Version >= win8Version); #else IsWin8orLater = (new Version(RuntimeEnvironment.OperatingSystemVersion) >= win8Version); diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj index a8aae54342..2d77749960 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj @@ -1,7 +1,8 @@  - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 @@ -10,7 +11,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs index a1bac1ae70..199948dab8 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs @@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys { httpContext.Response.Headers["Content-lenGth"] = " 30 "; Stream stream = httpContext.Response.Body; -#if NET451 +#if NET452 stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null)); #else await stream.WriteAsync(new byte[10], 0, 10); @@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys Assert.Equal(new byte[10], await response.Content.ReadAsByteArrayAsync()); } } -#if NET451 +#if NET452 [ConditionalFact] public async Task ResponseBody_BeginWrite_TriggersOnStarting() { diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj b/test/Microsoft.AspNetCore.Server.HttpSys.Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj index b9e760080a..cc0b1a1396 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj +++ b/test/Microsoft.AspNetCore.Server.HttpSys.Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj @@ -1,7 +1,8 @@  - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1