Merge pull request #191 from Flow-Launcher/dev

Release 1.4.0 | Plugin 1.2.2

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>

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>

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;
+        }
+    }
+}

Flow.Launcher.Core/Plugin/PluginsLoader.cs

@@ -41,9 +41,9 @@ namespace Flow.Launcher.Core.Plugin
                 {
 
 #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;
@@ -51,10 +51,10 @@ namespace Flow.Launcher.Core.Plugin
 
                     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);
                     }

Flow.Launcher.Infrastructure/Alphabet.cs

@@ -1,178 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using hyjiacan.util.p4n;
-using hyjiacan.util.p4n.format;
-using JetBrains.Annotations;
-using Flow.Launcher.Infrastructure.Logger;
-using Flow.Launcher.Infrastructure.Storage;
-using Flow.Launcher.Infrastructure.UserSettings;
-
-namespace Flow.Launcher.Infrastructure
-{
-    public interface IAlphabet
-    {
-        string Translate(string stringToTranslate);
-    }
-
-    public class Alphabet : IAlphabet
-    {
-        private readonly HanyuPinyinOutputFormat Format = new HanyuPinyinOutputFormat();
-        private ConcurrentDictionary<string, string[][]> PinyinCache;
-        private BinaryStorage<Dictionary<string, string[][]>> _pinyinStorage;
-        private Settings _settings;
-         
-        public void Initialize([NotNull] Settings settings)
-        {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
-            InitializePinyinHelpers();
-        }
-
-        private void InitializePinyinHelpers()
-        {
-            Format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-
-            Stopwatch.Normal("|Flow Launcher.Infrastructure.Alphabet.Initialize|Preload pinyin cache", () =>
-            {
-                _pinyinStorage = new BinaryStorage<Dictionary<string, string[][]>>("Pinyin");
-                
-                lock(_pinyinStorage)
-                {
-                    var loaded = _pinyinStorage.TryLoad(new Dictionary<string, string[][]>());
-
-                    PinyinCache = new ConcurrentDictionary<string, string[][]>(loaded);
-                }
-
-                // force pinyin library static constructor initialize
-                PinyinHelper.toHanyuPinyinStringArray('T', Format);
-            });
-            Log.Info($"|Flow Launcher.Infrastructure.Alphabet.Initialize|Number of preload pinyin combination<{PinyinCache.Count}>");
-        }
-
-        public string Translate(string str)
-        {
-            return ConvertChineseCharactersToPinyin(str);
-        }
-
-        public string ConvertChineseCharactersToPinyin(string source)
-        {
-            if (!_settings.ShouldUsePinyin)
-                return source;
-
-            if (string.IsNullOrEmpty(source))
-                return source;
-
-            if (!ContainsChinese(source))
-                return source;
-                
-            var combination = PinyinCombination(source);
-            
-            var pinyinArray=combination.Select(x => string.Join("", x));
-            var acronymArray = combination.Select(Acronym).Distinct();
-
-            var joinedSingleStringCombination = new StringBuilder();
-            var all = acronymArray.Concat(pinyinArray);
-            all.ToList().ForEach(x => joinedSingleStringCombination.Append(x));
-
-            return joinedSingleStringCombination.ToString();
-        }
-
-        public void Save()
-        {
-            if (!_settings.ShouldUsePinyin)
-            {
-                return; 
-            }
-
-            lock(_pinyinStorage)
-            {
-                _pinyinStorage.Save(PinyinCache.ToDictionary(i => i.Key, i => i.Value));
-            }            
-        }
-
-        private static string[] EmptyStringArray = new string[0];
-        private static string[][] Empty2DStringArray = new string[0][];
-
-        /// <summmary>
-        /// replace chinese character with pinyin, non chinese character won't be modified
-        /// Because we don't have words dictionary, so we can only return all possiblie pinyin combination
-        /// e.g. 音乐 will return yinyue and yinle
-        /// <param name="characters"> should be word or sentence, instead of single character. e.g. 微软 </param>
-        /// </summmary>
-        public string[][] PinyinCombination(string characters)
-        {
-            if (!_settings.ShouldUsePinyin || string.IsNullOrEmpty(characters))
-            {
-                return Empty2DStringArray;
-            }
-
-            if (!PinyinCache.ContainsKey(characters))
-            {
-                var allPinyins = new List<string[]>();
-                foreach (var c in characters)
-                {
-                    var pinyins = PinyinHelper.toHanyuPinyinStringArray(c, Format);
-                    if (pinyins != null)
-                    {
-                        var r = pinyins.Distinct().ToArray();
-                        allPinyins.Add(r);
-                    }
-                    else
-                    {
-                        var r = new[] { c.ToString() };
-                        allPinyins.Add(r);
-                    }
-                }
-
-                var combination = allPinyins.Aggregate(Combination).Select(c => c.Split(';')).ToArray();
-                PinyinCache[characters] = combination;
-                return combination;
-            }
-            else
-            {
-                return PinyinCache[characters];
-            }
-        }
-
-        public string Acronym(string[] pinyin)
-        {
-            var acronym = string.Join("", pinyin.Select(p => p[0]));
-            return acronym;
-        }
-
-        public bool ContainsChinese(string word)
-        {
-            if (!_settings.ShouldUsePinyin)
-            {
-                return false;
-            }
-
-            if (word.Length > 40)
-            {
-                //Skip strings that are too long string for Pinyin conversion.
-                return false;
-            }
-
-            var chinese = word.Select(PinyinHelper.toHanyuPinyinStringArray)
-                              .Any(p => p != null);
-            return chinese;
-        }
-
-        private string[] Combination(string[] array1, string[] array2)
-        {
-            if (!_settings.ShouldUsePinyin)
-            {
-                return EmptyStringArray;
-            }
-
-            var combination = (
-                from a1 in array1
-                from a2 in array2
-                select $"{a1};{a2}"
-            ).ToArray();
-            return combination;
-        }
-    }
-}

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>

Flow.Launcher.Infrastructure/Image/ImageCache.cs

