Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

2nd attempt to Fix conflict

Browse Source
This commit is contained in:
Charles Nurse
2021-05-24 15:12:41 -07:00
parent 4853a64cf9
commit 17f5f39a54
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -223,7 +223,7 @@ namespace Oqtane.Infrastructure
var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>(); var installationManager = scope.ServiceProvider.GetRequiredService<IInstallationManager>();
installationManager.InstallPackages(); installationManager.InstallPackages();
result.Success = true; result.Success = true;
}
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
var assembliesFolder = new DirectoryInfo(assemblyPath); var assembliesFolder = new DirectoryInfo(assemblyPath);
@ -232,6 +232,7 @@ namespace Oqtane.Infrastructure
AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile); AssemblyLoadContext.Default.LoadOqtaneAssembly(assemblyFile);
} }
} }
}
catch (Exception ex) catch (Exception ex)
{ {
result.Message = ex.Message; result.Message = ex.Message;