more targeted

Author: BrennanConroy

src/DefaultBuilder/samples/SampleApp/Program.cs

@@ -75,12 +75,9 @@ private static void CustomApplicationBuilder()
     }
     private static void DirectWebHost(string[] args)
     {
-        // Using defaults with HostBuilder pattern
-        using (var host = Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            })
+        // Using defaults with a Startup class
+        using (var host = WebHost.CreateDefaultBuilder(args)
+            .UseStartup<Startup>()
             .Build())
         {
             host.Run();

src/DefaultBuilder/src/ConfigureWebHostBuilder.cs

@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Builder;
 /// A non-buildable <see cref="IWebHostBuilder"/> for <see cref="WebApplicationBuilder"/>.
 /// Use <see cref="WebApplicationBuilder.Build"/> to build the <see cref="WebApplicationBuilder"/>.
 /// </summary>
-#pragma warning disable CS0618 // Type or member is obsolete
 public sealed class ConfigureWebHostBuilder : IWebHostBuilder, ISupportsStartup
 {
     private readonly IWebHostEnvironment _environment;
@@ -29,10 +28,12 @@ internal ConfigureWebHostBuilder(WebHostBuilderContext webHostBuilderContext, Co
         _context = webHostBuilderContext;
     }
 
+#pragma warning disable CS0618 // Type or member is obsolete
     IWebHost IWebHostBuilder.Build()
     {
         throw new NotSupportedException($"Call {nameof(WebApplicationBuilder)}.{nameof(WebApplicationBuilder.Build)}() instead.");
     }
+#pragma warning restore CS0618 // Type or member is obsolete
 
     /// <inheritdoc />
     public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)
@@ -184,4 +185,3 @@ IWebHostBuilder ISupportsStartup.UseStartup([DynamicallyAccessedMembers(StartupL
         throw new NotSupportedException("UseStartup() is not supported by WebApplicationBuilder.WebHost. Use the WebApplication returned by WebApplicationBuilder.Build() instead.");
     }
 }
-#pragma warning restore CS0618 // Type or member is obsolete

src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs

@@ -377,7 +377,9 @@ public void WebApplicationBuilderHost_ThrowsWhenBuiltDirectly(CreateBuilderFunc
     [MemberData(nameof(CreateBuilderFuncs))]
     public void WebApplicationBuilderWebHost_ThrowsWhenBuiltDirectly(CreateBuilderFunc createBuilder)
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         Assert.Throws<NotSupportedException>(() => ((IWebHostBuilder)createBuilder().WebHost).Build());
+#pragma warning restore CS0618 // Type or member is obsolete
     }
 
     [Theory]

src/Hosting/Abstractions/src/IWebHostBuilder.cs

@@ -10,12 +10,12 @@ namespace Microsoft.AspNetCore.Hosting;
 /// <summary>
 /// A builder for <see cref="IWebHost"/>.
 /// </summary>
-#pragma warning disable CS0618 // Type or member is obsolete
 public interface IWebHostBuilder
 {
     /// <summary>
     /// Builds an <see cref="IWebHost"/> which hosts a web application.
     /// </summary>
+    [Obsolete("IWebHost is obsolete. Use IHost instead.")]
     IWebHost Build();
 
     /// <summary>
@@ -60,4 +60,3 @@ public interface IWebHostBuilder
     /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
     IWebHostBuilder UseSetting(string key, string? value);
 }
-#pragma warning restore CS0618 // Type or member is obsolete

src/Hosting/Hosting/src/GenericHost/HostingStartupWebHostBuilder.cs

@@ -12,7 +12,6 @@ namespace Microsoft.AspNetCore.Hosting;
 
 // We use this type to capture calls to the IWebHostBuilder so the we can properly order calls to
 // to GenericHostWebHostBuilder.
-#pragma warning disable CS0618 // Type or member is obsolete
 internal sealed class HostingStartupWebHostBuilder : IWebHostBuilder, ISupportsStartup, ISupportsUseDefaultServiceProvider
 {
     private readonly GenericWebHostBuilder _builder;
@@ -24,10 +23,12 @@ public HostingStartupWebHostBuilder(GenericWebHostBuilder builder)
         _builder = builder;
     }
 
+#pragma warning disable CS0618 // Type or member is obsolete
     public IWebHost Build()
     {
         throw new NotSupportedException($"Building this implementation of {nameof(IWebHostBuilder)} is not supported.");
     }
+#pragma warning restore CS0618 // Type or member is obsolete
 
     public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)
     {
@@ -91,4 +92,3 @@ public IWebHostBuilder UseStartup([DynamicallyAccessedMembers(StartupLinkerOptio
         return _builder.UseStartup(startupFactory);
     }
 }
-#pragma warning restore CS0618 // Type or member is obsolete

src/Hosting/Hosting/src/GenericHost/WebHostBuilderBase.cs

@@ -7,7 +7,6 @@
 
 namespace Microsoft.AspNetCore.Hosting;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 internal abstract class WebHostBuilderBase : IWebHostBuilder, ISupportsUseDefaultServiceProvider
 {
     private protected readonly IHostBuilder _builder;
@@ -27,10 +26,12 @@ public WebHostBuilderBase(IHostBuilder builder, WebHostBuilderOptions options)
         _config = configBuilder.Build();
     }
 
+#pragma warning disable CS0618 // Type or member is obsolete
     public IWebHost Build()
     {
         throw new NotSupportedException($"Building this implementation of {nameof(IWebHostBuilder)} is not supported.");
     }
+#pragma warning restore CS0618 // Type or member is obsolete
 
     public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)
     {
@@ -106,4 +107,3 @@ public IWebHostBuilder UseSetting(string key, string? value)
         return this;
     }
 }
-#pragma warning restore CS0618 // Type or member is obsolete

src/Hosting/TestHost/src/TestServer.cs

@@ -18,6 +18,7 @@ public class TestServer : IServer
 {
 #pragma warning disable CS0618 // Type or member is obsolete
     private readonly IWebHost? _hostInstance;
+#pragma warning restore CS0618 // Type or member is obsolete
     private bool _disposed;
     private ApplicationWrapper? _application;
 
@@ -79,6 +80,7 @@ public TestServer(IServiceProvider services, IFeatureCollection featureCollectio
     /// For use with IWebHostBuilder.
     /// </summary>
     /// <param name="builder"></param>
+    [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.")]
     public TestServer(IWebHostBuilder builder)
         : this(builder, CreateTestFeatureCollection())
     {
@@ -89,6 +91,7 @@ public TestServer(IWebHostBuilder builder)
     /// </summary>
     /// <param name="builder"></param>
     /// <param name="featureCollection"></param>
+    [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.")]
     public TestServer(IWebHostBuilder builder, IFeatureCollection featureCollection)
     {
         ArgumentNullException.ThrowIfNull(builder);
@@ -110,6 +113,7 @@ public TestServer(IWebHostBuilder builder, IFeatureCollection featureCollection)
     /// <summary>
     /// Gets the <see cref="IWebHost" /> instance associated with the test server.
     /// </summary>
+    [Obsolete("IWebHost is obsolete. Use IHost instead.")]
     public IWebHost Host
     {
         get
@@ -118,7 +122,6 @@ public IWebHost Host
                 ?? throw new InvalidOperationException("The TestServer constructor was not called with a IWebHostBuilder so IWebHost is not available.");
         }
     }
-#pragma warning restore CS0618 // Type or member is obsolete
 
     /// <summary>
     /// Gets the service provider associated with the test server.

src/Hosting/TestHost/src/WebHostBuilderExtensions.cs

@@ -14,7 +14,6 @@ namespace Microsoft.AspNetCore.TestHost;
 /// <summary>
 /// Contains extensions for configuring the <see cref="IWebHostBuilder" /> instance.
 /// </summary>
-#pragma warning disable CS0618 // Type or member is obsolete
 public static class WebHostBuilderExtensions
 {
     /// <summary>
@@ -52,6 +51,7 @@ public static IWebHostBuilder UseTestServer(this IWebHostBuilder builder, Action
     /// </summary>
     /// <param name="host"></param>
     /// <returns></returns>
+    [Obsolete("IWebHost is obsolete. Use IHost instead.")]
     public static TestServer GetTestServer(this IWebHost host)
     {
         return (TestServer)host.Services.GetRequiredService<IServer>();
@@ -62,6 +62,7 @@ public static TestServer GetTestServer(this IWebHost host)
     /// </summary>
     /// <param name="host"></param>
     /// <returns></returns>
+    [Obsolete("IWebHost is obsolete. Use IHost instead.")]
     public static HttpClient GetTestClient(this IWebHost host)
     {
         return host.GetTestServer().CreateClient();
@@ -209,4 +210,3 @@ public Action<TContainer> ConfigureContainer(Action<TContainer> next) =>
             };
     }
 }
-#pragma warning restore CS0618 // Type or member is obsolete

src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs

@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Mvc.Testing;
 /// </summary>
 /// <typeparam name="TEntryPoint">A type in the entry point assembly of the application.
 /// Typically the Startup or Program classes can be used.</typeparam>
-#pragma warning disable CS0618 // Type or member is obsolete
 public partial class WebApplicationFactory<TEntryPoint> : IDisposable, IAsyncDisposable where TEntryPoint : class
 {
     private bool _disposed;
@@ -36,7 +35,9 @@ public partial class WebApplicationFactory<TEntryPoint> : IDisposable, IAsyncDis
     private TestServer? _server;
     private IHost? _host;
     private Action<IWebHostBuilder> _configuration;
+#pragma warning disable CS0618 // Type or member is obsolete
     private IWebHost? _webHost;
+#pragma warning restore CS0618 // Type or member is obsolete
     private Uri? _webHostAddress;
     private readonly List<HttpClient> _clients = new();
     private readonly List<WebApplicationFactory<TEntryPoint>> _derivedFactories = new();
@@ -107,7 +108,9 @@ public virtual IServiceProvider Services
                 return _webHost?.Services ?? _host!.Services;
             }
 
+#pragma warning disable CS0618 // Type or member is obsolete
             return _host?.Services ?? _server!.Host.Services;
+#pragma warning restore CS0618 // Type or member is obsolete
         }
     }
 
@@ -143,7 +146,9 @@ internal virtual WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Actio
     {
         var factory = new DelegatedWebApplicationFactory(
             ClientOptions,
+#pragma warning disable CS0618 // Type or member is obsolete
             CreateServer,
+#pragma warning restore CS0618 // Type or member is obsolete
             CreateServer,
             CreateHost,
             CreateWebHostBuilder,
@@ -202,6 +207,7 @@ public void UseKestrel(Action<KestrelServerOptions> configureKestrelOptions)
         this._configureKestrelOptions = configureKestrelOptions;
     }
 
+#pragma warning disable CS0618 // Type or member is obsolete
     private IWebHost CreateKestrelServer(IWebHostBuilder builder)
     {
         ConfigureBuilderToUseKestrel(builder);
@@ -213,6 +219,7 @@ private IWebHost CreateKestrelServer(IWebHostBuilder builder)
         host.Start();
         return host;
     }
+#pragma warning restore CS0618 // Type or member is obsolete
 
     private void TryConfigureServerPort(Func<IServerAddressesFeature?> serverAddressFeatureAccessor)
     {
@@ -312,7 +319,9 @@ public void StartServer()
             }
             else
             {
+#pragma warning disable CS0618 // Type or member is obsolete
                 _server = CreateServer(builder);
+#pragma warning restore CS0618 // Type or member is obsolete
             }
         }
     }
@@ -568,6 +577,7 @@ private static void EnsureDepsFile()
     /// <param name="builder">The <see cref="IWebHostBuilder"/> used to
     /// create the server.</param>
     /// <returns>The <see cref="TestServer"/> with the bootstrapped application.</returns>
+    [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.")]
     protected virtual TestServer CreateServer(IWebHostBuilder builder) => new(builder);
 
     /// <summary>
@@ -596,7 +606,9 @@ protected virtual IHost CreateHost(IHostBuilder builder)
 
     private static IServerAddressesFeature? GetServerAddressFeature(IHost host) => host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>();
 
+#pragma warning disable CS0618 // Type or member is obsolete
     private static IServerAddressesFeature? GetServerAddressFeature(IWebHost webHost) => webHost.ServerFeatures.Get<IServerAddressesFeature>();
+#pragma warning restore CS0618 // Type or member is obsolete
 
     /// <summary>
     /// Gives a fixture an opportunity to configure the application before it gets built.
@@ -844,6 +856,7 @@ public DelegatedWebApplicationFactory(
             _configuration = configureWebHost;
         }
 
+        [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.")]
         protected override TestServer CreateServer(IWebHostBuilder builder) => _createServer(builder);
 
         protected override TestServer CreateServer(IServiceProvider serviceProvider) => _createServerFromServiceProvider(serviceProvider);
@@ -879,4 +892,3 @@ internal override WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Acti
         }
     }
 }
-#pragma warning restore CS0618 // Type or member is obsolete

src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs

@@ -42,15 +42,19 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 });
     }
 
+#pragma warning disable CS0672 // Member overrides obsolete member
     protected override TestServer CreateServer(IWebHostBuilder builder)
+#pragma warning restore CS0672 // Member overrides obsolete member
     {
         var originalCulture = CultureInfo.CurrentCulture;
         var originalUICulture = CultureInfo.CurrentUICulture;
         try
         {
             CultureInfo.CurrentCulture = new CultureInfo("en-GB");
             CultureInfo.CurrentUICulture = new CultureInfo("en-US");
+#pragma warning disable CS0618 // Type or member is obsolete
             return base.CreateServer(builder);
+#pragma warning restore CS0618 // Type or member is obsolete
         }
         finally
         {