Merge branch 'dev' into SelectBrowserCore

2026-03-11 08:54:32 +00:00 · 2023-02-10 11:06:09 +09:00 · 2023-02-10 11:06:09 +09:00 · ef16484957
commit ef16484957
parent a6d3aafe9b 70015e2d75
46 changed files with 122 additions and 131 deletions
--- a/Flow.Launcher.Core/Flow.Launcher.Core.csproj
+++ b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <UseWpf>true</UseWpf>
    <UseWindowsForms>true</UseWindowsForms>
    <OutputType>Library</OutputType>
--- a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
+++ b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</ProjectGuid>
    <OutputType>Library</OutputType>
    <UseWpf>true</UseWpf>
--- a/Flow.Launcher.Infrastructure/Storage/JsonStorage.cs
+++ b/Flow.Launcher.Infrastructure/Storage/JsonStorage.cs
@ -13,12 +13,17 @@ namespace Flow.Launcher.Infrastructure.Storage
    public class JsonStorage<T> where T : new()
    {
        protected T? Data;
+
        // need a new directory name
        public const string DirectoryName = "Settings";
        public const string FileSuffix = ".json";
+
        protected string FilePath { get; init; } = null!;
+
        private string TempFilePath => $"{FilePath}.tmp";
+
        private string BackupFilePath => $"{FilePath}.bak";
+
        protected string DirectoryPath { get; init; } = null!;


@ -35,7 +40,7 @@ namespace Flow.Launcher.Infrastructure.Storage
            {
                try
                {
-                    Data = JsonSerializer.Deserialize<T>(serialized)?? TryLoadBackup() ?? LoadDefault();
+                    Data = JsonSerializer.Deserialize<T>(serialized) ?? TryLoadBackup() ?? LoadDefault();
                }
                catch (JsonException)
                {
@ -46,6 +51,7 @@ namespace Flow.Launcher.Infrastructure.Storage
            {
                Data = TryLoadBackup() ?? LoadDefault();
            }
+
            return Data.NonNull();
        }

@ -67,12 +73,19 @@ namespace Flow.Launcher.Infrastructure.Storage
            try
            {
                var data = JsonSerializer.Deserialize<T>(File.ReadAllText(BackupFilePath));
+
                if (data != null)
                {
                    Log.Info($"|JsonStorage.Load|Failed to load settings.json, {BackupFilePath} restored successfully");
-                    File.Replace(BackupFilePath, FilePath, null);
+                    
+                    if(File.Exists(FilePath))
+                        File.Replace(BackupFilePath, FilePath, null);
+                    else
+                        File.Move(BackupFilePath, FilePath);
+
                    return data;
                }
+
                return default;
            }
            catch (JsonException)
@ -94,14 +107,22 @@ namespace Flow.Launcher.Infrastructure.Storage

        public void Save()
        {
-            string serialized = JsonSerializer.Serialize(Data, new JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
+            string serialized = JsonSerializer.Serialize(Data,
+                new JsonSerializerOptions
+                {
+                    WriteIndented = true
+                });

            File.WriteAllText(TempFilePath, serialized);
-            File.Replace(TempFilePath, FilePath, BackupFilePath);
-            File.Delete(TempFilePath);
+
+            if (!File.Exists(FilePath))
+            {
+                File.Move(TempFilePath, FilePath);
+            }
+            else
+            {
+                File.Replace(TempFilePath, FilePath, BackupFilePath);
+            }
        }
    }
 }
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}</ProjectGuid>
    <UseWPF>true</UseWPF>
    <OutputType>Library</OutputType>
@ -14,10 +14,10 @@
  </PropertyGroup>

  <PropertyGroup>
-    <Version>3.1.0</Version>
-    <PackageVersion>3.1.0</PackageVersion>
-    <AssemblyVersion>3.1.0</AssemblyVersion>
-    <FileVersion>3.1.0</FileVersion>
+    <Version>4.0.0</Version>
+    <PackageVersion>4.0.0</PackageVersion>
+    <AssemblyVersion>4.0.0</AssemblyVersion>
+    <FileVersion>4.0.0</FileVersion>
    <PackageId>Flow.Launcher.Plugin</PackageId>
    <Authors>Flow-Launcher</Authors>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
@ -65,7 +65,7 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
  </ItemGroup>
--- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj
+++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
    <ProjectGuid>{FF742965-9A80-41A5-B042-D6C7D3A21708}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
@ -54,7 +54,7 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
  </ItemGroup>

 </Project>
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@ -2,7 +2,7 @@
  
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
    <UseWPF>true</UseWPF>
    <UseWindowsForms>true</UseWindowsForms>
    <StartupObject>Flow.Launcher.App</StartupObject>
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@ -103,7 +103,7 @@ namespace Flow.Launcher

        private void tbHotkey_LostFocus(object sender, RoutedEventArgs e)
        {
-            tbHotkey.Text = CurrentHotkey.ToString();
+            tbHotkey.Text = CurrentHotkey?.ToString() ?? "";
            tbHotkey.Select(tbHotkey.Text.Length, 0);
        }

--- a/Flow.Launcher/Properties/PublishProfiles/Net7.0-SelfContained.pubxml
+++ b/Flow.Launcher/Properties/PublishProfiles/Net7.0-SelfContained.pubxml
@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <PublishProtocol>FileSystem</PublishProtocol>
    <Configuration>Release</Configuration>
    <Platform>Any CPU</Platform>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
    <PublishDir>..\Output\Release\</PublishDir>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@ -1,4 +1,4 @@
-using System;
+ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <UseWPF>true</UseWPF>
    <ProjectGuid>{9B130CC5-14FB-41FF-B310-0A95B6894C37}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
@ -4,7 +4,7 @@
  "Name": "Browser Bookmarks",
  "Description": "Search your browser bookmarks",
  "Author": "qianlifeng, Ioannis G.",
