fixup

Author: BrennanConroy

src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj

@@ -3,8 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <!-- EXTEXP0003: MetricCollector is experimental -->
-    <!-- CS0618: WebHostBuilder is obsolete -->
-    <NoWarn>$(NoWarn);EXTEXP0003;CS0618</NoWarn>
+    <NoWarn>$(NoWarn);EXTEXP0003</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Hosting/Hosting/test/WebHostBuilderTests.cs

@@ -429,6 +429,7 @@ public void DoNotCaptureStartupErrorsByDefault(IWebHostBuilder builder)
     public void ServiceProviderDisposedOnBuildException()
     {
         var service = new DisposableService();
+#pragma warning disable CS0618 // Type or member is obsolete
         var hostBuilder = new WebHostBuilder()
             .UseServer(new TestServer())
             .ConfigureServices(services =>
@@ -437,6 +438,7 @@ public void ServiceProviderDisposedOnBuildException()
                 services.AddSingleton(sp => service);
             })
             .UseStartup<StartupWithResolvedDisposableThatThrows>();
+#pragma warning restore CS0618 // Type or member is obsolete
 
         Assert.Throws<InvalidOperationException>(() => hostBuilder.Build());
         Assert.True(service.Disposed);
@@ -1483,14 +1485,18 @@ private IWebHostBuilder CreateWebHostBuilder()
             .AddInMemoryCollection(vals);
         var config = builder.Build();
 
+#pragma warning disable CS0618 // Type or member is obsolete
         return new WebHostBuilder().UseConfiguration(config);
+#pragma warning restore CS0618 // Type or member is obsolete
     }
 
+#pragma warning disable CS0618 // Type or member is obsolete
     public static TheoryData<IWebHostBuilder> DefaultWebHostBuilders => new TheoryData<IWebHostBuilder>
         {
             new WebHostBuilder(),
             new GenericWebHostBuilderWrapper(new HostBuilder())
         };
+#pragma warning restore CS0618 // Type or member is obsolete
 
     public static TheoryData<IWebHostBuilder> DefaultWebHostBuildersWithConfig
     {
@@ -1506,10 +1512,12 @@ public static TheoryData<IWebHostBuilder> DefaultWebHostBuildersWithConfig
                 .AddInMemoryCollection(vals);
             var config = builder.Build();
 
+#pragma warning disable CS0618 // Type or member is obsolete
             return new TheoryData<IWebHostBuilder> {
                     new WebHostBuilder().UseConfiguration(config),
                     new GenericWebHostBuilderWrapper(new HostBuilder()).UseConfiguration(config)
                 };
+#pragma warning restore CS0618 // Type or member is obsolete
         }
     }
 
@@ -1783,3 +1791,4 @@ public void Dispose()
         public void AddProvider(ILoggerProvider provider) { }
     }
 }
+//#pragma warning restore CS0618 // Type or member is obsolete

src/Hosting/Hosting/test/WebHostTests.cs

@@ -1103,7 +1103,9 @@ private IWebHost CreateHost(RequestDelegate requestDelegate)
 
     private IWebHostBuilder CreateBuilder(IConfiguration config = null)
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         return new WebHostBuilder().UseConfiguration(config ?? new ConfigurationBuilder().Build()).UseStartup("Microsoft.AspNetCore.Hosting.Tests");
+#pragma warning restore CS0618 // Type or member is obsolete
     }
 
     private static bool[] RegisterCallbacksThatThrow(IServiceCollection services)

src/Servers/testassets/ServerComparison.TestSites/Program.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.HttpSys;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace ServerComparison.TestSites;
@@ -18,7 +19,6 @@ public static void Main(string[] args)
             .Build();
 
         var builder = new HostBuilder()
-            .UseConfiguration(configuration)
             .ConfigureLogging((_, factory) =>
             {
                 factory.AddConsole();
@@ -27,6 +27,7 @@ public static void Main(string[] args)
             .ConfigureWebHost(webHostBuilder =>
             {
                 webHostBuilder
+                    .UseConfiguration(configuration)
                     .UseStartup("ServerComparison.TestSites")
                     .UseKestrel()
                     .UseIISIntegration()