3rd attempt to resolve conflicts
This commit is contained in:
parent
17f5f39a54
commit
a0838cbc84
|
@ -222,14 +222,14 @@ namespace Oqtane.Infrastructure
|
||||||
{
|
{
|
||||||
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
|
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
|
||||||
installationManager.InstallPackages();
|
installationManager.InstallPackages();
|
||||||
result.Success = true;
|
|
||||||
|
|
||||||
|
|
||||||
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
|
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
|
||||||
var assembliesFolder = new DirectoryInfo(assemblyPath);
|
var assembliesFolder = new DirectoryInfo(assemblyPath);
|
||||||
var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll");
|
var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll");
|
||||||
|
|
||||||
AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
|
AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
|
||||||
|
|
||||||
|
result.Success = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user