2nd attempt to Fix conflict
This commit is contained in:
@ -223,7 +223,7 @@ namespace Oqtane.Infrastructure
|
||||
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
|
||||
installationManager.InstallPackages();
|
||||
result.Success = true;
|
||||
}
|
||||
|
||||
|
||||
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
|
||||
var assembliesFolder = new DirectoryInfo(assemblyPath);
|
||||
@ -232,6 +232,7 @@ namespace Oqtane.Infrastructure
|
||||
AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.Message = ex.Message;
|
||||
|
Reference in New Issue
Block a user