Browse Source

Mark old configuration methods as obsolete

pull/1894/head
Halil İbrahim Kalkan 7 years ago
parent
commit
f185e5edb3
  1. 5
      framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs
  2. 6
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs
  3. 1
      framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
  4. 3
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Startup.cs

5
framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Hosting; using System;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
namespace Microsoft.Extensions.DependencyInjection namespace Microsoft.Extensions.DependencyInjection
@ -10,11 +11,13 @@ namespace Microsoft.Extensions.DependencyInjection
return services.GetSingletonInstance<IWebHostEnvironment>(); return services.GetSingletonInstance<IWebHostEnvironment>();
} }
[Obsolete]
public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null) public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null)
{ {
return services.GetHostingEnvironment().BuildConfiguration(options); return services.GetHostingEnvironment().BuildConfiguration(options);
} }
[Obsolete]
public static IConfigurationRoot AddConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null) public static IConfigurationRoot AddConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null)
{ {
var configuration = services.BuildConfiguration(options); var configuration = services.BuildConfiguration(options);

6
framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs

@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
@ -18,6 +19,11 @@ namespace Volo.Abp
return context.ServiceProvider.GetRequiredService<IWebHostEnvironment>(); return context.ServiceProvider.GetRequiredService<IWebHostEnvironment>();
} }
public static IConfiguration GetConfiguration(this ApplicationInitializationContext context)
{
return context.ServiceProvider.GetRequiredService<IConfiguration>();
}
public static ILoggerFactory GetLoggerFactory(this ApplicationInitializationContext context) public static ILoggerFactory GetLoggerFactory(this ApplicationInitializationContext context)
{ {
return context.ServiceProvider.GetRequiredService<ILoggerFactory>(); return context.ServiceProvider.GetRequiredService<ILoggerFactory>();

1
framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj

@ -20,6 +20,7 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" /> <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.19" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.19" />
<PackageReference Include="System.Linq.Queryable" Version="4.3.0" /> <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />

3
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Startup.cs

@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
namespace MyCompanyName.MyProjectName.Web namespace MyCompanyName.MyProjectName.Web
{ {
@ -11,7 +10,7 @@ namespace MyCompanyName.MyProjectName.Web
services.AddApplication<MyProjectNameWebModule>(); services.AddApplication<MyProjectNameWebModule>();
} }
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) public void Configure(IApplicationBuilder app)
{ {
app.InitializeApplication(); app.InitializeApplication();
} }

Loading…
Cancel
Save