Merge branch 'dev' into RemoveUnusedNuget

Author: VictoriousRaptor

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -48,6 +48,9 @@ private static void DeletePythonBinding()
             }
         }
 
+        /// <summary>
+        /// Save json and ISavable 
+        /// </summary>
         public static void Save()
         {
             foreach (var plugin in AllPlugins)

Flow.Launcher.Infrastructure/Constant.cs

@@ -19,7 +19,7 @@ public static class Constant
         public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
 
         public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
-        public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new/choose";
+        public const string IssuesUrl = "https://github.com/Flow-Launcher/Flow.Launcher/issues";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
         public static readonly string Dev = "Dev";
         public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";

Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs

@@ -62,7 +62,7 @@ private static string CreateExceptionReport(System.Exception ex)
             sb.AppendLine($"* Command Line: {Environment.CommandLine}");
             sb.AppendLine($"* Timestamp: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
             sb.AppendLine($"* Flow Launcher version: {Constant.Version}");
-            sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}");
+            sb.AppendLine($"* OS Version: {GetWindowsFullVersionFromRegistry()}");
             sb.AppendLine($"* IntPtr Length: {IntPtr.Size}");
             sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}");
             sb.AppendLine($"* Python Path: {Constant.PythonPath}");
@@ -172,5 +172,35 @@ private static List<string> GetFrameworkVersionFromRegistry()
             }
 
         }
+
+        public static string GetWindowsFullVersionFromRegistry()
+        {
+            try
+            {
+                var buildRevision = GetWindowsRevisionFromRegistry();
+                var currentBuild = Environment.OSVersion.Version.Build;
+                return currentBuild.ToString() + "." + buildRevision;
+            }
+            catch
+            {
+                return Environment.OSVersion.VersionString;
+            }
+        }
+
+        public static string GetWindowsRevisionFromRegistry()
+        {
+            try
+            {
+                using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\"))
+                {
+                    var buildRevision = registryKey.GetValue("UBR").ToString();
+                    return buildRevision;
+                }
+            }
+            catch
+            {
+                return "0";
+            }
+        }
     }
 }

Flow.Launcher.Infrastructure/Image/ImageCache.cs

@@ -28,7 +28,7 @@ public class ImageCache
         private const int permissibleFactor = 2;
         private SemaphoreSlim semaphore = new(1, 1);
 
-        public void Initialization(Dictionary<(string, bool), int> usage)
+        public void Initialize(Dictionary<(string, bool), int> usage)
         {
             foreach (var key in usage.Keys)
             {

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -37,6 +37,8 @@ public static void Initialize()
 
             var usage = LoadStorageToConcurrentDictionary();
 
+            ImageCache.Initialize(usage.ToDictionary(x => x.Key, x => x.Value));
+
             foreach (var icon in new[]
                      {
                          Constant.DefaultIcon, Constant.MissingImgIcon

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -240,7 +240,7 @@ public bool HideNotifyIcon
         public bool HideWhenDeactivated { get; set; } = true;
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
-        public SearchWindowScreens SearchWindowScreen { get; set; } = SearchWindowScreens.RememberLastLaunchLocation;
+        public SearchWindowScreens SearchWindowScreen { get; set; } = SearchWindowScreens.Cursor;
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public SearchWindowAligns SearchWindowAlign { get; set; } = SearchWindowAligns.Center;

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

@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>4.0.0</Version>
-    <PackageVersion>4.0.0</PackageVersion>
-    <AssemblyVersion>4.0.0</AssemblyVersion>
-    <FileVersion>4.0.0</FileVersion>
+    <Version>4.0.1</Version>
+    <PackageVersion>4.0.1</PackageVersion>
+    <AssemblyVersion>4.0.1</AssemblyVersion>
+    <FileVersion>4.0.1</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -20,8 +20,8 @@ public interface IPublicAPI
         /// </summary>
         /// <param name="query">query text</param>
         /// <param name="requery">
-        /// force requery By default, Flow Launcher will not fire query if your query is same with existing one. 
-        /// Set this to true to force Flow Launcher requerying
+        /// Force requery. By default, Flow Launcher will not fire query if your query is same with existing one. 
+        /// Set this to <see langword="true"/> to force Flow Launcher requerying
         /// </param>
         void ChangeQuery(string query, bool requery = false);
 

Flow.Launcher.Test/Flow.Launcher.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
@@ -50,7 +50,7 @@
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Flow.Launcher/Helper/ErrorReporting.cs

@@ -29,11 +29,11 @@ public static void DispatcherUnhandledException(object sender, DispatcherUnhandl
             //prevent application exist, so the user can copy prompted error info
             e.Handled = true;
         }
-
+        
         public static string RuntimeInfo()
         {
             var info = $"\nFlow Launcher version: {Constant.Version}" +
-                       $"\nOS Version: {Environment.OSVersion.VersionString}" +
+                       $"\nOS Version: {ExceptionFormatter.GetWindowsFullVersionFromRegistry()}" +
                        $"\nIntPtr Length: {IntPtr.Size}" +
                        $"\nx64: {Environment.Is64BitOperatingSystem}";
             return info;