@@ -2,44 +2,91 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Media;
 
 namespace Flow.Launcher.Infrastructure.Image
 {
     [Serializable]
+    public class ImageUsage
+    {
+
+        public int usage;
+        public ImageSource imageSource;
+
+        public ImageUsage(int usage, ImageSource image)
+        {
+            this.usage = usage;
+            imageSource = image;
+        }
+    }
+
     public class ImageCache
     {
-        private const int MaxCached = 5000;
-        public ConcurrentDictionary<string, int> Usage = new ConcurrentDictionary<string, int>();
-        private readonly ConcurrentDictionary<string, ImageSource> _data = new ConcurrentDictionary<string, ImageSource>();
+        private const int MaxCached = 50;
+        public ConcurrentDictionary<string, ImageUsage> Data { get; private set; } = new ConcurrentDictionary<string, ImageUsage>();
+        private const int permissibleFactor = 2;
 
+        public void Initialization(Dictionary<string, int> usage)
+        {
+            foreach (var key in usage.Keys)
+            {
+                Data[key] = new ImageUsage(usage[key], null);
+            }
+        }
 
         public ImageSource this[string path]
         {
             get
             {
-                Usage.AddOrUpdate(path, 1, (k, v) => v + 1);
-                var i = _data[path];
-                return i;
+                if (Data.TryGetValue(path, out var value))
+                {
+                    value.usage++;
+                    return value.imageSource;
+                }
+                
+                return null;
             }
-            set { _data[path] = value; }
-        }
+            set
+            {
+                Data.AddOrUpdate(
+                        path, 
+                        new ImageUsage(0, value), 
+                        (k, v) =>
+                            {
+                                v.imageSource = value;
+                                v.usage++;
+                                return v;
+                            }
+                );
 
-        public Dictionary<string, int> CleanupAndToDictionary() 
-            => Usage
-                .OrderByDescending(o => o.Value)
-                .Take(MaxCached)
-                .ToDictionary(i => i.Key, i => i.Value);
+                // To prevent the dictionary from drastically increasing in size by caching images, the dictionary size is not allowed to grow more than the permissibleFactor * maxCached size
+                // This is done so that we don't constantly perform this resizing operation and also maintain the image cache size at the same time
+                if (Data.Count > permissibleFactor * MaxCached)
+                {
+                    // To delete the images from the data dictionary based on the resizing of the Usage Dictionary.
+
+
+                    foreach (var key in Data.OrderBy(x => x.Value.usage).Take(Data.Count - MaxCached).Select(x => x.Key))
+                    {
+                        if (!(key.Equals(Constant.ErrorIcon) || key.Equals(Constant.DefaultIcon)))
+                        {
+                            Data.TryRemove(key, out _);
+                        }
+                    }
+                }
+            }
+        }
 
         public bool ContainsKey(string key)
         {
-            var contains = _data.ContainsKey(key);
+            var contains = Data.ContainsKey(key);
             return contains;
         }
 
         public int CacheSize()
         {
-            return _data.Count;
+            return Data.Count;
         }
 
         /// <summary>
@@ -47,8 +94,8 @@ namespace Flow.Launcher.Infrastructure.Image
         /// </summary>
         public int UniqueImagesInCache()
         {
-            return _data.Values.Distinct().Count();
+            return Data.Values.Select(x => x.imageSource).Distinct().Count();
         }
     }
 
