diff --git a/Confuser.Core/Confuser.Core.csproj b/Confuser.Core/Confuser.Core.csproj index 0d7acf71..20759dd7 100644 --- a/Confuser.Core/Confuser.Core.csproj +++ b/Confuser.Core/Confuser.Core.csproj @@ -7,6 +7,7 @@ net461;netstandard2.0 true ..\ConfuserEx.snk + true diff --git a/Confuser.Core/PluginDiscovery.cs b/Confuser.Core/PluginDiscovery.cs index f95cdc8f..4b788302 100644 --- a/Confuser.Core/PluginDiscovery.cs +++ b/Confuser.Core/PluginDiscovery.cs @@ -98,8 +98,9 @@ protected virtual void GetPluginsInternal( ConfuserContext context, IList protections, IList packers, IList components) { protections.Add(new WatermarkingProtection()); + var currentAssemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); try { - Assembly protAsm = Assembly.Load("Confuser.Protections"); + Assembly protAsm = Assembly.LoadFrom($"{currentAssemblyLocation}/Confuser.Protections.dll"); AddPlugins(context, protections, packers, components, protAsm); } catch (Exception ex) { @@ -107,7 +108,7 @@ protected virtual void GetPluginsInternal( } try { - Assembly renameAsm = Assembly.Load("Confuser.Renamer"); + Assembly renameAsm = Assembly.LoadFrom($"{currentAssemblyLocation}/Confuser.Renamer.dll"); AddPlugins(context, protections, packers, components, renameAsm); } catch (Exception ex) { @@ -115,7 +116,7 @@ protected virtual void GetPluginsInternal( } try { - Assembly renameAsm = Assembly.Load("Confuser.DynCipher"); + Assembly renameAsm = Assembly.LoadFrom($"{currentAssemblyLocation}/Confuser.DynCipher.dll"); AddPlugins(context, protections, packers, components, renameAsm); } catch (Exception ex) { diff --git a/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj b/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj index 06999b4d..6b4a87fe 100644 --- a/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj +++ b/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj @@ -7,6 +7,7 @@ net461;netstandard2.0 true ..\ConfuserEx.snk + true