Browse Source

Merge pull request #3853 from abpframework/liangshiwei/virtualfilesystem

Add multiple StaticWebAssetsFileProvider
pull/3896/head
Halil İbrahim Kalkan 7 years ago
committed by GitHub
parent
commit
fe3b481517
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs

13
framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs

@ -99,17 +99,14 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem
_virtualFileProvider _virtualFileProvider
}; };
if (_hostingEnvironment.IsDevelopment() && if (_hostingEnvironment.IsDevelopment() &&
_hostingEnvironment.WebRootFileProvider is CompositeFileProvider compositeFileProvider) _hostingEnvironment.WebRootFileProvider is CompositeFileProvider compositeFileProvider)
{ {
var staticWebAssetsFileProvider = compositeFileProvider var staticWebAssetsFileProviders = compositeFileProvider
.FileProviders .FileProviders
.FirstOrDefault(f => f.GetType().Name.Equals("StaticWebAssetsFileProvider")); .Where(f => f.GetType().Name.Equals("StaticWebAssetsFileProvider")).ToList();
if (staticWebAssetsFileProvider != null) fileProviders.AddRange(staticWebAssetsFileProviders);
{
fileProviders.Add(staticWebAssetsFileProvider);
}
} }
return new CompositeFileProvider( return new CompositeFileProvider(
@ -127,4 +124,4 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem
return Options.AllowedExtraWebContentFileExtensions.Any(e => path.EndsWith(e, StringComparison.OrdinalIgnoreCase)); return Options.AllowedExtraWebContentFileExtensions.Any(e => path.EndsWith(e, StringComparison.OrdinalIgnoreCase));
} }
} }
} }

Loading…
Cancel
Save