Merge 88cd1d0 into 657fb58

mkaring · May 16, 2022 · cba560b · cba560b
2 parents 657fb58 + 88cd1d0
commit cba560b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Confuser.Core/Confuser.Core.csproj b/Confuser.Core/Confuser.Core.csproj
@@ -7,6 +7,7 @@
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ConfuserEx.snk</AssemblyOriginatorKeyFile>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <PropertyGroup Label="Assembly Information">

diff --git a/Confuser.Core/PluginDiscovery.cs b/Confuser.Core/PluginDiscovery.cs
@@ -98,24 +98,25 @@ protected virtual void GetPluginsInternal(
 			ConfuserContext context, IList<Protection> protections,
 			IList<Packer> packers, IList<ConfuserComponent> 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) {
 				context.Logger.WarnException("Failed to load built-in protections.", ex);
 			}
 
 			try {
-				Assembly renameAsm = Assembly.Load("Confuser.Renamer");
+				Assembly renameAsm = Assembly.LoadFrom($"{currentAssemblyLocation}/Confuser.Renamer.dll");
 				AddPlugins(context, protections, packers, components, renameAsm);
 			}
 			catch (Exception ex) {
 				context.Logger.WarnException("Failed to load renamer.", ex);
 			}
 
 			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
@@ -7,6 +7,7 @@
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ConfuserEx.snk</AssemblyOriginatorKeyFile>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget Package Settings">