From 1a23032c8745a6577a71d87ede57fa6a922e88d1 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 7 May 2020 22:01:33 +0800 Subject: [PATCH] Add multiple StaticWebAssetsFileProvide --- .../VirtualFileSystem/WebContentFileProvider.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs index 4fab6d0001..898eae546f 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs @@ -99,17 +99,14 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem _virtualFileProvider }; - if (_hostingEnvironment.IsDevelopment() && + if (_hostingEnvironment.IsDevelopment() && _hostingEnvironment.WebRootFileProvider is CompositeFileProvider compositeFileProvider) { - var staticWebAssetsFileProvider = compositeFileProvider + var staticWebAssetsFileProviders = compositeFileProvider .FileProviders - .FirstOrDefault(f => f.GetType().Name.Equals("StaticWebAssetsFileProvider")); + .Where(f => f.GetType().Name.Equals("StaticWebAssetsFileProvider")).ToList(); - if (staticWebAssetsFileProvider != null) - { - fileProviders.Add(staticWebAssetsFileProvider); - } + fileProviders.AddRange(staticWebAssetsFileProviders); } return new CompositeFileProvider( @@ -127,4 +124,4 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem return Options.AllowedExtraWebContentFileExtensions.Any(e => path.EndsWith(e, StringComparison.OrdinalIgnoreCase)); } } -} \ No newline at end of file +}