-}
+}

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -13,12 +13,11 @@ namespace Flow.Launcher.Infrastructure.Image
 {
     public static class ImageLoader
     {
-        private static readonly ImageCache _imageCache = new ImageCache();
-        private static readonly ConcurrentDictionary<string, string> _guidToKey = new ConcurrentDictionary<string, string>();
-        private static readonly bool _enableHashImage = true;
-
+        private static readonly ImageCache ImageCache = new ImageCache();
         private static BinaryStorage<Dictionary<string, int>> _storage;
+        private static readonly ConcurrentDictionary<string, string> GuidToKey = new ConcurrentDictionary<string, string>();
         private static IImageHashGenerator _hashGenerator;
+        private static bool EnableImageHash = true;
 
         private static readonly string[] ImageExtensions =
         {
@@ -36,25 +35,25 @@ namespace Flow.Launcher.Infrastructure.Image
             _storage = new BinaryStorage<Dictionary<string, int>>("Image");
             _hashGenerator = new ImageHashGenerator();
 
-            _imageCache.Usage = LoadStorageToConcurrentDictionary();
+            var usage = LoadStorageToConcurrentDictionary();
 
             foreach (var icon in new[] { Constant.DefaultIcon, Constant.MissingImgIcon })
             {
                 ImageSource img = new BitmapImage(new Uri(icon));
                 img.Freeze();
-                _imageCache[icon] = img;
+                ImageCache[icon] = img;
             }
 
             Task.Run(() =>
             {
                 Stopwatch.Normal("|ImageLoader.Initialize|Preload images cost", () =>
                 {
-                    _imageCache.Usage.AsParallel().ForAll(x =>
+                    ImageCache.Data.AsParallel().ForAll(x =>
                     {
                         Load(x.Key);
                     });
                 });
-                Log.Info($"|ImageLoader.Initialize|Number of preload images is <{_imageCache.Usage.Count}>, Images Number: {_imageCache.CacheSize()}, Unique Items {_imageCache.UniqueImagesInCache()}");
+                Log.Info($"|ImageLoader.Initialize|Number of preload images is <{ImageCache.CacheSize()}>, Images Number: {ImageCache.CacheSize()}, Unique Items {ImageCache.UniqueImagesInCache()}");
             });
         }
 
@@ -62,13 +61,13 @@ namespace Flow.Launcher.Infrastructure.Image
         {
             lock (_storage)
             {
-                _storage.Save(_imageCache.CleanupAndToDictionary());
+                _storage.Save(ImageCache.Data.Select(x => (x.Key, x.Value.usage)).ToDictionary(x => x.Key, y => y.usage));
             }
         }
 
         private static ConcurrentDictionary<string, int> LoadStorageToConcurrentDictionary()
         {
-            lock(_storage)
+            lock (_storage)
             {
                 var loaded = _storage.TryLoad(new Dictionary<string, int>());
 
@@ -106,11 +105,11 @@ namespace Flow.Launcher.Infrastructure.Image
             {
                 if (string.IsNullOrEmpty(path))
                 {
-                    return new ImageResult(_imageCache[Constant.MissingImgIcon], ImageType.Error);
+                    return new ImageResult(ImageCache[Constant.MissingImgIcon], ImageType.Error);
                 }
-                if (_imageCache.ContainsKey(path))
+                if (ImageCache.ContainsKey(path))
                 {
-                    return new ImageResult(_imageCache[path], ImageType.Cache);
+                    return new ImageResult(ImageCache[path], ImageType.Cache);
                 }
 
                 if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
@@ -139,8 +138,8 @@ namespace Flow.Launcher.Infrastructure.Image
                     Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on first try", e);
                     Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on second try", e2);
 
-                    ImageSource image = _imageCache[Constant.MissingImgIcon];
-                    _imageCache[path] = image;
+                    ImageSource image = ImageCache[Constant.MissingImgIcon];
+                    ImageCache[path] = image;
                     imageResult = new ImageResult(image, ImageType.Error);
                 }
             }
@@ -191,7 +190,7 @@ namespace Flow.Launcher.Infrastructure.Image
             }
             else
             {
-                image = _imageCache[Constant.MissingImgIcon];
+                image = ImageCache[Constant.MissingImgIcon];
                 path = Constant.MissingImgIcon;
             }
 
@@ -218,27 +217,26 @@ namespace Flow.Launcher.Infrastructure.Image
 
             var img = imageResult.ImageSource;
             if (imageResult.ImageType != ImageType.Error && imageResult.ImageType != ImageType.Cache)
-            { 
-                // we need to get image hash
-                string hash = _enableHashImage ? _hashGenerator.GetHashFromImage(img) : null;
+            { // we need to get image hash
+                string hash = EnableImageHash ? _hashGenerator.GetHashFromImage(img) : null;
                 if (hash != null)
                 {
-                    if (_guidToKey.TryGetValue(hash, out string key))
-                    { 
-                        // image already exists
-                        img = _imageCache[key];
+                    
+                    if (GuidToKey.TryGetValue(hash, out string key))
+                    { // image already exists
+                        img = ImageCache[key] ?? img;
                     }
                     else
-                    { 
-                        // new guid
-                        _guidToKey[hash] = path;
+                    { // new guid
+                        GuidToKey[hash] = path;
                     }
                 }
 
                 // update cache
-                _imageCache[path] = img;
+                ImageCache[path] = img;
             }
 
+
             return img;
         }
 

Flow.Launcher.Infrastructure/PinyinAlphabet.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JetBrains.Annotations;
+using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Infrastructure.Storage;
+using Flow.Launcher.Infrastructure.UserSettings;
+using ToolGood.Words.Pinyin;
+using System.Threading.Tasks;
+
+namespace Flow.Launcher.Infrastructure
+{
+    public interface IAlphabet
+    {
+        string Translate(string stringToTranslate);
+    }
+
+    public class PinyinAlphabet : IAlphabet
+    {
+        private ConcurrentDictionary<string, string> _pinyinCache = new ConcurrentDictionary<string, string>();
+        private Settings _settings;
+
+        public void Initialize([NotNull] Settings settings)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+        }
+
+
+        public string Translate(string content)
+        {
+            if (_settings.ShouldUsePinyin)
+            {
+                if (!_pinyinCache.ContainsKey(content))
+                {
+                    if (WordsHelper.HasChinese(content))
+                    {
+                        var result = WordsHelper.GetPinyin(content, ";");
+                        result = GetFirstPinyinChar(result) + result.Replace(";", "");
+                        _pinyinCache[content] = result;
+                        return result;
+                    }
+                    else
+                    {
+                        return content;
+                    }
+                }
+                else
+                {
+                    return _pinyinCache[content];
+                }
+            }
+            else
+            {
+                return content;
+            }
+        }
+
+        private string GetFirstPinyinChar(string content)
+        {
+            return string.Concat(content.Split(';').Select(x => x.First()));
+        }
+    }
+}

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.2.1</Version>
-    <PackageVersion>1.2.1</PackageVersion>
-    <AssemblyVersion>1.2.1</AssemblyVersion>
-    <FileVersion>1.2.1</FileVersion>
+    <Version>1.2.2</Version>
+    <PackageVersion>1.2.2</PackageVersion>
+    <AssemblyVersion>1.2.2</AssemblyVersion>
+    <FileVersion>1.2.2</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -60,12 +60,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
 </Project>

Flow.Launcher.sln

@@ -53,6 +53,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
+		Directory.Build.targets = Directory.Build.targets
 		Scripts\flowlauncher.nuspec = Scripts\flowlauncher.nuspec
 		LICENSE = LICENSE
 		Scripts\post_build.ps1 = Scripts\post_build.ps1

Flow.Launcher/App.xaml.cs

@@ -29,7 +29,7 @@ namespace Flow.Launcher
         private SettingWindowViewModel _settingsVM;
         private readonly Updater _updater = new Updater(Flow.Launcher.Properties.Settings.Default.GithubRepo);
         private readonly Portable _portable = new Portable();
-        private readonly Alphabet _alphabet = new Alphabet();
+        private readonly PinyinAlphabet _alphabet = new PinyinAlphabet();
         private StringMatcher _stringMatcher;
 
         [STAThread]

Flow.Launcher/Flow.Launcher.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -72,23 +72,13 @@
 
   <ItemGroup>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Mages" Version="1.6.0" />
     <PackageReference Include="ModernWpfUI" Version="0.8.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
     <PackageReference Include="NuGet.CommandLine" Version="5.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
-    <PackageReference Include="System.Data.OleDb" Version="4.7.1" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.112" />
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-    <PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />
-    <PackageReference Include="UnidecodeSharp" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher/PublicAPIInstance.cs

@@ -21,11 +21,11 @@ namespace Flow.Launcher
     {
         private readonly SettingWindowViewModel _settingsVM;
         private readonly MainViewModel _mainVM;
-        private readonly Alphabet _alphabet;
+        private readonly PinyinAlphabet _alphabet;
 
         #region Constructor
 
-        public PublicAPIInstance(SettingWindowViewModel settingsVM, MainViewModel mainVM, Alphabet alphabet)
+        public PublicAPIInstance(SettingWindowViewModel settingsVM, MainViewModel mainVM, PinyinAlphabet alphabet)
         {
             _settingsVM = settingsVM;
             _mainVM = mainVM;
@@ -76,7 +76,6 @@ namespace Flow.Launcher
             _settingsVM.Save();
             PluginManager.Save();
             ImageLoader.Save();
-            _alphabet.Save();
         }
 
         public void ReloadAllPluginData()

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Bookmark.cs

@@ -19,10 +19,8 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
             set
             {
                 m_Name = value;
-                PinyinName = m_Name.Unidecode();
             }
         }
-        public string PinyinName { get; private set; }
         public string Url { get; set; }
         public string Source { get; set; }
         public int Score { get; set; }

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/Bookmarks.cs

@@ -6,19 +6,19 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Commands
 {
     internal static class Bookmarks
     {
-        internal static bool MatchProgram(Bookmark bookmark, string queryString)
+        internal static MatchResult MatchProgram(Bookmark bookmark, string queryString)
         {
-            if (StringMatcher.FuzzySearch(queryString, bookmark.Name).IsSearchPrecisionScoreMet()) return true;
-            if (StringMatcher.FuzzySearch(queryString, bookmark.PinyinName).IsSearchPrecisionScoreMet()) return true;
-            if (StringMatcher.FuzzySearch(queryString, bookmark.Url).IsSearchPrecisionScoreMet()) return true;
+            var match = StringMatcher.FuzzySearch(queryString, bookmark.Name);
+            if (match.IsSearchPrecisionScoreMet())
+                return match;
 
-            return false;
+            return StringMatcher.FuzzySearch(queryString, bookmark.Url);
         }
 
         internal static List<Bookmark> LoadAllBookmarks()
         {
             var allbookmarks = new List<Bookmark>();
-            
+
             var chromeBookmarks = new ChromeBookmarks();
             var mozBookmarks = new FirefoxBookmarks();
             var edgeBookmarks = new EdgeBookmarks();

Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarks.cs

@@ -18,7 +18,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
             return bookmarks;
         }
 
-        private void ParseEdgeBookmarks(String path, string source)
+        private void ParseEdgeBookmarks(string path, string source)
         {
             if (!File.Exists(path)) return;
 
@@ -72,12 +72,13 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
 
         private void LoadEdgeBookmarks()
         {
-            String platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            string platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             LoadEdgeBookmarks(Path.Combine(platformPath, @"Microsoft\Edge\User Data"), "Microsoft Edge");
+            LoadEdgeBookmarks(Path.Combine(platformPath, @"Microsoft\Edge Dev\User Data"), "Microsoft Edge Dev");
             LoadEdgeBookmarks(Path.Combine(platformPath, @"Microsoft\Edge SxS\User Data"), "Microsoft Edge Canary");
         }
 
-        private String DecodeUnicode(String dataStr)
+        private string DecodeUnicode(string dataStr)
         {
             Regex reg = new Regex(@"(?i)\\[uU]([0-9a-f]{4})");
             return reg.Replace(dataStr, m => ((char)Convert.ToInt32(m.Groups[1].Value, 16)).ToString());

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{9B130CC5-14FB-41FF-B310-0A95B6894C37}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.BrowserBookmark</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.BrowserBookmark</AssemblyName>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs

@@ -12,7 +12,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
     public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, ISavable
     {
         private PluginInitContext context;
-        
+
         private List<Bookmark> cachedBookmarks = new List<Bookmark>();
 
         private readonly Settings _settings;
@@ -37,36 +37,56 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
 
             // Should top results be returned? (true if no search parameters have been passed)
             var topResults = string.IsNullOrEmpty(param);
-            
-            var returnList = cachedBookmarks;
+
 
             if (!topResults)
             {
                 // Since we mixed chrome and firefox bookmarks, we should order them again                
-                returnList = cachedBookmarks.Where(o => Bookmarks.MatchProgram(o, param)).ToList();
-                returnList = returnList.OrderByDescending(o => o.Score).ToList();
-            }
-            
-            return returnList.Select(c => new Result()
-            {
-                Title = c.Name,
-                SubTitle = c.Url,
-                IcoPath = @"Images\bookmark.png",
-                Score = 5,
-                Action = (e) =>
+                var returnList = cachedBookmarks.Select(c => new Result()
                 {
-                    if (_settings.OpenInNewBrowserWindow)
+                    Title = c.Name,
+                    SubTitle = c.Url,
+                    IcoPath = @"Images\bookmark.png",
+                    Score = Bookmarks.MatchProgram(c, param).Score,
+                    Action = _ =>
                     {
-                        c.Url.NewBrowserWindow(_settings.BrowserPath);
-                    }
-                    else
-                    {
-                        c.Url.NewTabInBrowser(_settings.BrowserPath);
-                    }
+                        if (_settings.OpenInNewBrowserWindow)
+                        {
+                            c.Url.NewBrowserWindow(_settings.BrowserPath);
+                        }
+                        else
+                        {
+                            c.Url.NewTabInBrowser(_settings.BrowserPath);
+                        }
 
-                    return true;
-                }
-            }).ToList();
+                        return true;
+                    }
+                }).Where(r => r.Score > 0);
+                return returnList.ToList();
+            }
+            else
+            {
+                return cachedBookmarks.Select(c => new Result()
+                {
+                    Title = c.Name,
+                    SubTitle = c.Url,
+                    IcoPath = @"Images\bookmark.png",
+                    Score = 5,
+                    Action = _ =>
+                    {
+                        if (_settings.OpenInNewBrowserWindow)
+                        {
+                            c.Url.NewBrowserWindow(_settings.BrowserPath);
+                        }
+                        else
+                        {
+                            c.Url.NewTabInBrowser(_settings.BrowserPath);
+                        }
+
+                        return true;
+                    }
+                }).ToList();
+            }
         }
 
         public void ReloadData()

Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json

@@ -4,9 +4,9 @@
   "Name": "Browser Bookmarks",
   "Description": "Search your browser bookmarks",
   "Author": "qianlifeng, Ioannis G.",
-  "Version": "1.2.0",
+  "Version": "1.2.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
-  "ExecuteFileName": "Flow.Launcher.Plugin.browserBookmark.dll",
+  "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",
   "IcoPath": "Images\\bookmark.png"
 }

Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj

@@ -1,12 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{59BD9891-3837-438A-958D-ADC7F91F6F7E}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.Caculator</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.Caculator</AssemblyName>
-	<UseWPF>true</UseWPF>
+    <UseWPF>true</UseWPF>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -102,9 +104,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Mages" Version="1.6.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
   
 </Project>

Plugins/Flow.Launcher.Plugin.Calculator/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Calculator",
   "Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
   "Author": "cxfksword",
-  "Version": "1.0.1",
+  "Version": "1.0.2",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",

Plugins/Flow.Launcher.Plugin.Color/Flow.Launcher.Plugin.Color.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{F35190AA-4758-4D9E-A193-E3BDF6AD3567}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.Color</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.Color</AssemblyName>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -96,9 +98,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
-
 </Project>

Plugins/Flow.Launcher.Plugin.Color/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Colors",
   "Description": "Provide hex color preview.(Try #000 in Flow Launcher)",
   "Author": "qianlifeng",
-  "Version": "1.0.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Color.dll",

Plugins/Flow.Launcher.Plugin.ControlPanel/Flow.Launcher.Plugin.ControlPanel.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.ControlPanel</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.ControlPanel</AssemblyName>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -96,9 +98,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
-
 </Project>

Plugins/Flow.Launcher.Plugin.ControlPanel/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Control Panel",
   "Description": "Search within the Control Panel.",
   "Author": "CoenraadS",
-  "Version": "1.0.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.ControlPanel.dll",

Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <ApplicationIcon />
     <StartupObject />

Plugins/Flow.Launcher.Plugin.Explorer/plugin.json

@@ -7,7 +7,7 @@
   "Name": "Explorer",
   "Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
   "Author": "Jeremy Wu",
-  "Version": "1.2.4",
+  "Version": "1.2.5",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",

Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{FDED22C8-B637-42E8-824A-63B5B6E05A3A}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.PluginIndicator</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.PluginIndicator</AssemblyName>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -96,10 +98,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
 
 </Project>

Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Plugin Indicator",
   "Description": "Provide plugin actionword suggestion",
   "Author": "qianlifeng",
-  "Version": "1.0.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.PluginIndicator.dll",

Plugins/Flow.Launcher.Plugin.PluginManagement/Flow.Launcher.Plugin.PluginManagement.csproj

@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{049490F0-ECD2-4148-9B39-2135EC346EBE}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.PluginManagement</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.PluginManagement</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -97,10 +99,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
-
 </Project>

Plugins/Flow.Launcher.Plugin.PluginManagement/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Plugin Management",
   "Description": "Install/Remove/Update Flow Launcher plugins",
   "Author": "qianlifeng",
-  "Version": "1.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.PluginManagement.dll",

Plugins/Flow.Launcher.Plugin.ProcessKiller/Flow.Launcher.Plugin.ProcessKiller.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Flow.Launcher.Plugin.ProcessKiller</AssemblyName>
     <PackageId>Flow.Launcher.Plugin.ProcessKiller</PackageId>
@@ -8,6 +9,7 @@
     <PackageProjectUrl>https://github.com/Flow-Launcher/Flow.Launcher.Plugin.ProcessKiller</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Flow-Launcher/Flow.Launcher.Plugin.ProcessKiller</RepositoryUrl>
     <PackageTags>flow-launcher flow-plugin</PackageTags>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>

Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json

@@ -4,7 +4,7 @@
     "Name":"Process Killer",
     "Description":"kill running processes from Flow",
     "Author":"Flow-Launcher",
-    "Version":"1.1.0",
+    "Version":"1.1.1",
     "Language":"csharp",
     "Website":"https://github.com/Flow-Launcher/Flow.Launcher.Plugin.ProcessKiller",
     "IcoPath":"Images\\app.png",

Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{FDB3555B-58EF-4AE6-B5F1-904719637AB4}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -8,6 +9,7 @@
     <AssemblyName>Flow.Launcher.Plugin.Program</AssemblyName>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -107,10 +109,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="NLog" Version="4.7.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 

Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml

@@ -40,7 +40,12 @@
     <system:String x:Key="flowlauncher_plugin_program_plugin_description">Search programs in Flow Launcher</system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_invalid_path">Invalid Path</system:String>
-    
+
+    <system:String x:Key="flowlauncher_plugin_program_customizedexplorer">Customized Explorer</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_args">Args</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_tooltip_customizedexplorer">You can customized the explorer used for opening the container folder by inputing the Environmental Variable of the explorer you want to use. It will be useful to use CMD to test whether the Environmental Variable is avaliable.</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_tooltip_args">Enter the customized args you want to add for your customized explorer. %s for parent directory, %f for full path (which only works for win32). Check the explorer's website for details.</system:String>
+
     <!--Dialogs-->
     <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success">Success</system:String>
     <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success_message">Successfully disabled this program from displaying in your query</system:String>

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -71,21 +71,17 @@ namespace Flow.Launcher.Plugin.Program
             Win32[] win32;
             UWP.Application[] uwps;
 
-            lock (IndexLock)
-            { // just take the reference inside the lock to eliminate query time issues.
-                win32 = _win32s;
-                uwps = _uwps;
-            }
+            win32 = _win32s;
+            uwps = _uwps;
 
-            var results1 = win32.AsParallel()
-                .Where(p => p.Enabled)
-                .Select(p => p.Result(query.Search, _context.API));
+            var result = win32.Cast<IProgram>()
+                 .Concat(uwps)
+                 .AsParallel()
+                 .Where(p => p.Enabled)
+                 .Select(p => p.Result(query.Search, _context.API))
+                 .Where(r => r?.Score > 0)
+                 .ToList();
 
-            var results2 = uwps.AsParallel()
-                .Where(p => p.Enabled)
-                .Select(p => p.Result(query.Search, _context.API));
-
-            var result = results1.Concat(results2).Where(r => r != null && r.Score > 0).ToList();
             return result;
         }
 
@@ -97,10 +93,9 @@ namespace Flow.Launcher.Plugin.Program
         public static void IndexWin32Programs()
         {
             var win32S = Win32.All(_settings);
-            lock (IndexLock)
-            {
-                _win32s = win32S;
-            }
+
+            _win32s = win32S;
+
         }
 
         public static void IndexUWPPrograms()
@@ -109,10 +104,9 @@ namespace Flow.Launcher.Plugin.Program
             var support = Environment.OSVersion.Version.Major >= windows10.Major;
 
             var applications = support ? UWP.All() : new UWP.Application[] { };
-            lock (IndexLock)
-            {
-                _uwps = applications;
-            }
+
+            _uwps = applications;
+
         }
 
         public static void IndexPrograms()

Plugins/Flow.Launcher.Plugin.Program/Programs/IProgram.cs

@@ -9,5 +9,6 @@ namespace Flow.Launcher.Plugin.Program.Programs
         string UniqueIdentifier { get; set; }
         string Name { get; }
         string Location { get; }
+        bool Enabled { get; }
     }
 }

Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs

@@ -265,27 +265,30 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
             public Application(){}
 
-            private int Score(string query)
-            {
-                var displayNameMatch = StringMatcher.FuzzySearch(query, DisplayName);
-                var descriptionMatch = StringMatcher.FuzzySearch(query, Description);
-                var score = new[] { displayNameMatch.Score, descriptionMatch.Score }.Max();
-                return score;
-            }
 
             public Result Result(string query, IPublicAPI api)
             {
-                var score = Score(query);
-                if (score <= 0)
-                { // no need to create result if score is 0
+                var title = (Name, Description) switch
+                {
+                    (var n, null) => n,
+                    (var n, var d) when d.StartsWith(n) => d,
+                    (var n, var d) when n.StartsWith(d) => n,
+                    (var n, var d) when !string.IsNullOrEmpty(d) => $"{n}: {d}",
+                    _ => Name
+                };
+
+                var matchResult = StringMatcher.FuzzySearch(query, title);
+
+                if (!matchResult.Success)
                     return null;
-                }
 
                 var result = new Result
                 {
+                    Title = title,
                     SubTitle = Package.Location,
                     Icon = Logo,
-                    Score = score,
+                    Score = matchResult.Score,
+                    TitleHighlightData = matchResult.MatchData,
                     ContextData = this,
                     Action = e =>
                     {
@@ -294,23 +297,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     }
                 };
 
-                if (Description.Length >= DisplayName.Length &&
-                    Description.Substring(0, DisplayName.Length) == DisplayName)
-                {
-                    result.Title = Description;
-                    result.TitleHighlightData = StringMatcher.FuzzySearch(query, Description).MatchData;
-                }
-                else if (!string.IsNullOrEmpty(Description))
-                {
-                    var title = $"{DisplayName}: {Description}";
-                    result.Title = title;
-                    result.TitleHighlightData = StringMatcher.FuzzySearch(query, title).MatchData;
-                }
-                else
-                {
-                    result.Title = DisplayName;
-                    result.TitleHighlightData = StringMatcher.FuzzySearch(query, DisplayName).MatchData;
-                }
+
                 return result;
             }
 
