From ae53812a98eaf934aecfe0347da1c4c53fac0c44 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Tue, 31 Aug 2021 11:00:48 -0400 Subject: [PATCH] fix: Fixed plugin loading for .net framework --- ICD.Common.Utils/ReflectionUtils.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ICD.Common.Utils/ReflectionUtils.cs b/ICD.Common.Utils/ReflectionUtils.cs index f707b5b..56fcf4e 100644 --- a/ICD.Common.Utils/ReflectionUtils.cs +++ b/ICD.Common.Utils/ReflectionUtils.cs @@ -274,17 +274,12 @@ namespace ICD.Common.Utils string fileNameWithOutExtension = IcdPath.GetFileNameWithoutExtension(path); -#if SIMPLSHARP - +#if !NETSTANDARD try { return Assembly.Load(new AssemblyName {Name = fileNameWithOutExtension}); } - catch (IOException) - { - return Assembly.LoadFrom(path); - } - catch (FileNotFoundException) + catch (Exception) { return Assembly.LoadFrom(path); }