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

fixed compatibility issue in .NET5/WebAssembly where assemblies were not being loaded into the default AppDomain, optimized service registration on WebAssembly, fixed spelling mistake for satellite assemblies constant and fixed issue in LocalizableComponent

Browse Source
This commit is contained in:
Shaun Walker
2020-11-03 14:41:49 -05:00
parent 15aa2c2e47
commit b4b73b7e5a
7 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Linq;
using System.Reflection;
@ -32,6 +32,7 @@ namespace Microsoft.Extensions.DependencyInjection
}
var hostedServiceType = typeof(IHostedService);
var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
foreach (var assembly in assemblies)
{
@ -56,6 +57,7 @@ namespace Microsoft.Extensions.DependencyInjection
}
}
// register server startup services
var startUps = assembly.GetInstances<IServerStartup>();
foreach (var startup in startUps)
{
@ -64,6 +66,7 @@ namespace Microsoft.Extensions.DependencyInjection
if (runtime == Runtime.Server)
{
// register client startup services if running on server
assembly.GetInstances<IClientStartup>()
.ToList()
.ForEach(x => x.ConfigureServices(services));
@ -143,7 +146,7 @@ namespace Microsoft.Extensions.DependencyInjection
var assembliesFolder = new DirectoryInfo(Path.Combine(assemblyPath, culture));
if (assembliesFolder.Exists)
{
foreach (var assemblyFile in assembliesFolder.EnumerateFiles(Constants.StalliteAssemblyExtension))
foreach (var assemblyFile in assembliesFolder.EnumerateFiles(Constants.SatelliteAssemblyExtension))
{
AssemblyName assemblyName;
try