@@ -324,7 +311,14 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
                         Action = _ =>
                         {
-                            Main.StartProcess(Process.Start, new ProcessStartInfo(Package.Location));
+                            Main.StartProcess(Process.Start, 
+                                                new ProcessStartInfo(
+                                                    !string.IsNullOrEmpty(Main._settings.CustomizedExplorer)
+                                                    ? Main._settings.CustomizedExplorer
+                                                    : Settings.Explorer,
+                                                    Main._settings.CustomizedArgs
+                                                        .Replace("%s",$"\"{Package.Location}\"")
+                                                        .Trim()));
 
                             return true;
                         },

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -33,29 +33,30 @@ namespace Flow.Launcher.Plugin.Program.Programs
         private const string ApplicationReferenceExtension = "appref-ms";
         private const string ExeExtension = "exe";
 
-        private int Score(string query)
-        {
-            var nameMatch = StringMatcher.FuzzySearch(query, Name);
-            var descriptionMatch = StringMatcher.FuzzySearch(query, Description);
-            var executableNameMatch = StringMatcher.FuzzySearch(query, ExecutableName);
-            var score = new[] { nameMatch.Score, descriptionMatch.Score, executableNameMatch.Score }.Max();
-            return score;
-        }
-
 
         public Result Result(string query, IPublicAPI api)
         {
-            var score = Score(query);
-            if (score <= 0)
-            { // no need to create result if this is zero
+            var title = (Name, Description) switch
+            {
+                (var n, null) => n,
+                (var n, var d) when d.StartsWith(n) => d,
+                (var n, var d) when n.StartsWith(d) => n,
+                (var n, var d) when !string.IsNullOrEmpty(d) => $"{n}: {d}",
+                _ => Name
+            };
+
+            var matchResult = StringMatcher.FuzzySearch(query, title);
+
+            if (!matchResult.Success)
                 return null;
-            }
 
             var result = new Result
             {
+                Title = title,
                 SubTitle = FullPath,
                 IcoPath = IcoPath,
-                Score = score,
+                Score = matchResult.Score,
+                TitleHighlightData = matchResult.MatchData,
                 ContextData = this,
                 Action = e =>
                 {
@@ -72,24 +73,6 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 }
             };
 
-            if (Description.Length >= Name.Length &&
-                Description.Substring(0, Name.Length) == Name)
-            {
-                result.Title = Description;
-                result.TitleHighlightData = StringMatcher.FuzzySearch(query, Description).MatchData;
-            }
-            else if (!string.IsNullOrEmpty(Description))
-            {
-                var title = $"{Name}: {Description}";
-                result.Title = title;
-                result.TitleHighlightData = StringMatcher.FuzzySearch(query, title).MatchData;
-            }
-            else
-            {
-                result.Title = Name;
-                result.TitleHighlightData = StringMatcher.FuzzySearch(query, Name).MatchData;
-            }
-
             return result;
         }
 
