icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-01-11 19:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed plugin loading for .net framework

Browse Source
This commit is contained in:
Chris Cameron
2021-08-31 11:00:48 -04:00
parent 74ff651798
commit ae53812a98
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ICD.Common.Utils/ReflectionUtils.cs
View File

@@ -274,17 +274,12 @@ namespace ICD.Common.Utils
string fileNameWithOutExtension = IcdPath.GetFileNameWithoutExtension(path); string fileNameWithOutExtension = IcdPath.GetFileNameWithoutExtension(path);
#if SIMPLSHARP #if !NETSTANDARD
try try
{ {
return Assembly.Load(new AssemblyName {Name = fileNameWithOutExtension}); return Assembly.Load(new AssemblyName {Name = fileNameWithOutExtension});
} }
catch (IOException) catch (Exception)
{
return Assembly.LoadFrom(path);
}
catch (FileNotFoundException)
{ {
return Assembly.LoadFrom(path); return Assembly.LoadFrom(path);
} }