Fix merge conflict

This commit is contained in:
hishamco
2021-06-12 00:18:57 +03:00
parent 126024991c
commit 7c181b65cd
4 changed files with 17 additions and 23 deletions

View File

@ -48,9 +48,6 @@ namespace Oqtane.Client
// dynamically register module services
RegisterModuleServices(assembly, builder.Services);
// dynamically register database providers
RegisterDatabaseProviders(assembly, builder.Services);
// register client startup services
RegisterClientStartups(assembly, builder.Services);
}
@ -126,19 +123,6 @@ namespace Oqtane.Client
}
}
private static void RegisterDatabaseProviders(Assembly assembly, IServiceCollection services)
{
var databaseTypes = assembly.GetInterfaces<IOqtaneDatabase>();
foreach (var databaseType in databaseTypes)
{
if (databaseType.AssemblyQualifiedName != null)
{
var serviceType = Type.GetType("Oqtane.Interfaces.IDatabase, Oqtane.Shared");
services.AddScoped(serviceType ?? databaseType, databaseType);
}
}
}
private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
{
var startUps = assembly.GetInstances<IClientStartup>();