@@ -140,9 +123,20 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     Title = api.GetTranslation("flowlauncher_plugin_program_open_containing_folder"),
                     Action = _ =>
                     {
+                        var args = !string.IsNullOrWhiteSpace(Main._settings.CustomizedArgs)
+                                    ? Main._settings.CustomizedArgs
+                                        .Replace("%s",$"\"{ParentDirectory}\"")
+                                        .Replace("%f",$"\"{FullPath}\"")
+                                    : Main._settings.CustomizedExplorer==Settings.Explorer
+                                        ? $"/select,\"{FullPath}\""
+                                        : Settings.ExplorerArgs;
 
-
-                        Main.StartProcess(Process.Start, new ProcessStartInfo("explorer", ParentDirectory));
+                        Main.StartProcess(Process.Start, 
+                                            new ProcessStartInfo(
+                                                !string.IsNullOrWhiteSpace(Main._settings.CustomizedExplorer)
+                                                ? Main._settings.CustomizedExplorer
+                                                : Settings.Explorer,
+                                                args));
 
                         return true;
                     },
@@ -255,9 +249,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 var program = Win32Program(path);
                 var info = FileVersionInfo.GetVersionInfo(path);
                 if (!string.IsNullOrEmpty(info.FileDescription))
-                {
                     program.Description = info.FileDescription;
-                }
                 return program;
             }
             catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
