diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj index a12cabcbec..eb262112bc 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 win7-x64 @@ -26,7 +27,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs index 5d1c96e0f8..ac5bc1b354 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs @@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests await Assert.ThrowsAsync(() => stream.WriteAsync(new byte[1], 0, 1)); } -#if NET451 +#if NET452 [Fact] public void BeginWriteThrows() { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs index 64590151bc..9c791b059d 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests await Assert.ThrowsAsync(() => stream.ReadAsync(new byte[1], 0, 1)); } -#if NET451 +#if NET452 [Fact] public void BeginReadThrows() { diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj b/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj index 500a01e2a1..4ee43ea35b 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 true win7-x64 @@ -24,7 +25,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs index ebc3ebeb22..afa087f430 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/NetworkingTests.cs @@ -131,7 +131,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests var t = Task.Run(async () => { var socket = TestConnection.CreateConnectedLoopbackSocket(port); -#if NET451 +#if NET452 await Task.Factory.FromAsync( socket.BeginSend, socket.EndSend, @@ -205,7 +205,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests var t = Task.Run(async () => { var socket = TestConnection.CreateConnectedLoopbackSocket(port); -#if NET451 +#if NET452 await Task.Factory.FromAsync( socket.BeginSend, socket.EndSend, @@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests var buffer = new ArraySegment(new byte[2048]); while (true) { -#if NET451 +#if NET452 var count = await Task.Factory.FromAsync( socket.BeginReceive, socket.EndReceive, diff --git a/test/shared/TestResources.cs b/test/shared/TestResources.cs index 261b64b43d..64a3161914 100644 --- a/test/shared/TestResources.cs +++ b/test/shared/TestResources.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Testing public static class TestResources { private static readonly string _testCertificatePath = -#if NET451 +#if NET452 Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "testCert.pfx"); #else Path.Combine(AppContext.BaseDirectory, "testCert.pfx");