ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-01 05:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow plugins to load Dalamud dependency assemblies (#1580)

Browse source
This commit is contained in:
marzent 2024-01-01 01:20:00 +01:00 • committed by GitHub
parent 02b1f6e426
commit 69096c440a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Plugin/Internal/Loader/PluginLoader.cs
View file

@ -1,7 +1,7 @@
// Copyright (c) Nate McMaster, Dalamud team.
// Licensed under the Apache License, Version 2.0. See License.txt in the Loader root for license information.
using System;
using System.IO;
using System.Reflection;
using System.Runtime.Loader;
@ -151,6 +151,14 @@ internal class PluginLoader : IDisposable
builder.PreferDefaultLoadContextAssembly(assemblyName);
}
// This allows plugins to search for dependencies in the Dalamud directory when their assembly
// load would otherwise fail, allowing them to resolve assemblies not already loaded by Dalamud
// itself yet.
builder.AddProbingPath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
// Also make sure that plugins do not load their own Dalamud assembly.
builder.PreferDefaultLoadContextAssembly(Assembly.GetExecutingAssembly().GetName());
return builder;
}