From f005434e87655c77537a73fef8c4bde26c24e821 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 20 Oct 2017 15:24:08 -0700 Subject: [PATCH] Update templates to support the new pattern used for integration tests --- .../content/EmptyWeb-CSharp/Program.cs | 7 +++---- .../content/EmptyWeb-FSharp/Program.fs | 7 +++---- .../content/RazorPagesWeb-CSharp/Program.cs | 7 +++---- .../content/StarterWeb-CSharp/Program.cs | 7 +++---- .../content/StarterWeb-FSharp/Program.fs | 7 +++---- .../content/WebApi-CSharp/Program.cs | 7 +++---- .../content/WebApi-FSharp/Program.fs | 7 +++---- .../content/Angular-CSharp/Program.cs | 7 +++---- .../content/React-CSharp/Program.cs | 7 +++---- .../content/ReactRedux-CSharp/Program.cs | 7 +++---- 10 files changed, 30 insertions(+), 40 deletions(-) diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-CSharp/Program.cs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-CSharp/Program.cs index 13019a4fe2..4fda9f8d66 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-CSharp/Program.cs @@ -14,12 +14,11 @@ namespace Company.WebApplication1 { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateWebHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup(); } } diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-FSharp/Program.fs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-FSharp/Program.fs index 6b45d8eb71..29fd757f1f 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-FSharp/Program.fs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/EmptyWeb-FSharp/Program.fs @@ -13,14 +13,13 @@ open Microsoft.Extensions.Logging module Program = let exitCode = 0 - let BuildWebHost args = + let CreateWebHostBuilder args = WebHost .CreateDefaultBuilder(args) - .UseStartup() - .Build() + .UseStartup(); [] let main args = - BuildWebHost(args).Run() + BuildWebHost(args).Build().Run() exitCode diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/RazorPagesWeb-CSharp/Program.cs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/RazorPagesWeb-CSharp/Program.cs index 13019a4fe2..4fda9f8d66 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/RazorPagesWeb-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/RazorPagesWeb-CSharp/Program.cs @@ -14,12 +14,11 @@ namespace Company.WebApplication1 { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateWebHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup(); } } diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Program.cs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Program.cs index 13019a4fe2..4fda9f8d66 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Program.cs @@ -14,12 +14,11 @@ namespace Company.WebApplication1 { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateWebHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup(); } } diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-FSharp/Program.fs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-FSharp/Program.fs index 2ba6d636b3..39a656b750 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-FSharp/Program.fs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-FSharp/Program.fs @@ -13,14 +13,13 @@ open Microsoft.Extensions.Logging module Program = let exitCode = 0 - let BuildWebHost args = + let CreateWebHostBuilder args = WebHost .CreateDefaultBuilder(args) - .UseStartup() - .Build() + .UseStartup(); [] let main args = - BuildWebHost(args).Run() + BuildWebHost(args).Build().Run() exitCode diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-CSharp/Program.cs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-CSharp/Program.cs index 13019a4fe2..4fda9f8d66 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-CSharp/Program.cs @@ -14,12 +14,11 @@ namespace Company.WebApplication1 { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateWebHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup(); } } diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-FSharp/Program.fs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-FSharp/Program.fs index 6b45d8eb71..63aeb60a70 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-FSharp/Program.fs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/WebApi-FSharp/Program.fs @@ -13,14 +13,13 @@ open Microsoft.Extensions.Logging module Program = let exitCode = 0 - let BuildWebHost args = + let CreateWebHostBuilder args = WebHost .CreateDefaultBuilder(args) - .UseStartup() - .Build() + .UseStartup(); [] let main args = - BuildWebHost(args).Run() + BuildWebHost(args).Build().Run() exitCode diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs index 73c7e9e1f5..a72656af8a 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs @@ -14,12 +14,11 @@ namespace AngularSpa { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateWebHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup(); } } diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/Program.cs b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/Program.cs index 719033ca64..cc80d57891 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/Program.cs @@ -14,12 +14,11 @@ namespace ReactSpa { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateWebHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup(); } } diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Program.cs b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Program.cs index 708408cec0..5f15f5cb33 100644 --- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Program.cs +++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Program.cs @@ -14,12 +14,11 @@ namespace ReactReduxSpa { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateWebHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + .UseStartup(); } }