From c0e67220204861d0e80e65675e0dd257b5626643 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 28 Feb 2019 15:21:01 -0800 Subject: [PATCH] Make ConventionBasedStartup pubternal #6975 (#7800) --- .../Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs | 12 ++++++------ .../Hosting/src/Startup/ConventionBasedStartup.cs | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) 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 9fd2c6d8f4..da2e337570 100644 --- a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs +++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs @@ -3,12 +3,6 @@ namespace Microsoft.AspNetCore.Hosting { - public partial class ConventionBasedStartup : Microsoft.AspNetCore.Hosting.IStartup - { - public ConventionBasedStartup(Microsoft.AspNetCore.Hosting.Internal.StartupMethods methods) { } - public void Configure(Microsoft.AspNetCore.Builder.IApplicationBuilder app) { } - public System.IServiceProvider ConfigureServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } - } public partial class DelegateStartup : Microsoft.AspNetCore.Hosting.StartupBase { public DelegateStartup(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory factory, System.Action configureApp) : base (default(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory)) { } @@ -105,6 +99,12 @@ namespace Microsoft.AspNetCore.Hosting.Internal public System.Func, System.Func> StartupServiceFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public System.Func Build(object instance) { throw null; } } + public partial class ConventionBasedStartup : Microsoft.AspNetCore.Hosting.IStartup + { + public ConventionBasedStartup(Microsoft.AspNetCore.Hosting.Internal.StartupMethods methods) { } + public void Configure(Microsoft.AspNetCore.Builder.IApplicationBuilder app) { } + public System.IServiceProvider ConfigureServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } + } public partial class HostedServiceExecutor { public HostedServiceExecutor(Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable services) { } diff --git a/src/Hosting/Hosting/src/Startup/ConventionBasedStartup.cs b/src/Hosting/Hosting/src/Startup/ConventionBasedStartup.cs index b31f9478d1..35b19f4b14 100644 --- a/src/Hosting/Hosting/src/Startup/ConventionBasedStartup.cs +++ b/src/Hosting/Hosting/src/Startup/ConventionBasedStartup.cs @@ -5,10 +5,9 @@ using System; using System.Reflection; using System.Runtime.ExceptionServices; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting.Internal; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Hosting +namespace Microsoft.AspNetCore.Hosting.Internal { public class ConventionBasedStartup : IStartup { @@ -53,4 +52,4 @@ namespace Microsoft.AspNetCore.Hosting } } } -} \ No newline at end of file +}