@@ -273,47 +265,23 @@ namespace Flow.Launcher.Plugin.Program.Programs
         {
             if (!Directory.Exists(directory))
                 return new string[] { };
-            var files = new List<string>();
-            var folderQueue = new Queue<string>();
-            folderQueue.Enqueue(directory);
-            do
+            try
             {
-                var currentDirectory = folderQueue.Dequeue();
-                try
-                {
-                    foreach (var suffix in suffixes)
-                    {
-                        try
-                        {
-                            files.AddRange(Directory.EnumerateFiles(currentDirectory, $"*.{suffix}", SearchOption.TopDirectoryOnly));
-                        }
-                        catch (DirectoryNotFoundException e)
-                        {
-                            ProgramLogger.LogException($"|Win32|ProgramPaths|{currentDirectory}" +
-                                                "|The directory trying to load the program from does not exist", e);
-                        }
-                    }
-                }
-                catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
-                {
-                    ProgramLogger.LogException($"|Win32|ProgramPaths|{currentDirectory}" +
-                                                $"|Permission denied when trying to load programs from {currentDirectory}", e);
-                }
+                var paths = Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories)
+                                     .Where(x => suffixes.Contains(Extension(x)));
+                return paths;
 
-                try
-                {
-                    foreach (var childDirectory in Directory.EnumerateDirectories(currentDirectory, "*", SearchOption.TopDirectoryOnly))
-                    {
-                        folderQueue.Enqueue(childDirectory);
-                    }
-                }
-                catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
-                {
-                    ProgramLogger.LogException($"|Win32|ProgramPaths|{currentDirectory}" +
-                                                $"|Permission denied when trying to load programs from {currentDirectory}", e);
-                }
-            } while (folderQueue.Any());
-            return files;
+            }
+            catch (DirectoryNotFoundException e)
+            {
+                ProgramLogger.LogException($"Directory not found {directory}", e);
+                return new string[] { };
+            }
+            catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
+            {
+                ProgramLogger.LogException($"Permission denied {directory}", e);
+                return new string[] { };
+            }
         }
 
         private static string Extension(string path)
@@ -331,23 +299,20 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
         private static ParallelQuery<Win32> UnregisteredPrograms(List<Settings.ProgramSource> sources, string[] suffixes)
         {
-            var listToAdd = new List<string>();
-            sources.Where(s => Directory.Exists(s.Location) && s.Enabled)
+            var paths = sources.Where(s => Directory.Exists(s.Location) && s.Enabled)
                 .SelectMany(s => ProgramPaths(s.Location, suffixes))
-                .ToList()
                 .Where(t1 => !Main._settings.DisabledProgramSources.Any(x => t1 == x.UniqueIdentifier))
-                .ToList()
-                .ForEach(x => listToAdd.Add(x));
+                .Distinct();
 
-            var paths = listToAdd.Distinct().ToArray();
+            var programs = paths.AsParallel().Select(x => Extension(x) switch
+            {
+                ExeExtension => ExeProgram(x),
+                ShortcutExtension => LnkProgram(x),
+                _ => Win32Program(x)
+            });
 
-            var programs1 = paths.AsParallel().Where(p => Extension(p) == ExeExtension).Select(ExeProgram);
-            var programs2 = paths.AsParallel().Where(p => Extension(p) == ShortcutExtension).Select(LnkProgram);
-            var programs3 = from p in paths.AsParallel()
-                            let e = Extension(p)
-                            where e != ShortcutExtension && e != ExeExtension
-                            select Win32Program(p);
-            return programs1.Concat(programs2).Concat(programs3);
+
+            return programs;
         }
 
         private static ParallelQuery<Win32> StartMenuPrograms(string[] suffixes)
@@ -360,15 +325,16 @@ namespace Flow.Launcher.Plugin.Program.Programs
             var paths2 = ProgramPaths(directory2, suffixes);
 
             var toFilter = paths1.Concat(paths2);
-            var paths = toFilter
-                        .Where(t1 => !disabledProgramsList.Any(x => x.UniqueIdentifier == t1))
-                        .Select(t1 => t1)
-                        .Distinct()
-                        .ToArray();
 
-            var programs1 = paths.AsParallel().Where(p => Extension(p) == ShortcutExtension).Select(LnkProgram);
-            var programs2 = paths.AsParallel().Where(p => Extension(p) == ApplicationReferenceExtension).Select(Win32Program);
-            var programs = programs1.Concat(programs2).Where(p => p.Valid);
+            var programs = toFilter
+                        .AsParallel()
+                        .Where(t1 => !disabledProgramsList.Any(x => x.UniqueIdentifier == t1))
+                        .Distinct()
+                        .Select(x => Extension(x) switch
+                            {
+                                ShortcutExtension => LnkProgram(x),
+                                _ => Win32Program(x)
+                            }).Where(x => x.Valid);
             return programs;
         }
 

Plugins/Flow.Launcher.Plugin.Program/Settings.cs

@@ -14,9 +14,15 @@ namespace Flow.Launcher.Plugin.Program
         public bool EnableStartMenuSource { get; set; } = true;
 
         public bool EnableRegistrySource { get; set; } = true;
+        public string CustomizedExplorer { get; set; } = Explorer;
+        public string CustomizedArgs { get; set; } = ExplorerArgs;
 
         internal const char SuffixSeperator = ';';
 
+        internal const string Explorer = "explorer";
+
+        internal const string ExplorerArgs = "%s";
+
         /// <summary>
         /// Contains user added folder location contents as well as all user disabled applications
         /// </summary>

Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml

@@ -5,12 +5,13 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:program="clr-namespace:Flow.Launcher.Plugin.Program"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="600">
+             d:DesignHeight="404.508" d:DesignWidth="600">
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="75"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="50"/>
+            <RowDefinition Height="50"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Stretch">
             <StackPanel Orientation="Vertical" Width="205">
@@ -24,7 +25,7 @@
             </StackPanel>
         </StackPanel>
         <ListView x:Name="programSourceView" Grid.Row="1" AllowDrop="True" SelectionMode="Extended" Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
-                  Margin="0 13 0 0"
+                  Margin="0,13,0,10"
                   BorderBrush="DarkGray"
                   BorderThickness="1"
                   GridViewColumnHeader.Click="GridViewColumnHeaderClickedHandler"
@@ -63,7 +64,7 @@
                 </GridView>
             </ListView.View>
         </ListView>
-        <DockPanel  Grid.Row="2">
+        <DockPanel  Grid.Row="2" Margin="0,0,0,0" Grid.RowSpan="1">
             <StackPanel x:Name="indexingPanel" Visibility="Hidden" HorizontalAlignment="Left" Orientation="Horizontal">
                 <ProgressBar x:Name="progressBarIndexing" Height="20" Width="80" Minimum="0" Maximum="100" IsIndeterminate="True" />
                 <TextBlock Margin="10 0 0 0" Height="20" HorizontalAlignment="Center" Text="{DynamicResource flowlauncher_plugin_program_indexing}" />
