Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix satellite assembly loading issue when running on WebAssembly

Browse Source
This commit is contained in:
Shaun Walker
2022-08-08 10:47:33 -04:00
parent b621f24540
commit cf2adc7f6a
5 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
View File

@ -29,10 +29,10 @@ namespace Microsoft.Extensions.DependencyInjection
{
public static class OqtaneServiceCollectionExtensions
{
public static IServiceCollection AddOqtane(this IServiceCollection services, string[] supportedCultures)
public static IServiceCollection AddOqtane(this IServiceCollection services, string[] installedCultures)
{
LoadAssemblies();
LoadSatelliteAssemblies(supportedCultures);
LoadSatelliteAssemblies(installedCultures);
services.AddOqtaneServices();
return services;
@ -326,14 +326,14 @@ namespace Microsoft.Extensions.DependencyInjection
}
}
private static void LoadSatelliteAssemblies(string[] supportedCultures)
private static void LoadSatelliteAssemblies(string[] installedCultures)
{
AssemblyLoadContext.Default.Resolving += ResolveDependencies;
foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), $"*{Constants.SatelliteAssemblyExtension}", SearchOption.AllDirectories))
{
var code = Path.GetFileName(Path.GetDirectoryName(file));
if (supportedCultures.Contains(code))
if (installedCultures.Contains(code))
{
try
{