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

[HttpSys] Move to GenericHost (#24285)

This commit is contained in:
Kahbazi 2020-07-25 09:33:10 +04:30 committed by GitHub
parent b094ecddf0
commit 64b5ea9393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Servers/HttpSys/samples/HotAddSample/Startup.cs
View File

@ -1,9 +1,11 @@
using System; using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Server.HttpSys; using Microsoft.AspNetCore.Server.HttpSys;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace HotAddSample namespace HotAddSample
@ -96,15 +98,19 @@ namespace HotAddSample
}); });
} }
public static void Main(string[] args) public static Task Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new HostBuilder()
.ConfigureWebHost(webHostBuilder =>
{
webHostBuilder
.UseStartup<Startup>()
.UseHttpSys();
})
.ConfigureLogging(factory => factory.AddConsole()) .ConfigureLogging(factory => factory.AddConsole())
.UseStartup<Startup>()
.UseHttpSys()
.Build(); .Build();
host.Run(); return host.RunAsync();
} }
} }
} }

23
src/Servers/HttpSys/test/FunctionalTests/Utilities.cs
View File

@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Hosting.Server.Features;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -66,7 +67,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
}, app); }, app);
} }
internal static IWebHost CreateDynamicHost(AuthenticationSchemes authType, bool allowAnonymous, out string root, RequestDelegate app) internal static IHost CreateDynamicHost(AuthenticationSchemes authType, bool allowAnonymous, out string root, RequestDelegate app)
{ {
return CreateDynamicHost(string.Empty, out root, out var baseAddress, options => return CreateDynamicHost(string.Empty, out root, out var baseAddress, options =>
{ {
@ -75,22 +76,26 @@ namespace Microsoft.AspNetCore.Server.HttpSys
}, app); }, app);
} }
internal static IWebHost CreateDynamicHost(out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app) internal static IHost CreateDynamicHost(out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app)
{ {
return CreateDynamicHost(string.Empty, out var root, out baseAddress, configureOptions, app); return CreateDynamicHost(string.Empty, out var root, out baseAddress, configureOptions, app);
} }
internal static IWebHost CreateDynamicHost(string basePath, out string root, out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app) internal static IHost CreateDynamicHost(string basePath, out string root, out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app)
{ {
var prefix = UrlPrefix.Create("http", "localhost", "0", basePath); var prefix = UrlPrefix.Create("http", "localhost", "0", basePath);
var builder = new WebHostBuilder() var builder = new HostBuilder()
.UseHttpSys(options => .ConfigureWebHost(webHostBuilder =>
{ {
options.UrlPrefixes.Add(prefix); webHostBuilder
configureOptions(options); .UseHttpSys(options =>
}) {
.Configure(appBuilder => appBuilder.Run(app)); options.UrlPrefixes.Add(prefix);
configureOptions(options);
})
.Configure(appBuilder => appBuilder.Run(app));
});
var host = builder.Build(); var host = builder.Build();