Merge branch 'dev' of https://github.com/Flow-Launcher/Flow.Launcher into jsonrpc_v2

Author: taooceros

.github/actions/spelling/expect.txt

@@ -103,3 +103,9 @@ Português
 Português (Brasil)
 Italiano
 Slovenský
+Droplex
+Preinstalled
+errormetadatafile
+noresult
+pluginsmanager
+alreadyexists

.github/workflows/default_plugins.yml

@@ -73,7 +73,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@main
+      uses: check-spelling/check-spelling@v0.0.22
       with:
         suppress_push_for_open_pull_request: 1
         checkout: true
@@ -89,12 +89,13 @@ jobs:
         check_extra_dictionaries: ''
         quit_without_error: true
         extra_dictionaries:
-          cspell:software-terms/src/software-terms.txt
+          cspell:software-terms/dict/softwareTerms.txt
           cspell:win32/src/win32.txt
-          cspell:php/php.txt
+          cspell:php/src/php.txt
           cspell:filetypes/filetypes.txt
           cspell:csharp/csharp.txt
-          cspell:dotnet/dotnet.txt
+          cspell:dotnet/src/dotnet.txt
+          cspell:python/src/common/extra.txt
           cspell:python/src/python/python-lib.txt
           cspell:aws/aws.txt
           cspell:companies/src/companies.txt
@@ -113,7 +114,7 @@ jobs:
 #     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
 #     steps:
 #     - name: comment
-#       uses: check-spelling/check-spelling@main
+#       uses: check-spelling/check-spelling@@v0.0.22
 #       with:
 #         checkout: true
 #         spell_check_this: check-spelling/spell-check-this@main
@@ -129,7 +130,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
     - name: comment
-      uses: check-spelling/check-spelling@main
+      uses: check-spelling/check-spelling@v0.0.22
       with:
         checkout: true
         spell_check_this: check-spelling/spell-check-this@main
@@ -153,7 +154,7 @@ jobs:
   #     cancel-in-progress: false
   #   steps:
   #   - name: apply spelling updates
-  #     uses: check-spelling/check-spelling@main
+  #     uses: check-spelling/check-spelling@v0.0.22
   #     with:
   #       experimental_apply_changes_via_bot: 1
   #       checkout: true

.github/workflows/spelling.yml

@@ -16,7 +16,7 @@ internal class PythonEnvironment : AbstractPluginEnvironment
 
         internal override string EnvPath => Path.Combine(DataLocation.PluginEnvironmentsPath, EnvName);
 
-        internal override string InstallPath => Path.Combine(EnvPath, "PythonEmbeddable-v3.8.9");
+        internal override string InstallPath => Path.Combine(EnvPath, "PythonEmbeddable-v3.11.4");
 
         internal override string ExecutablePath => Path.Combine(InstallPath, "pythonw.exe");
 
@@ -30,8 +30,9 @@ internal override void InstallEnvironment()
         {
             FilesFolders.RemoveFolderIfExists(InstallPath);
 
-            // Python 3.8.9 is used for Windows 7 compatibility
-            DroplexPackage.Drop(App.python_3_8_9_embeddable, InstallPath).Wait();
+            // Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and
+            // uses Python plugin they need to custom install and use v3.8.9
+            DroplexPackage.Drop(App.python_3_11_4_embeddable, InstallPath).Wait();
 
             PluginsSettingsFilePath = ExecutablePath;
         }

Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs

@@ -53,8 +53,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Droplex" Version="1.6.0" />
-    <PackageReference Include="FSharp.Core" Version="7.0.300" />
+    <PackageReference Include="Droplex" Version="1.7.0" />
+    <PackageReference Include="FSharp.Core" Version="7.0.400" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
     <PackageReference Include="StreamJsonRpc" Version="2.16.36" />

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -34,11 +34,22 @@ protected override Assembly Load(AssemblyName assemblyName)
 
             return existAssembly ?? (assemblyPath == null ? null : LoadFromAssemblyPath(assemblyPath));
         }
+        
+        protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
+        {
+            var path = dependencyResolver.ResolveUnmanagedDllToPath(unmanagedDllName);
+            if (!string.IsNullOrEmpty(path))
+            {
+                return LoadUnmanagedDllFromPath(path);
+            }
+
+            return IntPtr.Zero;
+        }
 
         internal Type FromAssemblyGetTypeOfInterface(Assembly assembly, Type type)
         {
             var allTypes = assembly.ExportedTypes;
             return allTypes.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Any(t => t == type));
         }
     }
-}
+}

Flow.Launcher.Core/Plugin/PluginAssemblyLoader.cs

@@ -53,7 +53,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.6.40" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.7.30" />
     <PackageReference Include="NLog" Version="4.7.10" />
     <PackageReference Include="NLog.Schema" Version="4.7.10" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

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

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

@@ -263,7 +263,7 @@ public static string ReturnPreviousDirectoryIfIncompleteString(string path)
         }
 
         /// <summary>
-        /// Returns if <paramref name="parentPath"/> contains <paramref name="subPath"/>.
+        /// Returns if <paramref name="parentPath"/> contains <paramref name="subPath"/>. Equal paths are not considered to be contained by default.
         /// From https://stackoverflow.com/a/66877016
         /// </summary>
         /// <param name="parentPath">Parent path</param>

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -1,4 +1,4 @@
-using Flow.Launcher.Plugin.SharedCommands;
+using Flow.Launcher.Plugin.SharedCommands;
 using NUnit.Framework;
 
 namespace Flow.Launcher.Test
@@ -33,21 +33,21 @@ public class FilesFoldersTest
         [TestCase(@"c:\foo", @"c:\foo\..\bar\baz", false)]
         [TestCase(@"c:\bar", @"c:\foo\..\bar\baz", true)]
         [TestCase(@"c:\barr", @"c:\foo\..\bar\baz", false)]
-        // Equality
-        [TestCase(@"c:\foo", @"c:\foo", false)]
-        [TestCase(@"c:\foo\", @"c:\foo", false)]
-        [TestCase(@"c:\foo", @"c:\foo\", false)]
         public void GivenTwoPaths_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
         {
             Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path));
         }
 
+        // Equality
+        [TestCase(@"c:\foo", @"c:\foo", false)]
+        [TestCase(@"c:\foo\", @"c:\foo", false)]
+        [TestCase(@"c:\foo", @"c:\foo\", false)]
         [TestCase(@"c:\foo", @"c:\foo", true)]
         [TestCase(@"c:\foo\", @"c:\foo", true)]
         [TestCase(@"c:\foo", @"c:\foo\", true)]
-        public void GivenTwoPathsAreTheSame_WhenCheckPathContains_ThenShouldBeTrue(string parentPath, string path, bool expectedResult)
+        public void GivenTwoPathsAreTheSame_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
         {
-            Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, true));
+            Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, allowEqual: expectedResult));
         }
     }
 }