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

Merge branch 'release' into dev

This commit is contained in:
Chris R 2016-04-07 11:54:06 -07:00
parent bc94654a75 ee7bb86407
commit a6b08c75e0
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/IISSample/Startup.cs
View File

@ -77,7 +77,7 @@ namespace IISSample
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args) .UseDefaultHostingConfiguration(args)
.UseKestrel() .UseKestrel()
.UseIIS() .UseIISIntegration()
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

4
src/Microsoft.AspNetCore.Server.IISIntegration/IISWebHostExtensions.cs → src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs
View File

@ -9,7 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNetCore.Hosting namespace Microsoft.AspNetCore.Hosting
{ {
public static class IISWebHostExtensions public static class WebHostBuilderIISExtensions
{ {
// These are defined as ASPNETCORE_ environment variables by IIS's AspNetCoreModule. // These are defined as ASPNETCORE_ environment variables by IIS's AspNetCoreModule.
private static readonly string ServerPort = "PORT"; private static readonly string ServerPort = "PORT";
@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Hosting
/// </summary> /// </summary>
/// <param name="app"></param> /// <param name="app"></param>
/// <returns></returns> /// <returns></returns>
public static IWebHostBuilder UseIIS(this IWebHostBuilder app) public static IWebHostBuilder UseIISIntegration(this IWebHostBuilder app)
{ {
if (app == null) if (app == null)
{ {

8
test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.UseSetting("PORT", "12345") .UseSetting("PORT", "12345")
.UseSetting("APPL_PATH", "/") .UseSetting("APPL_PATH", "/")
.UseIIS() .UseIISIntegration()
.Configure(app => .Configure(app =>
{ {
app.Run(context => app.Run(context =>
@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
.UseSetting("TOKEN", "TestToken") .UseSetting("TOKEN", "TestToken")
.UseSetting("PORT", "12345") .UseSetting("PORT", "12345")
.UseSetting("APPL_PATH", "/") .UseSetting("APPL_PATH", "/")
.UseIIS() .UseIISIntegration()
.Configure(app => .Configure(app =>
{ {
app.Run(context => app.Run(context =>
@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
.UseSetting("TOKEN", "TestToken") .UseSetting("TOKEN", "TestToken")
.UseSetting("PORT", "12345") .UseSetting("PORT", "12345")
.UseSetting("APPL_PATH", "/") .UseSetting("APPL_PATH", "/")
.UseIIS() .UseIISIntegration()
.Configure(app => .Configure(app =>
{ {
app.Run(context => app.Run(context =>
@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
.UseSetting("TOKEN", "TestToken") .UseSetting("TOKEN", "TestToken")
.UseSetting("PORT", "12345") .UseSetting("PORT", "12345")
.UseSetting("APPL_PATH", "/") .UseSetting("APPL_PATH", "/")
.UseIIS() .UseIISIntegration()
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.Configure<IISOptions>(options => services.Configure<IISOptions>(options =>

2
test/TestSites/Program.cs
View File

@ -11,7 +11,7 @@ namespace TestSites
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args) .UseDefaultHostingConfiguration(args)
.UseIIS() .UseIISIntegration()
.UseStartup("TestSites") .UseStartup("TestSites")
.UseKestrel() .UseKestrel()
.Build(); .Build();