diff --git a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs index d2cfa33327..552830fa07 100644 --- a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs +++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs @@ -22,10 +22,6 @@ namespace Microsoft.AspNetCore.Hosting public virtual void ConfigureContainer(TBuilder builder) { } public override System.IServiceProvider CreateServiceProvider(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } } - public static partial class StaticWebAssetsWebHostBuilderExtensions - { - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseStaticWebAssets(this Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { throw null; } - } public partial class WebHostBuilder : Microsoft.AspNetCore.Hosting.IWebHostBuilder { public WebHostBuilder() { } @@ -47,6 +43,7 @@ namespace Microsoft.AspNetCore.Hosting public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseDefaultServiceProvider(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder, System.Action configure) { throw null; } public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseStartup(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder, System.Type startupType) { throw null; } public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseStartup(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) where TStartup : class { throw null; } + public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseStaticWebAssets(this Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { throw null; } } public static partial class WebHostExtensions { diff --git a/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsWebHostBuilderExtensions.cs b/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsWebHostBuilderExtensions.cs deleted file mode 100644 index 64b7743742..0000000000 --- a/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsWebHostBuilderExtensions.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Hosting.StaticWebAssets; - -namespace Microsoft.AspNetCore.Hosting -{ - /// - /// Extensions for configuring static web assets for development. - /// - public static class StaticWebAssetsWebHostBuilderExtensions - { - /// - /// Configures the to use static web assets - /// defined by referenced projects and packages. - /// - /// The . - /// The . - public static IWebHostBuilder UseStaticWebAssets(this IWebHostBuilder builder) - { - builder.ConfigureAppConfiguration((context, configBuilder) => - { - StaticWebAssetsLoader.UseStaticWebAssets(context.HostingEnvironment); - }); - - return builder; - } - } -} diff --git a/src/Hosting/Hosting/src/WebHostBuilderExtensions.cs b/src/Hosting/Hosting/src/WebHostBuilderExtensions.cs index c3979170d7..4541b44ca8 100644 --- a/src/Hosting/Hosting/src/WebHostBuilderExtensions.cs +++ b/src/Hosting/Hosting/src/WebHostBuilderExtensions.cs @@ -4,6 +4,7 @@ using System; using System.Reflection; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting.StaticWebAssets; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -177,5 +178,21 @@ namespace Microsoft.AspNetCore.Hosting { return hostBuilder.ConfigureServices((context, collection) => collection.AddLogging(builder => configureLogging(context, builder))); } + + /// + /// Configures the to use static web assets + /// defined by referenced projects and packages. + /// + /// The . + /// The . + public static IWebHostBuilder UseStaticWebAssets(this IWebHostBuilder builder) + { + builder.ConfigureAppConfiguration((context, configBuilder) => + { + StaticWebAssetsLoader.UseStaticWebAssets(context.HostingEnvironment); + }); + + return builder; + } } }