administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ProjectService: fix reference loading errors in the same way they are fixed in the Compiler

Browse source
This commit is contained in:
Friedrich von Never 2023-07-16 17:01:25 +02:00
parent e9e50b3632
commit a8d81d7095
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
VisualPascalABCNET/Workbench/ProjectService.cs
View file

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Windows.Forms;
using VisualPascalABCPlugins;
@ -80,13 +81,27 @@ namespace VisualPascalABC
this.miProjectExplorer.Visible = true;
ShowContent(ProjectExplorerWindow, false);
UserProjectSettings setts = ProjectUserOptionsManager.LoadOptions(projectFileName);
var preloadedAssemblies = new List<Assembly>();
var referenceAssemblyPaths = new List<string>();
foreach (IReferenceInfo ri in ProjectFactory.Instance.CurrentProject.References)
{
var path = Compiler.get_assembly_path(Path.Combine(ProjectFactory.Instance.ProjectDirectory, ri.FullAssemblyName), false);
if (path == null)
path = Compiler.get_assembly_path(ri.FullAssemblyName, false);
ICSharpCode.FormsDesigner.ToolboxProvider.AddComponentsFromAssembly(PascalABCCompiler.NetHelper.NetHelper.LoadAssembly(path));
referenceAssemblyPaths.Add(path);
preloadedAssemblies.Add(PascalABCCompiler.NetHelper.NetHelper.PreloadAssembly(path));
}
using (new PascalABCCompiler.NetHelper.AssemblyResolveScope(AppDomain.CurrentDomain, preloadedAssemblies))
{
foreach (var path in referenceAssemblyPaths)
{
ICSharpCode.FormsDesigner.ToolboxProvider.AddComponentsFromAssembly(PascalABCCompiler.NetHelper.NetHelper.LoadAssembly(path));
}
}
if (setts != null)
{
foreach (OpenedFileInfo fi in setts.OpenDocuments)