Browse Source

Check if environment is available.

pull/8102/head
Halil İbrahim Kalkan 6 years ago
parent
commit
9387f3dfa6
  1. 9
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs
  2. 14
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs

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

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Builder; using JetBrains.Annotations;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -19,6 +20,12 @@ namespace Volo.Abp
return context.ServiceProvider.GetRequiredService<IWebHostEnvironment>(); return context.ServiceProvider.GetRequiredService<IWebHostEnvironment>();
} }
[CanBeNull]
public static IWebHostEnvironment GetEnvironmentOrNull(this ApplicationInitializationContext context)
{
return context.ServiceProvider.GetService<IWebHostEnvironment>();
}
public static IConfiguration GetConfiguration(this ApplicationInitializationContext context) public static IConfiguration GetConfiguration(this ApplicationInitializationContext context)
{ {
return context.ServiceProvider.GetRequiredService<IConfiguration>(); return context.ServiceProvider.GetRequiredService<IConfiguration>();

14
framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs

@ -55,11 +55,15 @@ namespace Volo.Abp.AspNetCore
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
context.GetEnvironment().WebRootFileProvider = var environment = context.GetEnvironmentOrNull();
new CompositeFileProvider( if (environment != null)
context.GetEnvironment().WebRootFileProvider, {
context.ServiceProvider.GetRequiredService<IWebContentFileProvider>() environment.WebRootFileProvider =
); new CompositeFileProvider(
context.GetEnvironment().WebRootFileProvider,
context.ServiceProvider.GetRequiredService<IWebContentFileProvider>()
);
}
} }
} }
} }

Loading…
Cancel
Save