Merge pull request #153 from dtkujawski/dev

Ability to derive Startup from base class

src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs

@@ -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)
+            var methodInfo = startupType.GetMethod(methodNameWithEnv, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
-                ?? startupType.GetTypeInfo().GetDeclaredMethod(methodNameWithNoEnv);
+                ?? startupType.GetMethod(methodNameWithNoEnv, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
             if (methodInfo == null)
             {
                 if (required)

test/Microsoft.AspNet.Hosting.Tests/Fakes/Startup.cs

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

test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupBase.cs

@@ -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";
+            });
+        }
+    }
+}

test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs

@@ -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();