From 17f5f39a546de1e784806b52635d6df33e4b7b57 Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Mon, 24 May 2021 15:12:41 -0700 Subject: [PATCH] 2nd attempt to Fix conflict --- Oqtane.Server/Infrastructure/DatabaseManager.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs index 1f8e1235..13bf85ff 100644 --- a/Oqtane.Server/Infrastructure/DatabaseManager.cs +++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs @@ -223,13 +223,14 @@ namespace Oqtane.Infrastructure var installationManager = scope.ServiceProvider.GetRequiredService(); 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); } - - var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); - var assembliesFolder = new DirectoryInfo(assemblyPath); - var assemblyFile = new FileInfo($"{assembliesFolder}/{install.DatabasePackage}.dll"); - - AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile); } } catch (Exception ex)