Browse Source

Merge branch 'dev' into fix/include_pipeline_yml_in_trigger

pull/1290/head
ericuss 4 years ago
parent
commit
4eae63be46
11 changed files with 2 additions and 11 deletions
  1. +0
    -1
      src/Services/Basket/Basket.API/Program.cs
  2. +0
    -1
      src/Services/Catalog/Catalog.API/Program.cs
  3. +0
    -1
      src/Services/Identity/Identity.API/Program.cs
  4. +0
    -1
      src/Services/Location/Locations.API/Program.cs
  5. +0
    -1
      src/Services/Marketing/Marketing.API/Program.cs
  6. +0
    -1
      src/Services/Ordering/Ordering.API/Program.cs
  7. +0
    -1
      src/Services/Payment/Payment.API/Program.cs
  8. +2
    -1
      src/Services/Webhooks/Webhooks.API/Startup.cs
  9. +0
    -1
      src/Web/WebMVC/Program.cs
  10. +0
    -1
      src/Web/WebSPA/Program.cs
  11. +0
    -1
      src/Web/WebStatus/Program.cs

+ 0
- 1
src/Services/Basket/Basket.API/Program.cs View File

@ -66,7 +66,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
options.NotFilteredPaths.AddRange(new[] {"/hc","/liveness"}); options.NotFilteredPaths.AddRange(new[] {"/hc","/liveness"});
}) })
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseSerilog() .UseSerilog()
.Build(); .Build();


+ 0
- 1
src/Services/Catalog/Catalog.API/Program.cs View File

@ -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()


+ 0
- 1
src/Services/Identity/Identity.API/Program.cs View File

@ -69,7 +69,6 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseSerilog() .UseSerilog()
.Build(); .Build();


+ 0
- 1
src/Services/Location/Locations.API/Program.cs View File

@ -46,7 +46,6 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseSerilog() .UseSerilog()
.Build(); .Build();


+ 0
- 1
src/Services/Marketing/Marketing.API/Program.cs View File

@ -57,7 +57,6 @@
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseWebRoot("Pics") .UseWebRoot("Pics")
.UseSerilog() .UseSerilog()


+ 0
- 1
src/Services/Ordering/Ordering.API/Program.cs View File

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


+ 0
- 1
src/Services/Payment/Payment.API/Program.cs View File

@ -46,7 +46,6 @@ namespace Payment.API
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseSerilog() .UseSerilog()
.Build(); .Build();


+ 2
- 1
src/Services/Webhooks/Webhooks.API/Startup.cs 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)


+ 0
- 1
src/Web/WebMVC/Program.cs View File

@ -45,7 +45,6 @@ namespace Microsoft.eShopOnContainers.WebMVC
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseSerilog() .UseSerilog()
.Build(); .Build();


+ 0
- 1
src/Web/WebSPA/Program.cs 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


+ 0
- 1
src/Web/WebStatus/Program.cs View File

@ -49,7 +49,6 @@ namespace WebStatus
.CaptureStartupErrors(false) .CaptureStartupErrors(false)
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration)) .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
.UseStartup<Startup>() .UseStartup<Startup>()
.UseApplicationInsights()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseSerilog() .UseSerilog()
.Build(); .Build();


Loading…
Cancel
Save