huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #153 from dtkujawski/dev 

Ability to derive Startup from base class
This commit is contained in:
Eilon Lipton 2015-02-26 22:39:07 -08:00
parent 435215b542 5a5975e348
commit eb2887e5ef
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs
View File

@ -25,8 +25,8 @@ namespace Microsoft.AspNet.Hosting.Startup
{
var methodNameWithEnv = string.Format(CultureInfo.InvariantCulture, methodName, environmentName);
var methodNameWithNoEnv = string.Format(CultureInfo.InvariantCulture, methodName, "");
var methodInfo = startupType.GetTypeInfo().GetDeclaredMethod(methodNameWithEnv)
?? startupType.GetTypeInfo().GetDeclaredMethod(methodNameWithNoEnv);
var methodInfo = startupType.GetMethod(methodNameWithEnv, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
?? startupType.GetMethod(methodNameWithNoEnv, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
if (methodInfo == null)
{
if (required)

2
test/Microsoft.AspNet.Hosting.Tests/Fakes/Startup.cs
View File

@ -9,7 +9,7 @@ using System;
namespace Microsoft.AspNet.Hosting.Fakes
{
public class Startup
public class Startup : StartupBase
{
public Startup()
{

20
test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupBase.cs Normal file
View File

@ -0,0 +1,20 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.Framework.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Fakes
{
public class StartupBase
{
public void ConfigureBaseClassServices(IServiceCollection services)
{
services.AddOptions();
services.Configure<FakeOptions>(o =>
{
o.Configured = true;
o.Environment = "BaseClass";
});
}
}
}

1
test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs
View File

@ -43,6 +43,7 @@ namespace Microsoft.AspNet.Hosting.Tests
[InlineData("StaticProvider")]
[InlineData("Provider")]
[InlineData("ProviderArgs")]
[InlineData("BaseClass")]
public void StartupClassAddsConfigureServicesToApplicationServices(string environment)
{
var services = HostingServices.Create().BuildServiceProvider();