From 4853a64cf9fb525b05da047fbb2bee759870ed8c Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Mon, 24 May 2021 15:08:44 -0700 Subject: [PATCH] Fix conflict --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index e328fcc8..1f8e1235 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -221,7 +221,7 @@ namespace Oqtane.Infrastructure using (var scope = _serviceScopeFactory.CreateScope()) { var installationManager = scope.ServiceProvider.GetRequiredService(); - installationManager.InstallPackages(packageFolderName); + installationManager.InstallPackages(); result.Success = true; } @@ -231,7 +231,6 @@ namespace Oqtane.Infrastructure AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile); } - } catch (Exception ex) {