Update WebHostBuilder.cs

Author: shirhatti

src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs

@@ -21,19 +21,6 @@ namespace Microsoft.AspNetCore.Hosting
 {
     internal sealed partial class GenericWebHostService : IHostedService
     {
-<<<<<<< HEAD
-        public GenericWebHostService(
-            IOptions<GenericWebHostServiceOptions> options,
-            IServer server,
-            ILoggerFactory loggerFactory,
-            DiagnosticListener diagnosticListener,
-            ActivitySource activitySource,
-            IHttpContextFactory httpContextFactory,
-            IApplicationBuilderFactory applicationBuilderFactory,
-            IEnumerable<IStartupFilter> startupFilters,
-            IConfiguration configuration,
-            IWebHostEnvironment hostingEnvironment)
-=======
         public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
                                      IServer server,
                                      ILoggerFactory loggerFactory,
@@ -45,7 +32,6 @@ public GenericWebHostService(IOptions<GenericWebHostServiceOptions> options,
                                      IEnumerable<IStartupFilter> startupFilters,
                                      IConfiguration configuration,
                                      IWebHostEnvironment hostingEnvironment)
->>>>>>> 73ed5781a2 (Fix tests)
         {
             Options = options.Value;
             Server = server;

src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs

@@ -5,6 +5,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Runtime.CompilerServices;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;

src/Hosting/Hosting/src/WebHostBuilder.cs

@@ -293,6 +293,7 @@ private IServiceCollection BuildCommonServices(out AggregateException? hostingSt
             services.TryAddSingleton(sp => new DiagnosticListener("Microsoft.AspNetCore"));
             services.TryAddSingleton<DiagnosticSource>(sp => sp.GetRequiredService<DiagnosticListener>());
             services.TryAddSingleton(sp => new ActivitySource("Microsoft.AspNetCore"));
+            services.TryAddSingleton(sp => TextMapPropagator.Default);
 
             services.AddTransient<IApplicationBuilderFactory, ApplicationBuilderFactory>();
             services.AddTransient<IHttpContextFactory, DefaultHttpContextFactory>();