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

Merge branch 'release' into dev

This commit is contained in:
BrennanConroy 2016-04-27 18:38:50 -07:00
parent f567258f14 df7be69e85
commit fbd7110da0
29 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/ActionConstraintSample.Web/Startup.cs
View File

@ -32,7 +32,6 @@ namespace ActionConstraintSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/CustomRouteSample.Web/Startup.cs
View File

@ -29,7 +29,6 @@ namespace CustomRouteSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/EmbeddedViewSample.Web/Startup.cs
View File

@ -46,7 +46,6 @@ namespace EmbeddedViewSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/FormatFilterSample.Web/Startup.cs
View File

@ -42,7 +42,6 @@ namespace FormatFilterSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/InlineConstraintSample.Web/Startup.cs
View File

@ -41,7 +41,6 @@ namespace InlineConstraintSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/JsonPatchSample.Web/Startup.cs
View File

@ -27,7 +27,6 @@ namespace JsonPatchSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/LocalizationSample.Web/Startup.cs
View File

@ -45,7 +45,6 @@ namespace LocalizationSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/MvcSandbox/Startup.cs
View File

@ -35,7 +35,6 @@ namespace MvcSandbox
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/MvcSubAreaSample.Web/Startup.cs
View File

@ -41,7 +41,6 @@ namespace MvcSubAreaSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/TagHelperSample.Web/Startup.cs
View File

@ -39,7 +39,6 @@ namespace TagHelperSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()

1
samples/UrlHelperSample.Web/Startup.cs
View File

@ -40,7 +40,6 @@ namespace UrlHelperSample.Web
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/ApiExplorerWebSite/Startup.cs
View File

@ -50,7 +50,6 @@ namespace ApiExplorerWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()
.UseStartup<Startup>() .UseStartup<Startup>()

1
test/WebSites/ApplicationModelWebSite/Startup.cs
View File

@ -37,7 +37,6 @@ namespace ApplicationModelWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/BasicWebSite/Startup.cs
View File

@ -58,7 +58,6 @@ namespace BasicWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/ControllersFromServicesWebSite/Startup.cs
View File

@ -64,7 +64,6 @@ namespace ControllersFromServicesWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/CorsWebSite/Startup.cs
View File

@ -83,7 +83,6 @@ namespace CorsWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
View File

@ -28,7 +28,6 @@ namespace ErrorPageMiddlewareWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/FilesWebSite/Startup.cs
View File

@ -30,7 +30,6 @@ namespace FilesWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/FiltersWebSite/Startup.cs
View File

@ -71,7 +71,6 @@ namespace FiltersWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/FormatterWebSite/Startup.cs
View File

@ -39,7 +39,6 @@ namespace FormatterWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/HtmlGenerationWebSite/Startup.cs
View File

@ -47,7 +47,6 @@ namespace HtmlGenerationWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
View File

@ -48,7 +48,6 @@ namespace RazorPageExecutionInstrumentationWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/RazorWebSite/Startup.cs
View File

@ -66,7 +66,6 @@ namespace RazorWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/RoutingWebSite/Startup.cs
View File

@ -46,7 +46,6 @@ namespace RoutingWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/SimpleWebSite/Startup.cs
View File

@ -34,7 +34,6 @@ namespace SimpleWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/TagHelpersWebSite/Startup.cs
View File

@ -27,7 +27,6 @@ namespace TagHelpersWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/VersioningWebSite/Startup.cs
View File

@ -31,7 +31,6 @@ namespace VersioningWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/WebApiCompatShimWebSite/Startup.cs
View File

@ -38,7 +38,6 @@ namespace WebApiCompatShimWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()

1
test/WebSites/XmlFormattersWebSite/Startup.cs
View File

@ -82,7 +82,6 @@ namespace XmlFormattersWebSite
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>() .UseStartup<Startup>()
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()