Mark WebHostBuilder class as obsolete

src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs

@@ -25,8 +25,12 @@ public async Task WebhostLoadsKeyRingBeforeServerStarts()
             .Returns(Mock.Of<IKeyRing>())
             .Callback(() => tcs.TrySetResult());
 
-        var builder = new WebHostBuilder()
-            .UseStartup<TestStartup>()
+        var builder = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseStartup<TestStartup>();
+            })
             .ConfigureServices(s =>
                 s.AddDataProtection()
                 .Services

src/Hosting/Hosting/src/WebHostBuilder.cs

@@ -20,6 +20,9 @@ namespace Microsoft.AspNetCore.Hosting;
 /// <summary>
 /// A builder for <see cref="IWebHost"/>
 /// </summary>
+#pragma warning disable CS0618 // Type or member is obsolete
+[Obsolete("TODO: Add Obsolete message")]
+#pragma warning restore CS0618 // Type or member is obsolete
 public class WebHostBuilder : IWebHostBuilder
 {
     private readonly HostingEnvironment _hostingEnvironment;

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/Hosting/TestHost/test/Microsoft.AspNetCore.TestHost.Tests.csproj

@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <!-- CS0618: WebHostBuilder is obsolete -->
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <!-- CS0618: WebHostBuilder is obsolete -->
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
+    <!-- CS0618: WebHostBuilder is obsolete -->
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Hosting/test/testassets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
+    <!-- CS0618: WebHostBuilder is obsolete -->
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Identity/samples/IdentitySample.Mvc/Program.cs

@@ -1,6 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+
 namespace IdentitySample;
 
 public static class Program
@@ -12,10 +16,14 @@ public static void Main(string[] args)
         host.Run();
     }
 
-    public static IWebHostBuilder CreateHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseKestrel()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseIISIntegration()
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseIISIntegration()
+                    .UseStartup<Startup>();
+            });
 }

src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Program.cs

@@ -56,22 +56,26 @@ public static int Main(string[] args)
                 return 12;
             case "HangOnStop":
                 {
+#pragma warning disable CS0618 // Type or member is obsolete
                     var host = new WebHostBuilder()
                         .UseIIS()
                         .UseStartup<Startup>()
                         .Build();
+#pragma warning restore CS0618 // Type or member is obsolete
                     host.Run();
 
                     Thread.Sleep(Timeout.Infinite);
                 }
                 break;
             case "IncreaseShutdownLimit":
                 {
+#pragma warning disable CS0618 // Type or member is obsolete
                     var host = new WebHostBuilder()
                         .UseIIS()
                         .UseShutdownTimeout(TimeSpan.FromSeconds(120))
                         .UseStartup<Startup>()
                         .Build();
+#pragma warning restore CS0618 // Type or member is obsolete
 
                     host.Run();
                 }
@@ -94,11 +98,13 @@ public static int Main(string[] args)
                 return 0;
             case "OverriddenServer":
                 {
+#pragma warning disable CS0618 // Type or member is obsolete
                     var host = new WebHostBuilder()
                             .UseIIS()
                             .ConfigureServices(services => services.AddSingleton<IServer, DummyServer>())
                             .Configure(builder => builder.Run(async context => { await context.Response.WriteAsync("I shouldn't work"); }))
                             .Build();
+#pragma warning restore CS0618 // Type or member is obsolete
                     host.Run();
                 }
                 break;
@@ -111,6 +117,7 @@ public static int Main(string[] args)
 #if !FORWARDCOMPAT
             case "DecreaseRequestLimit":
                 {
+#pragma warning disable CS0618 // Type or member is obsolete
                     var host = new WebHostBuilder()
                         .ConfigureLogging((_, factory) =>
                         {
@@ -124,13 +131,15 @@ public static int Main(string[] args)
                         })
                         .UseStartup<Startup>()
                         .Build();
+#pragma warning restore CS0618 // Type or member is obsolete
 
                     host.Run();
                     break;
                 }
 #endif
             case "ThrowInStartup":
                 {
+#pragma warning disable CS0618 // Type or member is obsolete
                     var host = new WebHostBuilder()
                                     .ConfigureLogging((_, factory) =>
                                     {
@@ -140,6 +149,7 @@ public static int Main(string[] args)
                                     .UseIIS()
                                     .UseStartup<ThrowingStartup>()
                                     .Build();
+#pragma warning restore CS0618 // Type or member is obsolete
 
                     host.Run();
                 }
@@ -189,6 +199,7 @@ public static int Main(string[] args)
 
     private static int StartServer()
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         var host = new WebHostBuilder()
             .ConfigureLogging((_, factory) =>
             {
@@ -200,6 +211,7 @@ private static int StartServer()
             .UseIISIntegration()
             .UseStartup<Startup>()
             .Build();
+#pragma warning restore CS0618 // Type or member is obsolete
 
         host.Run();
         return 0;