mirror of
https://github.com/oqtane/oqtane.framework.git
synced 2025-05-25 22:33:04 +00:00
Fix conflict
This commit is contained in:
parent
69376c5baf
commit
4853a64cf9
@ -221,7 +221,7 @@ namespace Oqtane.Infrastructure
|
|||||||
using (var scope = _serviceScopeFactory.CreateScope())
|
using (var scope = _serviceScopeFactory.CreateScope())
|
||||||
{
|
{
|
||||||
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
|
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
|
||||||
installationManager.InstallPackages(packageFolderName);
|
installationManager.InstallPackages();
|
||||||
result.Success = true;
|
result.Success = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -231,7 +231,6 @@ namespace Oqtane.Infrastructure
|
|||||||
|
|
||||||
AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
|
AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user