-  "Version": "2.0.0",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{59BD9891-3837-438A-958D-ADC7F91F6F7E}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Flow.Launcher.Plugin.Caculator</RootNamespace>
--- a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
+++ b/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": "2.0.1",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@ -177,7 +177,7 @@ namespace Flow.Launcher.Plugin.Explorer
                            try
                            {
                                if (MessageBox.Show(
-                                        Context.API.GetTranslation("plugin_explorer_deletefilefolderconfirm"),
+                                        string.Format(Context.API.GetTranslation("plugin_explorer_delete_folder_link"), record.FullPath),
                                        string.Empty,
                                        MessageBoxButton.YesNo,
                                        MessageBoxIcon.Warning)
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <UseWPF>true</UseWPF>
    <UseWindowsForms>true</UseWindowsForms>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@ -45,7 +45,7 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="System.Data.OleDb" Version="5.0.0" />
+    <PackageReference Include="System.Data.OleDb" Version="7.0.0" />
    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
    <PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />
  </ItemGroup>
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@ -7,8 +7,8 @@
    <system:String x:Key="plugin_explorer_make_selection_warning">Please make a selection first</system:String>
    <system:String x:Key="plugin_explorer_select_folder_link_warning">Please select a folder link</system:String>
    <system:String x:Key="plugin_explorer_delete_folder_link">Are you sure you want to delete {0}?</system:String>
-    <system:String x:Key="plugin_explorer_deletefolderconfirm">Are you sure you want to permanently delete this folder?</system:String>
    <system:String x:Key="plugin_explorer_deletefileconfirm">Are you sure you want to permanently delete this file?</system:String>
+    <system:String x:Key="plugin_explorer_deletefilefolderconfirm">Are you sure you want to permanently delete this file/folder?</system:String>
    <system:String x:Key="plugin_explorer_deletefilefoldersuccess">Deletion successful</system:String>
    <system:String x:Key="plugin_explorer_deletefilefoldersuccess_detail">Successfully deleted {0}</system:String>
    <system:String x:Key="plugin_explorer_globalActionKeywordInvalid">Assigning the global action keyword could bring up too many results during search. Please choose a specific action keyword</system:String>
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingAPI.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingAPI.cs
@ -13,13 +13,12 @@ using Flow.Launcher.Plugin.Explorer.Exceptions;

 namespace Flow.Launcher.Plugin.Explorer.Search.Everything
 {
-
    public static class EverythingApi
    {
-
        private const int BufferSize = 4096;

        private static SemaphoreSlim _semaphore = new(1, 1);
+
        // cached buffer to remove redundant allocations.
        private static readonly StringBuilder buffer = new(BufferSize);

@ -35,46 +34,6 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything
            InvalidCallError
        }

-        /// <summary>
-        /// Gets or sets a value indicating whether [match path].
-        /// </summary>
-        /// <value><c>true</c> if [match path]; otherwise, <c>false</c>.</value>
-        public static bool MatchPath
-        {
-            get => EverythingApiDllImport.Everything_GetMatchPath();
-            set => EverythingApiDllImport.Everything_SetMatchPath(value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [match case].
-        /// </summary>
-        /// <value><c>true</c> if [match case]; otherwise, <c>false</c>.</value>
-        public static bool MatchCase
-        {
-            get => EverythingApiDllImport.Everything_GetMatchCase();
-            set => EverythingApiDllImport.Everything_SetMatchCase(value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [match whole word].
-        /// </summary>
-        /// <value><c>true</c> if [match whole word]; otherwise, <c>false</c>.</value>
-        public static bool MatchWholeWord
-        {
-            get => EverythingApiDllImport.Everything_GetMatchWholeWord();
-            set => EverythingApiDllImport.Everything_SetMatchWholeWord(value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable regex].
-        /// </summary>
-        /// <value><c>true</c> if [enable regex]; otherwise, <c>false</c>.</value>
-        public static bool EnableRegex
-        {
-            get => EverythingApiDllImport.Everything_GetRegex();
-            set => EverythingApiDllImport.Everything_SetRegex(value);
-        }
-
        /// <summary>
        /// Checks whether the sort option is Fast Sort.
        /// </summary>
@ -95,7 +54,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything

            try
            {
-                EverythingApiDllImport.Everything_GetMajorVersion(); 
+                EverythingApiDllImport.Everything_GetMajorVersion();
                var result = EverythingApiDllImport.Everything_GetLastError() != StateCode.IPCError;
                return result;
            }
@ -122,7 +81,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything
            
            await _semaphore.WaitAsync(token);

-            
+
            try
            {
                if (token.IsCancellationRequested)
@ -152,6 +111,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything
                EverythingApiDllImport.Everything_SetMax(option.MaxCount);

                EverythingApiDllImport.Everything_SetSort(option.SortOption);
+                EverythingApiDllImport.Everything_SetMatchPath(option.IsFullPathSearch);

                if (token.IsCancellationRequested) yield break;

--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchOption.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchOption.cs
@ -3,12 +3,15 @@ using Flow.Launcher.Plugin.Everything.Everything;

 namespace Flow.Launcher.Plugin.Explorer.Search.Everything
 {
-    public record struct EverythingSearchOption(string Keyword, 
+    public record struct EverythingSearchOption(
+        string Keyword,
        SortOption SortOption,
-        bool IsContentSearch = false, 
+        bool IsContentSearch = false,
        string ContentSearchKeyword = default,
        string ParentPath = default,
        bool IsRecursive = true,
-        int Offset = 0, 
-        int MaxCount = 100);
+        int Offset = 0,
+        int MaxCount = 100,
+        bool IsFullPathSearch = true
+    );
 }
--- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
@ -10,7 +10,7 @@
  "Name": "Explorer",
  "Description": "Find and manage files and folders via Windows Search or Everything",
  "Author": "Jeremy Wu",
-  "Version": "2.2.0",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",
--- a/Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj
+++ b/Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{FDED22C8-B637-42E8-824A-63B5B6E05A3A}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Flow.Launcher.Plugin.PluginIndicator</RootNamespace>
--- a/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json
@ -1,10 +1,10 @@
 {
  "ID": "6A122269676E40EB86EB543B945932B9",
-  "ActionKeyword": "*",
+  "ActionKeyword": "?",
  "Name": "Plugin Indicator",
  "Description": "Provides plugin action keyword suggestions",
  "Author": "qianlifeng",
-  "Version": "2.0.1",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.PluginIndicator.dll",
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Flow.Launcher.Plugin.PluginsManager.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <UseWPF>true</UseWPF>
    <UseWindowsForms>true</UseWindowsForms>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@ -38,6 +38,6 @@
  </ItemGroup>
  
  <ItemGroup>
-    <PackageReference Include="SharpZipLib" Version="1.3.3" />
+    <PackageReference Include="SharpZipLib" Version="1.4.1" />
  </ItemGroup>
 </Project>
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@ -5,7 +5,7 @@

    <!--  Dialogues  -->
    <system:String x:Key="plugin_pluginsmanager_downloading_plugin">Downloading plugin</system:String>
-    <system:String x:Key="plugin_pluginsmanager_download_success">Successfully downloaded</system:String>
+    <system:String x:Key="plugin_pluginsmanager_download_success">Successfully downloaded {0}</system:String>
    <system:String x:Key="plugin_pluginsmanager_download_error">Error: Unable to download the plugin</system:String>
    <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3}Would you like to uninstall this plugin? After the uninstallation Flow will automatically restart.</system:String>
    <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
@ -13,7 +13,7 @@
    <system:String x:Key="plugin_pluginsmanager_installing_plugin">Installing Plugin</system:String>
    <system:String x:Key="plugin_pluginsmanager_install_from_web">Download and install {0}</system:String>
    <system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
-    <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin successfully installed. Restarting Flow, please wait...</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_success_restart">Plugin {0} successfully installed. Restarting Flow, please wait...</system:String>
    <system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Unable to find the plugin.json metadata file from the extracted zip file.</system:String>
    <system:String x:Key="plugin_pluginsmanager_install_error_duplicate">Error: A plugin which has the same or greater version with {0} already exists.</system:String>
    <system:String x:Key="plugin_pluginsmanager_install_error_title">Error installing plugin</system:String>
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@ -157,7 +157,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
                await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);

                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
-                    Context.API.GetTranslation("plugin_pluginsmanager_download_success"));
+                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_download_success"), plugin.Name));

                Install(plugin, filePath);
            }
@ -177,7 +177,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
            }

            Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_installing_plugin"),
-                Context.API.GetTranslation("plugin_pluginsmanager_install_success_restart"));
+                string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_success_restart"), plugin.Name));

            Context.API.RestartApp();
        }
@ -245,7 +245,7 @@ namespace Flow.Launcher.Plugin.PluginsManager

                                    Context.API.ShowMsg(
                                        Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
-                                        Context.API.GetTranslation("plugin_pluginsmanager_download_success"));
+                                        string.Format(Context.API.GetTranslation("plugin_pluginsmanager_download_success"), x.Name));

                                    Install(x.PluginNewUserPlugin, downloadToFilePath);

--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json
@ -6,7 +6,7 @@
  "Name": "Plugins Manager",
  "Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
  "Author": "Jeremy Wu",
-  "Version": "2.0.1",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",
--- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/Flow.Launcher.Plugin.ProcessKiller.csproj
+++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/Flow.Launcher.Plugin.ProcessKiller.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <AssemblyName>Flow.Launcher.Plugin.ProcessKiller</AssemblyName>
    <PackageId>Flow.Launcher.Plugin.ProcessKiller</PackageId>
    <Authors>Flow-Launcher</Authors>
--- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
@ -4,7 +4,7 @@
    "Name":"Process Killer",
    "Description":"Kill running processes from Flow",
    "Author":"Flow-Launcher",
-    "Version":"2.0.0",
+    "Version":"3.0.0",
    "Language":"csharp",
    "Website":"https://github.com/Flow-Launcher/Flow.Launcher.Plugin.ProcessKiller",
    "IcoPath":"Images\\app.png",
--- a/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
    <ProjectGuid>{FDB3555B-58EF-4AE6-B5F1-904719637AB4}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Flow.Launcher.Plugin.Program</RootNamespace>
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
@ -408,6 +408,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                var result = new Result
                {
                    Title = title,
+                    AutoCompleteText = Name,
                    SubTitle = Main._settings.HideAppsPath ? string.Empty : Location,
                    IcoPath = LogoPath,
                    Preview = new Result.PreviewInfo
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@ -25,23 +25,29 @@ namespace Flow.Launcher.Plugin.Program.Programs
        public string Name { get; set; }
        public string UniqueIdentifier { get => _uid; set => _uid = value == null ? string.Empty : value.ToLowerInvariant(); } // For path comparison
        public string IcoPath { get; set; }
+
        /// <summary>
        /// Path of the file. It's the path of .lnk and .url for .lnk and .url files.
        /// </summary>
        public string FullPath { get; set; }
+
        /// <summary>
        /// Path of the executable for .lnk, or the URL for .url. Arguments are included if any.
        /// </summary>
        public string LnkResolvedPath { get; set; }
+
        /// <summary>
        /// Path of the actual executable file. Args are included.
        /// </summary>
        public string ExecutablePath => LnkResolvedPath ?? FullPath;
+
        public string ParentDirectory { get; set; }
+
        /// <summary>
        /// Name of the executable for .lnk files
        /// </summary>
        public string ExecutableName { get; set; }
+
        public string Description { get; set; }
        public bool Valid { get; set; }
        public bool Enabled { get; set; }
@ -155,6 +161,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
            var result = new Result
            {
                Title = title,
+                AutoCompleteText = resultName,
                SubTitle = subtitle,
                IcoPath = IcoPath,
                Score = matchResult.Score,
@ -198,8 +205,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
                    {
                        var info = new ProcessStartInfo
                        {
-                            FileName = FullPath,
-                            WorkingDirectory = ParentDirectory,
+                            FileName = FullPath, 
+                            WorkingDirectory = ParentDirectory, 
                            UseShellExecute = true
                        };

@ -362,6 +369,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                {
                    return program;
                }
+
                foreach (var protocol in protocols)
                {
                    if (url.StartsWith(protocol))
@ -417,10 +425,10 @@ namespace Flow.Launcher.Plugin.Program.Programs
            if (!Directory.Exists(directory))
                return Enumerable.Empty<string>();

-            return Directory.EnumerateFiles(directory, "*", new EnumerationOptions
-            {
-                IgnoreInaccessible = true, RecurseSubdirectories = recursive
-            }).Where(x => suffixes.Contains(Extension(x)));
+            return Directory.EnumerateFiles(
+                    directory, "*",
+                    new EnumerationOptions { IgnoreInaccessible = true, RecurseSubdirectories = recursive })
+                .Where(x => suffixes.Contains(Extension(x)));
        }

        private static string Extension(string path)
@ -449,14 +457,11 @@ namespace Flow.Launcher.Plugin.Program.Programs

        private static IEnumerable<Win32> StartMenuPrograms(string[] suffixes, string[] protocols)
        {
-            var directory1 = Environment.GetFolderPath(Environment.SpecialFolder.Programs);
-            var directory2 = Environment.GetFolderPath(Environment.SpecialFolder.CommonPrograms);
-            var paths1 = EnumerateProgramsInDir(directory1, suffixes);
-            var paths2 = EnumerateProgramsInDir(directory2, suffixes);
+            var allPrograms = GetStartMenuPaths()
+                .SelectMany(p => EnumerateProgramsInDir(p, suffixes))
+                .Distinct();

-            var toFilter = paths1.Concat(paths2);
-
-            var programs = ExceptDisabledSource(toFilter.Distinct())
+            var programs = ExceptDisabledSource(allPrograms)
                .Select(x => GetProgramFromPath(x, protocols));
            return programs;
        }
@ -470,7 +475,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
            }

            var paths = pathEnv.Split(";", StringSplitOptions.RemoveEmptyEntries).DistinctBy(p => p.ToLowerInvariant());
-            
+
            var toFilter = paths.Where(x => commonParents.All(parent => !FilesFolders.PathContains(parent, x)))
                .AsParallel()
                .SelectMany(p => EnumerateProgramsInDir(p, suffixes, recursive: false));
@ -694,12 +699,10 @@ namespace Flow.Launcher.Plugin.Program.Programs

        private static IEnumerable<string> GetStartMenuPaths()
        {
-            var directory1 = Environment.GetFolderPath(Environment.SpecialFolder.Programs);
-            var directory2 = Environment.GetFolderPath(Environment.SpecialFolder.CommonPrograms);
-            return new[]
-            {
-                directory1, directory2
-            };
+            var userStartMenu = Environment.GetFolderPath(Environment.SpecialFolder.StartMenu);
+            var commonStartMenu = Environment.GetFolderPath(Environment.SpecialFolder.CommonStartMenu);
+
+            return new[] { userStartMenu, commonStartMenu };
        }

        public static void WatchProgramUpdate(Settings settings)
--- a/Plugins/Flow.Launcher.Plugin.Program/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
@ -4,7 +4,7 @@
  "Name": "Program",
  "Description": "Search programs in Flow.Launcher",
  "Author": "qianlifeng",
-  "Version": "2.2.0",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",
--- a/Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Flow.Launcher.Plugin.Shell</RootNamespace>
--- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@ -4,7 +4,7 @@
  "Name": "Shell",
  "Description": "Provide executing commands from Flow Launcher",
  "Author": "qianlifeng",
-  "Version": "2.0.1",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",
--- a/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{0B9DE348-9361-4940-ADB6-F5953BFFCCEC}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Flow.Launcher.Plugin.Sys</RootNamespace>
--- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
+++ b/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": "2.0.1",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",
--- a/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
@ -2,7 +2,7 @@
  
  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{A3DCCBCA-ACC1-421D-B16E-210896234C26}</ProjectGuid>
    <UseWPF>true</UseWPF>
    <AppDesignerFolder>Properties</AppDesignerFolder>
--- a/Plugins/Flow.Launcher.Plugin.Url/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Url/plugin.json
@ -4,7 +4,7 @@
  "Name": "URL",
  "Description": "Open the typed URL from Flow Launcher",
  "Author": "qianlifeng",
-  "Version": "2.0.1",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Url.dll",
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <ProjectGuid>{403B57F2-1856-4FC7-8A24-36AB346B763E}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <UseWPF>true</UseWPF>
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json
@ -26,7 +26,7 @@
  "Name": "Web Searches",
  "Description": "Provide the web search ability",
  "Author": "qianlifeng",
-  "Version": "2.0.2",
+  "Version": "3.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.WebSearch.dll",
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Launcher.Plugin.WindowsSettings.csproj
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Flow.Launcher.Plugin.WindowsSettings.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
    <UseWindowsForms>true</UseWindowsForms>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/plugin.json
@ -4,7 +4,7 @@
  "Description": "Search settings inside Control Panel and Settings App",
  "Name": "Windows Settings",
  "Author": "TobiasSekan",
-  "Version": "3.0.2",
+  "Version": "4.0.0",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.WindowsSettings.dll",
--- a/README.md
+++ b/README.md
@ -364,8 +364,11 @@ Get in touch if you like to join the Flow-Launcher Team and help build this grea

 ### Developing/Debugging

- Flow Launcher's target framework is .Net 6
+- Flow Launcher's target framework is .Net 7

 - Install Visual Studio 2022

- Install .Net 6 SDK via Visual Studio installer or manually from [here](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/sdk-6.0.300-windows-x64-installer)
+- Install .Net 7 SDK 
+  - via Visual Studio installer
+  - via winget `winget install Microsoft.DotNet.SDK.7`
+  - Manually from [here](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
--- a/Scripts/flowlauncher.nuspec
+++ b/Scripts/flowlauncher.nuspec
@ -11,6 +11,6 @@
    <description>Flow Launcher - Quick file search and app launcher for Windows with community-made plugins</description>
  </metadata>
  <files>
-    <file src="**\*.*" target="lib\net6.0\" exclude="Flow.Launcher.vshost.exe;Flow.Launcher.vshost.exe.config;Flow.Launcher.vshost.exe.manifest;*.nupkg;Setup.exe;RELEASES"/>
+    <file src="**\*.*" target="lib\net7.0\" exclude="Flow.Launcher.vshost.exe;Flow.Launcher.vshost.exe.config;Flow.Launcher.vshost.exe.manifest;*.nupkg;Setup.exe;RELEASES"/>
  </files>
 </package>
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@ -100,7 +100,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
 function Publish-Self-Contained ($p) {

    $csproj  = Join-Path "$p" "Flow.Launcher/Flow.Launcher.csproj" -Resolve
-    $profile = Join-Path "$p" "Flow.Launcher/Properties/PublishProfiles/Net6.0-SelfContained.pubxml" -Resolve
+    $profile = Join-Path "$p" "Flow.Launcher/Properties/PublishProfiles/Net7.0-SelfContained.pubxml" -Resolve

    # we call dotnet publish on the main project. 
    # The other projects should have been built in Release at this point.
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,4 +1,4 @@
-version: '1.12.0.{build}'
+version: '1.13.0.{build}'

 init:
 - ps: |
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
    "sdk": {
-        "version": "6.0.*",
+        "version": "7.0.*",
        "rollForward": "latestPatch"
    }
-}
+}