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

Merge pull request #371 from sbwalker/master

Browse Source 
Enhancement to load debugging symbols ( *.pdb ) if they exist in the /bin folder. This enables debugging of modules.
This commit is contained in:
Shaun Walker
2020-04-14 14:46:37 -04:00
committed by GitHub
parent 4bb906a316 80c7ab1e8e
commit 5389629efc
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
View File

@ -112,14 +112,22 @@ namespace Microsoft.Extensions.DependencyInjection
var assembliesFolder = new DirectoryInfo(assemblyPath); var assembliesFolder = new DirectoryInfo(assemblyPath);
// iterate through Oqtane assemblies in /bin ( filter is narrow to optimize loading process ) // iterate through Oqtane assemblies in /bin ( filter is narrow to optimize loading process )
foreach (var file in assembliesFolder.EnumerateFiles($"*.{pattern}.*.dll")) foreach (var dll in assembliesFolder.EnumerateFiles($"*.{pattern}.*.dll"))
{ {
// check if assembly is already loaded // check if assembly is already loaded
var assembly = Assemblies.FirstOrDefault(a =>!a.IsDynamic && a.Location == file.FullName); var assembly = Assemblies.FirstOrDefault(a =>!a.IsDynamic && a.Location == dll.FullName);
if (assembly == null) if (assembly == null)
{ {
// load assembly from stream to prevent locking file ( as long as dependencies are in /bin they will load as well ) // load assembly ( and symbols ) from stream to prevent locking files ( as long as dependencies are in /bin they will load as well )
assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(file.FullName))); string pdb = dll.FullName.Replace(".dll", ".pdb");
if (File.Exists(pdb))
{
assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(dll.FullName)), new MemoryStream(File.ReadAllBytes(pdb)));
}
else
{
assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(dll.FullName)));
}
if (pattern == "Module") if (pattern == "Module")
{ {
// build a list of module assemblies // build a list of module assemblies