Merge branch 'release' into dev

JunTaoLuo · JunTaoLuo · commit fae70a2bfe30 · 2016-04-27T14:59:59.000-07:00
diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
@@ -29,7 +29,6 @@ public void Configure(IApplicationBuilder app, ILoggerFactory factory, IHostingE
         public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
-                .UseDefaultHostingConfiguration(args)
                 .UseKestrel()
                 .UseIISIntegration()
                 .UseStartup<Startup>()

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ public void Configure(IApplicationBuilder app, ILoggerFactory factory, IHostingE`
`29`	`29`	`public static void Main(string[] args)`
`30`	`30`	`{`
`31`	`31`	`var host = new WebHostBuilder()`
`32`		`- .UseDefaultHostingConfiguration(args)`
`33`	`32`	`.UseKestrel()`
`34`	`33`	`.UseIISIntegration()`
`35`	`34`	`.UseStartup<Startup>()`