Merge pull request #191 from Flow-Launcher/dev

Release 1.4.0 | Plugin 1.2.2
Flow-Launcher · Nov 14, 2020 · b03dc8a · b03dc8a
2 parents 152e32e + 336cb3c
commit b03dc8a
Show file tree

Hide file tree

Showing 54 changed files with 493 additions and 513 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,15 @@
+<Project>
+	<Target Name="ExcludePluginProjectReferenceOutput"
+			AfterTargets="AssignProjectConfiguration" 
+			BeforeTargets="ResolveProjectReferences" 
+			Condition="'$(OutputType)' == 'Library' and '$(CopyLocalLockFileAssemblies)' == 'true' and $(AssemblyName.EndsWith('Tests')) == 'false' ">
+	  <ItemGroup>
+		<ProjectReferenceWithConfiguration Update="@(ProjectReferenceWithConfiguration)" >
+		  <Private>false</Private>
+		</ProjectReferenceWithConfiguration>
+		<ProjectReference Update="@(ProjectReference)" >
+		  <Private>false</Private>
+		</ProjectReference>
+	  </ItemGroup>
+	</Target>
+</Project>
diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
@@ -54,12 +54,8 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="4.7.1" />
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" />
-    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs b/Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs
@@ -0,0 +1,57 @@
+using Flow.Launcher.Infrastructure;
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace Flow.Launcher.Core.Plugin
+{
+    internal class PluginAssemblyLoader : AssemblyLoadContext
+    {
+        private readonly AssemblyDependencyResolver dependencyResolver;
+
+        private readonly AssemblyDependencyResolver referencedPluginPackageDependencyResolver;
+
+        private readonly AssemblyName assemblyName;
+
+        internal PluginAssemblyLoader(string assemblyFilePath)
+        {
+            dependencyResolver = new AssemblyDependencyResolver(assemblyFilePath);
+            assemblyName = new AssemblyName(Path.GetFileNameWithoutExtension(assemblyFilePath));
+
+            referencedPluginPackageDependencyResolver = 
+                new AssemblyDependencyResolver(Path.Combine(Constant.ProgramDirectory, "Flow.Launcher.Plugin.dll"));
+        }
+
+        internal Assembly LoadAssemblyAndDependencies()
+        {
+            return LoadFromAssemblyName(assemblyName);
+        }
+
+        protected override Assembly Load(AssemblyName assemblyName)
+        {
+            string assemblyPath = dependencyResolver.ResolveAssemblyToPath(assemblyName);
+
+            // When resolving dependencies, ignore assembly depenedencies that already exits with Flow.Launcher.Plugin
+            // Otherwise will get unexpected behaviour with plugins, e.g. JsonIgnore attribute not honored in WebSearch or other plugins
+            // that use Newtonsoft.Json
+            if (assemblyPath == null || ExistsInReferencedPluginPackage(assemblyName))
+                return null;
+
+            return LoadFromAssemblyPath(assemblyPath);
+        }
+
+        internal Type FromAssemblyGetTypeOfInterface(Assembly assembly, Type type)
+        {
+            var allTypes = assembly.ExportedTypes;
+
+            return allTypes.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(type));
+        }
+
+        internal bool ExistsInReferencedPluginPackage(AssemblyName assemblyName)
+        {
+            return referencedPluginPackageDependencyResolver.ResolveAssemblyToPath(assemblyName) != null;
+        }
+    }
+}
diff --git a/Flow.Launcher.Core/Plugin/PluginsLoader.cs b/Flow.Launcher.Core/Plugin/PluginsLoader.cs
@@ -41,20 +41,20 @@ public static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source)
                 {
 
 #if DEBUG
-                    var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(metadata.ExecuteFilePath);
-                    var types = assembly.GetTypes();
-                    var type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin)));
+                    var assemblyLoader = new PluginAssemblyLoader(metadata.ExecuteFilePath);
+                    var assembly = assemblyLoader.LoadAssemblyAndDependencies();
+                    var type = assemblyLoader.FromAssemblyGetTypeOfInterface(assembly, typeof(IPlugin));
                     var plugin = (IPlugin)Activator.CreateInstance(type);
 #else
                     Assembly assembly = null;
                     IPlugin plugin = null;
 
                     try
                     {
-                        assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(metadata.ExecuteFilePath);
+                        var assemblyLoader = new PluginAssemblyLoader(metadata.ExecuteFilePath);
+                        assembly = assemblyLoader.LoadAssemblyAndDependencies();
 
-                        var types = assembly.GetTypes();
-                        var type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin)));
+                        var type = assemblyLoader.FromAssemblyGetTypeOfInterface(assembly, typeof(IPlugin));
 
                         plugin = (IPlugin)Activator.CreateInstance(type);
                     }

diff --git a/Flow.Launcher.Infrastructure/Alphabet.cs b/Flow.Launcher.Infrastructure/Alphabet.cs
diff --git a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@@ -49,14 +49,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog.Schema" Version="4.7.0-rc1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-    <PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
+    <PackageReference Include="ToolGood.Words.Pinyin" Version="3.0.1.4" />
   </ItemGroup>
 
   <ItemGroup>