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

Bump test projects up to .NET 4.5.2 

- aspnet/Testing#248
- xUnit no longer supports .NET 4.5.1
- build tests for desktop .NET only on Windows
This commit is contained in:
Doug Bunting 2017-02-14 09:11:07 -08:00
parent bad8bc945a
commit d35e4c9550
10 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/HttpsTests.cs
View File

@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
private async Task<string> SendRequestAsync(string uri, private async Task<string> SendRequestAsync(string uri,
X509Certificate cert = null) X509Certificate cert = null)
{ {
#if NET451 #if NET452
var handler = new WebRequestHandler(); var handler = new WebRequestHandler();
#else #else
var handler = new WinHttpHandler(); var handler = new WinHttpHandler();
@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
private async Task<string> SendRequestAsync(string uri, string upload) private async Task<string> SendRequestAsync(string uri, string upload)
{ {
#if NET451 #if NET452
var handler = new WebRequestHandler(); var handler = new WebRequestHandler();
#else #else
var handler = new WinHttpHandler(); var handler = new WinHttpHandler();

4
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/HttpsTests.cs
View File

@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
private async Task<string> SendRequestAsync(string uri, private async Task<string> SendRequestAsync(string uri,
X509Certificate cert = null) X509Certificate cert = null)
{ {
#if NET451 #if NET452
WebRequestHandler handler = new WebRequestHandler(); WebRequestHandler handler = new WebRequestHandler();
#else #else
WinHttpHandler handler = new WinHttpHandler(); WinHttpHandler handler = new WinHttpHandler();
@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
private async Task<string> SendRequestAsync(string uri, string upload) private async Task<string> SendRequestAsync(string uri, string upload)
{ {
#if NET451 #if NET452
WebRequestHandler handler = new WebRequestHandler(); WebRequestHandler handler = new WebRequestHandler();
#else #else
WinHttpHandler handler = new WinHttpHandler(); WinHttpHandler handler = new WinHttpHandler();

2
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/RequestBodyTests.cs
View File

@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
Assert.Equal("Hello World", response); Assert.Equal("Hello World", response);
} }
} }
#if NET451 #if NET452
[ConditionalFact] [ConditionalFact]
public async Task RequestBody_ReadBeginEnd_Success() public async Task RequestBody_ReadBeginEnd_Success()
{ {

6
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs
View File

@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
var context = await server.AcceptAsync(Utilities.DefaultTimeout); var context = await server.AcceptAsync(Utilities.DefaultTimeout);
context.Response.Headers["Content-lenGth"] = " 30 "; context.Response.Headers["Content-lenGth"] = " 30 ";
var stream = context.Response.Body; var stream = context.Response.Body;
#if NET451 #if NET452
stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null)); stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null));
#else #else
await stream.WriteAsync(new byte[10], 0, 10); 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); var writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token);
Assert.True(writeTask.IsCanceled); Assert.True(writeTask.IsCanceled);
context.Dispose(); context.Dispose();
#if NET451 #if NET452
// .NET 4.5 HttpClient automatically retries a request if it does not get a response. // .NET 4.5 HttpClient automatically retries a request if it does not get a response.
context = await server.AcceptAsync(Utilities.DefaultTimeout); context = await server.AcceptAsync(Utilities.DefaultTimeout);
cts = new CancellationTokenSource(); 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); var writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token);
Assert.True(writeTask.IsCanceled); Assert.True(writeTask.IsCanceled);
context.Dispose(); context.Dispose();
#if NET451 #if NET452
// .NET 4.5 HttpClient automatically retries a request if it does not get a response. // .NET 4.5 HttpClient automatically retries a request if it does not get a response.
context = await server.AcceptAsync(Utilities.DefaultTimeout); context = await server.AcceptAsync(Utilities.DefaultTimeout);
cts = new CancellationTokenSource(); cts = new CancellationTokenSource();

4
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
View File

@ -362,7 +362,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
var writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token); var writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token);
Assert.True(writeTask.IsCanceled); Assert.True(writeTask.IsCanceled);
context.Dispose(); context.Dispose();
#if NET451 #if NET452
// .NET 4.5 HttpClient automatically retries a request if it does not get a response. // .NET 4.5 HttpClient automatically retries a request if it does not get a response.
context = await server.AcceptAsync(Utilities.DefaultTimeout); context = await server.AcceptAsync(Utilities.DefaultTimeout);
cts = new CancellationTokenSource(); cts = new CancellationTokenSource();
@ -391,7 +391,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
var writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token); var writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token);
Assert.True(writeTask.IsCanceled); Assert.True(writeTask.IsCanceled);
context.Dispose(); context.Dispose();
#if NET451 #if NET452
// .NET 4.5 HttpClient automatically retries a request if it does not get a response. // .NET 4.5 HttpClient automatically retries a request if it does not get a response.
context = await server.AcceptAsync(Utilities.DefaultTimeout); context = await server.AcceptAsync(Utilities.DefaultTimeout);
cts = new CancellationTokenSource(); cts = new CancellationTokenSource();

2
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/SkipOffDomainAttribute.cs
View File

@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
{ {
try try
{ {
#if NET451 #if NET452
return !string.IsNullOrEmpty(System.DirectoryServices.ActiveDirectory.Domain.GetComputerDomain().Name); return !string.IsNullOrEmpty(System.DirectoryServices.ActiveDirectory.Domain.GetComputerDomain().Name);
#endif #endif
} }

2
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/Utilities.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
{ {
var win8Version = new Version(6, 2); var win8Version = new Version(6, 2);
#if NET451 #if NET452
IsWin8orLater = (Environment.OSVersion.Version >= win8Version); IsWin8orLater = (Environment.OSVersion.Version >= win8Version);
#else #else
IsWin8orLater = (new Version(RuntimeEnvironment.OperatingSystemVersion) >= win8Version); IsWin8orLater = (new Version(RuntimeEnvironment.OperatingSystemVersion) >= win8Version);

5
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" /> <Import Project="..\..\build\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.HttpSys\Microsoft.AspNetCore.Server.HttpSys.csproj" /> <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.HttpSys\Microsoft.AspNetCore.Server.HttpSys.csproj" />
@ -10,7 +11,7 @@
<PackageReference Include="xunit" Version="2.2.0-*" /> <PackageReference Include="xunit" Version="2.2.0-*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.DirectoryServices" /> <Reference Include="System.DirectoryServices" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.Net.Http.WebRequest" />

4
test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs
View File

@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
{ {
httpContext.Response.Headers["Content-lenGth"] = " 30 "; httpContext.Response.Headers["Content-lenGth"] = " 30 ";
Stream stream = httpContext.Response.Body; Stream stream = httpContext.Response.Body;
#if NET451 #if NET452
stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null)); stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null));
#else #else
await stream.WriteAsync(new byte[10], 0, 10); 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()); Assert.Equal(new byte[10], await response.Content.ReadAsByteArrayAsync());
} }
} }
#if NET451 #if NET452
[ConditionalFact] [ConditionalFact]
public async Task ResponseBody_BeginWrite_TriggersOnStarting() public async Task ResponseBody_BeginWrite_TriggersOnStarting()
{ {

3
test/Microsoft.AspNetCore.Server.HttpSys.Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj
View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" /> <Import Project="..\..\build\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.HttpSys\Microsoft.AspNetCore.Server.HttpSys.csproj" /> <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.HttpSys\Microsoft.AspNetCore.Server.HttpSys.csproj" />