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

Default to the managed socket transport (#2392)

This commit is contained in:
Stephen Halter 2018-03-14 11:50:10 -07:00 committed by GitHub
parent 04eef791bc
commit 9901f0f3e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/SampleApp/SampleApp.csproj
View File

@ -9,6 +9,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Kestrel\Kestrel.csproj" /> <ProjectReference Include="..\..\src\Kestrel\Kestrel.csproj" />
<ProjectReference Include="..\..\src\Kestrel.Https\Kestrel.Https.csproj" /> <ProjectReference Include="..\..\src\Kestrel.Https\Kestrel.Https.csproj" />
<ProjectReference Include="..\..\src\Kestrel.Transport.Libuv\Kestrel.Transport.Libuv.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
samples/SystemdTestApp/SystemdTestApp.csproj
View File

@ -8,6 +8,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Kestrel\Kestrel.csproj" /> <ProjectReference Include="..\..\src\Kestrel\Kestrel.csproj" />
<ProjectReference Include="..\..\src\Kestrel.Transport.Libuv\Kestrel.Transport.Libuv.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
src/Kestrel/Kestrel.csproj
View File

@ -17,9 +17,6 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Kestrel.Core\Kestrel.Core.csproj" /> <ProjectReference Include="..\Kestrel.Core\Kestrel.Core.csproj" />
<ProjectReference Include="..\Kestrel.Https\Kestrel.Https.csproj" /> <ProjectReference Include="..\Kestrel.Https\Kestrel.Https.csproj" />
<!-- Even though the Libuv transport is no longer used by default, it remains for back-compat -->
<ProjectReference Include="..\Kestrel.Transport.Libuv\Kestrel.Transport.Libuv.csproj" />
<ProjectReference Include="..\Kestrel.Transport.Sockets\Kestrel.Transport.Sockets.csproj" /> <ProjectReference Include="..\Kestrel.Transport.Sockets\Kestrel.Transport.Sockets.csproj" />
</ItemGroup> </ItemGroup>

4
src/Kestrel/WebHostBuilderKestrelExtensions.cs
View File

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv; using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Hosting
return hostBuilder.ConfigureServices(services => return hostBuilder.ConfigureServices(services =>
{ {
// Don't override an already-configured transport // Don't override an already-configured transport
services.TryAddSingleton<ITransportFactory, LibuvTransportFactory>(); services.TryAddSingleton<ITransportFactory, SocketTransportFactory>();
services.AddTransient<IConfigureOptions<KestrelServerOptions>, KestrelServerOptionsSetup>(); services.AddTransient<IConfigureOptions<KestrelServerOptions>, KestrelServerOptionsSetup>();
services.AddSingleton<IServer, KestrelServer>(); services.AddSingleton<IServer, KestrelServer>();

1
test/Kestrel.Tests/Kestrel.Tests.csproj
View File

@ -13,6 +13,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Kestrel\Kestrel.csproj" /> <ProjectReference Include="..\..\src\Kestrel\Kestrel.csproj" />
<ProjectReference Include="..\..\src\Kestrel.Transport.Libuv\Kestrel.Transport.Libuv.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
</ItemGroup> </ItemGroup>

4
test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs
View File

@ -51,13 +51,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests
} }
[Fact] [Fact]
public void LibuvIsTheDefaultTransport() public void SocketTransportIsTheDefault()
{ {
var hostBuilder = new WebHostBuilder() var hostBuilder = new WebHostBuilder()
.UseKestrel() .UseKestrel()
.Configure(app => { }); .Configure(app => { });
Assert.IsType<LibuvTransportFactory>(hostBuilder.Build().Services.GetService<ITransportFactory>()); Assert.IsType<SocketTransportFactory>(hostBuilder.Build().Services.GetService<ITransportFactory>());
} }
[Fact] [Fact]