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

Switch from tabs to spaces

This commit is contained in:
dtkujawski 2015-02-12 23:45:26 -06:00
parent fe3675a9e0
commit e95472e953
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,18 +29,18 @@ namespace Microsoft.AspNet.Hosting.Startup
{
var methodNameWithEnv = string.Format(CultureInfo.InvariantCulture, methodName, environmentName);
var methodNameWithNoEnv = string.Format(CultureInfo.InvariantCulture, methodName, "");
var methodInfo = startupType.GetMethod(methodNameWithEnv, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
?? startupType.GetMethod(methodNameWithNoEnv, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
if (methodInfo == null)
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)
{
throw new Exception(string.Format("TODO: {0} or {1} method not found",
methodNameWithEnv,
methodNameWithNoEnv));
{
throw new Exception(string.Format("TODO: {0} or {1} method not found",
methodNameWithEnv,
methodNameWithNoEnv));
}
return null;
}
return null;
}
if (returnType != null && methodInfo.ReturnType != returnType)
{
@ -160,7 +160,7 @@ namespace Microsoft.AspNet.Hosting.Startup
}
else
{
// void ConfigureServices(IServiceCollection)
// void ConfigureServices(IServiceCollection)
Invoke(servicesMethod, instance, builder, services);
if (builder != null)
{

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

@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Hosting.Fakes
});
}
public void ConfigureRetailServices(IServiceCollection services)
public void ConfigureRetailServices(IServiceCollection services)
{
services.AddOptions();
services.Configure<FakeOptions>(o =>
@ -94,8 +94,8 @@ namespace Microsoft.AspNet.Hosting.Fakes
return services.BuildServiceProvider();
}
public virtual void Configure(IApplicationBuilder builder)
{
}
}
public virtual void Configure(IApplicationBuilder builder)
{
}
}
}

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

@ -15,15 +15,15 @@ namespace Microsoft.AspNet.Hosting.Fakes
{
}
public void ConfigureBaseClassServices(IServiceCollection services)
{
services.AddOptions();
services.Configure<FakeOptions>(o =>
{
o.Configured = true;
o.Environment = "BaseClass";
});
}
public void ConfigureBaseClassServices(IServiceCollection services)
{
services.AddOptions();
services.Configure<FakeOptions>(o =>
{
o.Configured = true;
o.Environment = "BaseClass";
});
}
}
}
}

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

@ -42,8 +42,8 @@ namespace Microsoft.AspNet.Hosting.Tests
[InlineData("StaticProvider")]
[InlineData("Provider")]
[InlineData("ProviderArgs")]
[InlineData("BaseClass")]
public void StartupClassAddsConfigureServicesToApplicationServices(string environment)
[InlineData("BaseClass")]
public void StartupClassAddsConfigureServicesToApplicationServices(string environment)
{
var services = HostingServices.Create().BuildServiceProvider();
var manager = services.GetRequiredService<IStartupManager>();