runfix

src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj

@@ -4,10 +4,6 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.2" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.0" />

src/ApiGateways/ApiGw-Base/Program.cs

@@ -25,6 +25,12 @@ namespace OcelotApiGw
             builder.ConfigureServices(s => s.AddSingleton(builder))
                 .ConfigureAppConfiguration(ic => ic.AddJsonFile(Path.Combine("configuration", "configuration.json")))
                 .UseStartup<Startup>()
+                .ConfigureLogging((hostingContext, loggingbuilder) =>
+                {
+                    loggingbuilder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
+                    loggingbuilder.AddConsole();
+                    loggingbuilder.AddDebug();
+                })
                 .UseSerilog((builderContext, config) =>
                 {
                     config

src/ApiGateways/ApiGw-Base/Startup.cs

@@ -76,7 +76,7 @@ namespace OcelotApiGw
             services.AddOcelot(_cfg);
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             var pathBase = _cfg["PATH_BASE"];
 
@@ -101,8 +101,6 @@ namespace OcelotApiGw
                 Predicate = r => r.Name.Contains("self")
             });
 
-            loggerFactory.AddConsole(_cfg.GetSection("Logging"));
-
             app.UseCors("CorsPolicy");
 
             app.UseOcelot().Wait();

src/Services/Basket/Basket.API/Program.cs

@@ -48,6 +48,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseSerilog((builderContext, config) =>
                 {

src/Services/Basket/Basket.API/Startup.cs

@@ -179,9 +179,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
     
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Services/Catalog/Catalog.API/Program.cs

@@ -60,6 +60,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseSerilog((builderContext, config) =>
                 {

src/Services/Catalog/Catalog.API/Startup.cs

@@ -60,11 +60,10 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
 
         }
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
             //Configure logs
 
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Services/Identity/Identity.API/Program.cs

@@ -67,6 +67,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Services/Identity/Identity.API/Startup.cs

@@ -116,11 +116,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {   
-            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-            loggerBuilder.AddDebug();
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             if (env.IsDevelopment())

src/Services/Location/Locations.API/Program.cs

@@ -43,6 +43,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Services/Location/Locations.API/Startup.cs

@@ -153,9 +153,8 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Services/Marketing/Marketing.API/Program.cs

@@ -55,6 +55,7 @@
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Services/Marketing/Marketing.API/Startup.cs

@@ -177,9 +177,8 @@
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env,ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env,ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Services/Ordering/Ordering.API/Program.cs

@@ -59,6 +59,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Services/Ordering/Ordering.API/Startup.cs

@@ -72,9 +72,8 @@
         }
 
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Services/Ordering/Ordering.SignalrHub/Program.cs

@@ -26,6 +26,7 @@ namespace Ordering.SignalrHub
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseSerilog((builderContext, config) =>
                 {

src/Services/Ordering/Ordering.SignalrHub/Startup.cs

@@ -118,9 +118,8 @@ namespace Ordering.SignalrHub
         public IConfiguration Configuration { get; }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Services/Payment/Payment.API/Program.cs

@@ -28,6 +28,7 @@ namespace Payment.API
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Services/Payment/Payment.API/Startup.cs

@@ -89,9 +89,8 @@ namespace Payment.API
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Services/Webhooks/Webhooks.API/Program.cs

@@ -22,6 +22,17 @@ namespace Webhooks.API
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
+                .UseStartup<Startup>()
+                .ConfigureAppConfiguration((builderContext, config) =>
+                {
+                    config.AddEnvironmentVariables();
+                })
+                .ConfigureLogging((hostingContext, builder) =>
+                {
+                    builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
+                    builder.AddConsole();
+                    builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
+                });
     }
 }

src/Services/Webhooks/Webhooks.API/Startup.cs

@@ -70,9 +70,8 @@ namespace Webhooks.API
             return new AutofacServiceProvider(container.Build());
         }
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];

src/Web/WebMVC/Program.cs

@@ -27,6 +27,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Web/WebMVC/Startup.cs

@@ -48,11 +48,10 @@ namespace Microsoft.eShopOnContainers.WebMVC
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
             JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
 
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             app.UseHealthChecks("/hc", new HealthCheckOptions()

src/Web/WebSPA/Program.cs

@@ -27,6 +27,7 @@ namespace eShopConContainers.WebSPA
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Web/WebSPA/Startup.cs

@@ -73,10 +73,8 @@ namespace eShopConContainers.WebSPA
 
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IAntiforgery antiforgery, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IAntiforgery antiforgery)
         {
-
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             if (env.IsDevelopment())

src/Web/WebStatus/Program.cs

@@ -23,6 +23,7 @@ namespace WebStatus
                     builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     builder.AddConsole();
                     builder.AddDebug();
+                    builder.AddAzureWebAppDiagnostics();
                 })
                 .UseApplicationInsights()
                 .UseSerilog((builderContext, config) =>

src/Web/WebStatus/Startup.cs

@@ -37,9 +37,8 @@ namespace WebStatus
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            loggerBuilder.AddAzureWebAppDiagnostics();
             loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             if (env.IsDevelopment())