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

Re-add .NET Framework to tests and other cleanup (#1494)

This commit is contained in:
Nate McMaster 2017-03-14 11:02:49 -07:00 committed by GitHub
parent b94912bcb1
commit 5073d4fdaf
14 changed files with 48 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/dependencies.props
View File

@ -1,9 +1,14 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion> <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
<CoreFxLabsPipelinesVersion>0.1.0-*</CoreFxLabsPipelinesVersion>
<CoreFxLabsVersion>0.1.0-*</CoreFxLabsVersion>
<CoreFxVersion>4.3.0</CoreFxVersion> <CoreFxVersion>4.3.0</CoreFxVersion>
<LibUvVersion>1.9.1</LibUvVersion> <LibUvVersion>1.9.1</LibUvVersion>
<CoreFxLabsVersion>0.1.0-*</CoreFxLabsVersion> <JsonNetVersion>9.0.1</JsonNetVersion>
<CoreFxLabsPipelinesVersion>0.1.0-*</CoreFxLabsPipelinesVersion> <MoqVersion>4.7.1</MoqVersion>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<TestSdkVersion>15.0.0</TestSdkVersion>
<XunitVersion>2.2.0</XunitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

3
samples/LargeResponseApp/LargeResponseApp.csproj
View File

@ -4,9 +4,6 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks> <TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>

5
samples/SampleApp/SampleApp.csproj
View File

@ -4,9 +4,6 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
<OutputType>Exe</OutputType>
<!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>
@ -19,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj
View File

@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" /> <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

8
src/Microsoft.AspNetCore.Server.Kestrel/Microsoft.AspNetCore.Server.Kestrel.csproj
View File

@ -13,9 +13,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Libuv" Version="$(LibUvVersion)" /> <PackageReference Include="Libuv" Version="$(LibUvVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.2.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" /> <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="System.Numerics.Vectors" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Numerics.Vectors" Version="$(CoreFxVersion)" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(CoreFxVersion)" />
<PackageReference Include="System.IO.Pipelines" Version="$(CoreFxLabsPipelinesVersion)" /> <PackageReference Include="System.IO.Pipelines" Version="$(CoreFxLabsPipelinesVersion)" />
@ -28,4 +28,4 @@
<PackageReference Include="System.Threading.ThreadPool" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Threading.ThreadPool" Version="$(CoreFxVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

28
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
View File

@ -3,10 +3,9 @@
<Import Project="..\..\build\common.props" /> <Import Project="..\..\build\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks> <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
<!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved --> <PlatformTarget Condition="'$(TargetFramework)' == 'net46'">x64</PlatformTarget>
<RuntimeIdentifier Condition="'$(TargetFramework)' != 'netcoreapp1.1'">win7-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -19,19 +18,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.2.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.CodeCoverage" Version="1.0.2" PrivateAssets="All" /> <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" /> <PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="Moq" Version="4.6.36-*" /> <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" /> <PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" /> <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit" Version="2.2.0-*" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Net.Http" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
@ -54,4 +48,4 @@
</PropertyGroup> </PropertyGroup>
</Target> </Target>
</Project> </Project>

2
test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
View File

@ -24,7 +24,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.10.3" /> <PackageReference Include="BenchmarkDotNet" Version="0.10.3" />
<PackageReference Include="Moq" Version="4.6.36-*" /> <PackageReference Include="Moq" Version="$(MoqVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs
View File

@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
await Assert.ThrowsAsync<NotSupportedException>(() => stream.WriteAsync(new byte[1], 0, 1)); await Assert.ThrowsAsync<NotSupportedException>(() => stream.WriteAsync(new byte[1], 0, 1));
} }
#if NET452 #if NET46
[Fact] [Fact]
public void BeginWriteThrows() public void BeginWriteThrows()
{ {

2
test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs
View File

@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
await Assert.ThrowsAsync<NotSupportedException>(() => stream.ReadAsync(new byte[1], 0, 1)); await Assert.ThrowsAsync<NotSupportedException>(() => stream.ReadAsync(new byte[1], 0, 1));
} }
#if NET452 #if NET46
[Fact] [Fact]
public void BeginReadThrows() public void BeginReadThrows()
{ {

23
test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj
View File

@ -3,14 +3,14 @@
<Import Project="..\..\build\common.props" /> <Import Project="..\..\build\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks> <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
<PlatformTarget Condition="'$(TargetFramework)' == 'net46'">x64</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- TODO remove rid when https://github.com/dotnet/sdk/issues/396 is resolved -->
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
<Compile Include="..\shared\**\*.cs" /> <Compile Include="..\shared\**\*.cs" />
<Content Include="..\shared\TestResources\testCert.pfx" CopyToOutputDirectory="PreserveNewest" /> <Content Include="..\shared\TestResources\testCert.pfx" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup> </ItemGroup>
@ -20,20 +20,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.CodeCoverage" Version="1.0.2" PrivateAssets="All" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" /> <PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="Moq" Version="4.6.36-*" /> <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" /> <PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit" Version="2.2.0-*" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Net.Http" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -131,7 +131,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 NET452 #if NET46
await Task.Factory.FromAsync( await Task.Factory.FromAsync(
socket.BeginSend, socket.BeginSend,
socket.EndSend, socket.EndSend,
@ -205,7 +205,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 NET452 #if NET46
await Task.Factory.FromAsync( await Task.Factory.FromAsync(
socket.BeginSend, socket.BeginSend,
socket.EndSend, socket.EndSend,
@ -221,7 +221,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 NET452 #if NET46
var count = await Task.Factory.FromAsync( var count = await Task.Factory.FromAsync(
socket.BeginReceive, socket.BeginReceive,
socket.EndReceive, socket.EndReceive,

4
test/Microsoft.AspNetCore.Server.KestrelTests/xunit.runner.json Normal file
View File

@ -0,0 +1,4 @@
{
"$schema": "http://json.schemastore.org/xunit.runner.schema",
"appDomain": "denied"
}

4
test/shared/TestResources.cs
View File

@ -9,8 +9,8 @@ namespace Microsoft.AspNetCore.Testing
public static class TestResources public static class TestResources
{ {
private static readonly string _testCertificatePath = private static readonly string _testCertificatePath =
#if NET452 #if NET46
Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "testCert.pfx"); Path.Combine(Directory.GetCurrentDirectory(), "testCert.pfx");
#else #else
Path.Combine(AppContext.BaseDirectory, "testCert.pfx"); Path.Combine(AppContext.BaseDirectory, "testCert.pfx");
#endif #endif

4
tools/CodeGenerator/CodeGenerator.csproj
View File

@ -9,8 +9,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.2.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="1.2.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="$(AspNetCoreVersion)" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>