From a0838cbc84b4668453ce564f2953406dd75e354b Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Mon, 24 May 2021 15:14:58 -0700
Subject: [PATCH] 3rd attempt to resolve conflicts

---
 Oqtane.Server/Infrastructure/DatabaseManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 13bf85ff..10e6a5fe 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -222,14 +222,14 @@ 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);
                         var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll");
 
                         AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
+
+                        result.Success = true;
                     }
                 }
             }