Merge pull request #1289 from dotnet-architecture/features/change_UseConfiguration_To_New_Extension_Method

Features/change use configuration to new extension method
This commit is contained in:
Miguel Veloso 2020-04-07 12:09:53 +01:00 committed by GitHub
commit b20248993d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 13 additions and 22 deletions

View File

@ -60,14 +60,13 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
}); });
}) })
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseFailing(options => { .UseFailing(options => {
options.ConfigPath = "/Failing"; options.ConfigPath = "/Failing";
options.NotFilteredPaths.AddRange(new[] {"/hc","/liveness"}); options.NotFilteredPaths.AddRange(new[] {"/hc","/liveness"});
}) })
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -66,7 +66,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
private static IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) => private static IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.UseConfiguration(configuration) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureKestrel(options => .ConfigureKestrel(options =>
{ {
@ -82,7 +82,6 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
}) })
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseWebRoot("Pics") .UseWebRoot("Pics")
.UseSerilog() .UseSerilog()

View File

@ -67,10 +67,9 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -44,10 +44,9 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -55,11 +55,10 @@
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseWebRoot("Pics") .UseWebRoot("Pics")
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -77,10 +77,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API
}); });
}) })
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -46,8 +46,8 @@ namespace Ordering.SignalrHub
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -44,10 +44,9 @@ namespace Payment.API
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -80,9 +80,9 @@ namespace Webhooks.API
app.UseCors("CorsPolicy"); app.UseCors("CorsPolicy");
app.UseRouting();
ConfigureAuth(app); ConfigureAuth(app);
app.UseRouting();
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapDefaultControllerRoute(); endpoints.MapDefaultControllerRoute();
@ -119,6 +119,7 @@ namespace Webhooks.API
*/ */
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization();
} }
protected virtual void ConfigureEventBus(IApplicationBuilder app) protected virtual void ConfigureEventBus(IApplicationBuilder app)

View File

@ -42,10 +42,9 @@ namespace Microsoft.eShopOnContainers.WebMVC
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();

View File

@ -29,7 +29,6 @@ namespace eShopConContainers.WebSPA
builder.AddDebug(); builder.AddDebug();
builder.AddAzureWebAppDiagnostics(); builder.AddAzureWebAppDiagnostics();
}) })
.UseApplicationInsights()
.UseSerilog((builderContext, config) => .UseSerilog((builderContext, config) =>
{ {
config config

View File

@ -47,10 +47,9 @@ namespace WebStatus
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseConfiguration(configuration)
.UseSerilog() .UseSerilog()
.Build(); .Build();