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

Move templates to generic web host #4187 (#5706)

This commit is contained in:
Chris Ross 2019-01-11 16:21:23 -08:00 committed by GitHub
parent ee6ba671fa
commit 7d5067519f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/Program.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore; using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Company.WebApplication1 namespace Company.WebApplication1
@ -14,11 +15,14 @@ namespace Company.WebApplication1
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
CreateWebHostBuilder(args).Build().Run(); CreateHostBuilder(args).Build().Run();
} }
public static IWebHostBuilder CreateWebHostBuilder(string[] args) => public static IHostBuilder CreateHostBuilder(string[] args) =>
WebHost.CreateDefaultBuilder(args) Host.CreateDefaultBuilder(args)
.UseStartup<Startup>(); .ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
});
} }
} }

12
src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/Program.fs
View File

@ -8,18 +8,20 @@ open System.Threading.Tasks
open Microsoft.AspNetCore open Microsoft.AspNetCore
open Microsoft.AspNetCore.Hosting open Microsoft.AspNetCore.Hosting
open Microsoft.Extensions.Configuration open Microsoft.Extensions.Configuration
open Microsoft.Extensions.Hosting
open Microsoft.Extensions.Logging open Microsoft.Extensions.Logging
module Program = module Program =
let exitCode = 0 let exitCode = 0
let CreateWebHostBuilder args = let CreateHostBuilder args =
WebHost Host.CreateDefaultBuilder(args)
.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(fun webBuilder ->
.UseStartup<Startup>(); webBuilder.UseStartup<Startup>() |> ignore
)
[<EntryPoint>] [<EntryPoint>]
let main args = let main args =
CreateWebHostBuilder(args).Build().Run() CreateHostBuilder(args).Build().Run()
exitCode exitCode

14
src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Program.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore; using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Company.WebApplication1 namespace Company.WebApplication1
@ -14,11 +15,14 @@ namespace Company.WebApplication1
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
CreateWebHostBuilder(args).Build().Run(); CreateHostBuilder(args).Build().Run();
} }
public static IWebHostBuilder CreateWebHostBuilder(string[] args) => public static IHostBuilder CreateHostBuilder(string[] args) =>
WebHost.CreateDefaultBuilder(args) Host.CreateDefaultBuilder(args)
.UseStartup<Startup>(); .ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
});
} }
} }

14
src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Program.fs
View File

@ -1,4 +1,4 @@
namespace Company.WebApplication1 namespace Company.WebApplication1
open System open System
open System.Collections.Generic open System.Collections.Generic
@ -8,18 +8,20 @@ open System.Threading.Tasks
open Microsoft.AspNetCore open Microsoft.AspNetCore
open Microsoft.AspNetCore.Hosting open Microsoft.AspNetCore.Hosting
open Microsoft.Extensions.Configuration open Microsoft.Extensions.Configuration
open Microsoft.Extensions.Hosting
open Microsoft.Extensions.Logging open Microsoft.Extensions.Logging
module Program = module Program =
let exitCode = 0 let exitCode = 0
let CreateWebHostBuilder args = let CreateHostBuilder args =
WebHost Host.CreateDefaultBuilder(args)
.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(fun webBuilder ->
.UseStartup<Startup>(); webBuilder.UseStartup<Startup>() |> ignore
)
[<EntryPoint>] [<EntryPoint>]
let main args = let main args =
CreateWebHostBuilder(args).Build().Run() CreateHostBuilder(args).Build().Run()
exitCode exitCode

14
src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/Program.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore; using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Company.WebApplication1 namespace Company.WebApplication1
@ -14,11 +15,14 @@ namespace Company.WebApplication1
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
CreateWebHostBuilder(args).Build().Run(); CreateHostBuilder(args).Build().Run();
} }
public static IWebHostBuilder CreateWebHostBuilder(string[] args) => public static IHostBuilder CreateHostBuilder(string[] args) =>
WebHost.CreateDefaultBuilder(args) Host.CreateDefaultBuilder(args)
.UseStartup<Startup>(); .ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
});
} }
} }

12
src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/Program.fs
View File

@ -8,18 +8,20 @@ open System.Threading.Tasks
open Microsoft.AspNetCore open Microsoft.AspNetCore
open Microsoft.AspNetCore.Hosting open Microsoft.AspNetCore.Hosting
open Microsoft.Extensions.Configuration open Microsoft.Extensions.Configuration
open Microsoft.Extensions.Hosting
open Microsoft.Extensions.Logging open Microsoft.Extensions.Logging
module Program = module Program =
let exitCode = 0 let exitCode = 0
let CreateWebHostBuilder args = let CreateHostBuilder args =
WebHost Host.CreateDefaultBuilder(args)
.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(fun webBuilder ->
.UseStartup<Startup>(); webBuilder.UseStartup<Startup>() |> ignore
)
[<EntryPoint>] [<EntryPoint>]
let main args = let main args =
CreateWebHostBuilder(args).Build().Run() CreateHostBuilder(args).Build().Run()
exitCode exitCode