@@ -71,9 +72,18 @@
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button x:Name="btnProgramSourceStatus" Click="btnProgramSourceStatus_OnClick" Width="100" Margin="10" Content="{DynamicResource flowlauncher_plugin_program_disable}" />
                 <Button x:Name="btnEditProgramSource" Click="btnEditProgramSource_OnClick" Width="100" Margin="10" Content="{DynamicResource flowlauncher_plugin_program_edit}"/>
-                <Button x:Name="btnAddProgramSource" Click="btnAddProgramSource_OnClick" Width="100" Margin="10" Content="{DynamicResource flowlauncher_plugin_program_add}"/>
+                <Button x:Name="btnAddProgramSource" Click="btnAddProgramSource_OnClick" Width="100" Margin="10 10 0 10" Content="{DynamicResource flowlauncher_plugin_program_add}"/>
             </StackPanel>
         </DockPanel>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Stretch">
+            <TextBlock Text="{DynamicResource flowlauncher_plugin_program_customizedexplorer}" VerticalAlignment="Center" FontSize="15"
+                   ToolTip= "{DynamicResource flowlauncher_plugin_program_tooltip_customizedexplorer}"/>
+            <TextBox Margin="10,0,10,0" TextWrapping="NoWrap" VerticalAlignment="Center" Width="200" Height="30" FontSize="15"
+                 TextChanged="CustomizeExplorer" x:Name="CustomizeExplorerBox"/>
+            <TextBlock Text="{DynamicResource flowlauncher_plugin_program_args}" VerticalAlignment="Center" FontSize="15"
+                       ToolTip="{DynamicResource flowlauncher_plugin_program_tooltip_args}" />
+            <TextBox Margin="10,0,0,0" Width="135" Height="30" FontSize="15" x:Name="CustomizeArgsBox" TextChanged="CustomizeExplorerArgs"></TextBox>
+        </StackPanel>
     </Grid>
 </UserControl>
 

Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs

@@ -43,6 +43,9 @@ namespace Flow.Launcher.Plugin.Program.Views
             StartMenuEnabled.IsChecked = _settings.EnableStartMenuSource;
             RegistryEnabled.IsChecked = _settings.EnableRegistrySource;
 
+            CustomizeExplorerBox.Text = _settings.CustomizedExplorer;
+            CustomizeArgsBox.Text = _settings.CustomizedArgs;
+
             ViewRefresh();
         }
 
@@ -326,5 +329,15 @@ namespace Flow.Launcher.Plugin.Program.Views
                 btnProgramSourceStatus.Content = "Enable";
             }
         }
+
+        private void CustomizeExplorer(object sender, TextChangedEventArgs e)
+        {
+            _settings.CustomizedExplorer = CustomizeExplorerBox.Text;
+        }
+
+        private void CustomizeExplorerArgs(object sender, TextChangedEventArgs e)
+        {
+            _settings.CustomizedArgs = CustomizeArgsBox.Text;
+        }
     }
 }

Plugins/Flow.Launcher.Plugin.Program/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Program",
   "Description": "Search programs in Flow.Launcher",
   "Author": "qianlifeng",
-  "Version": "1.0.0",
+  "Version": "1.1.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",

Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj

@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.Shell</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.Shell</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -94,9 +96,6 @@
   
   <ItemGroup>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
   
 </Project>

Plugins/Flow.Launcher.Plugin.Shell/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Shell",
   "Description": "Provide executing commands from Flow Launcher. Commands should start with >",
   "Author": "qianlifeng",
-  "Version": "1.0.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",

Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj

@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{0B9DE348-9361-4940-ADB6-F5953BFFCCEC}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.Sys</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.Sys</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -125,10 +127,5 @@
   <ItemGroup>
     <Folder Include="Images\Images\" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
   
 </Project>

Plugins/Flow.Launcher.Plugin.Sys/plugin.json

@@ -4,7 +4,7 @@
   "Name": "System Commands",
   "Description": "Provide System related commands. e.g. shutdown,lock,setting etc.",
   "Author": "qianlifeng",
-  "Version": "1.0.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",

Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj

@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{A3DCCBCA-ACC1-421D-B16E-210896234C26}</ProjectGuid>
     <UseWPF>true</UseWPF>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.Url</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.Url</AssemblyName>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -88,10 +90,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
 
 </Project>

Plugins/Flow.Launcher.Plugin.Url/plugin.json

@@ -4,7 +4,7 @@
   "Name": "URL",
   "Description": "Open the typed URL from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.0.0",
+  "Version": "1.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Url.dll",

Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
+    <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{403B57F2-1856-4FC7-8A24-36AB346B763E}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flow.Launcher.Plugin.WebSearch</RootNamespace>
     <AssemblyName>Flow.Launcher.Plugin.WebSearch</AssemblyName>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
@@ -139,12 +141,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Flow.Launcher.Core\Flow.Launcher.Core.csproj" />
     <ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />

Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json

@@ -25,7 +25,7 @@
   "Name": "Web Searches",
   "Description": "Provide the web search ability",
   "Author": "qianlifeng",
-  "Version": "1.0.1",
+  "Version": "1.0.2",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.WebSearch.dll",

SolutionAssemblyInfo.cs

@@ -16,6 +16,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.3.1")]
-[assembly: AssemblyFileVersion("1.3.1")]
-[assembly: AssemblyInformationalVersion("1.3.1")]
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
+[assembly: AssemblyInformationalVersion("1.4.0")]

appveyor.yml

@@ -1,4 +1,4 @@
-version: '1.3.1.{build}'
+version: '1.4.0.{build}'
 
 init:
 - ps: |
@@ -31,4 +31,12 @@ artifacts:
 - path: 'Output\Packages\Flow-Launcher-*.zip'
   name: Zip
 - path: 'Output\Release\Flow.Launcher.Plugin.*.nupkg'
-  name: Plugin nupkg
+  name: Plugin nupkg
+
+deploy:
+  provider: NuGet
+  artifact: /.*\.nupkg/
+  api_key:
+    secure: n80IeWR3pN81p0w4uXq4mO0TdTXoJSHHFL+yTB9YBJ0Wni2DjZGYwOFdaWzW4hRi
+  on:
+    branch: master