Merge branch 'dev' into administrator_mode

Author: Jack251970

Flow.Launcher.Core/Configuration/Portable.cs

@@ -135,8 +135,8 @@ private static void IndicateDeletion(string filePathTodelete)
         public void PreStartCleanUpAfterPortabilityUpdate()
         {
             // Specify here so this method does not rely on other environment variables to initialise
-            var portableDataDir = Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location.NonNull()).ToString(), "UserData");
-            var roamingDataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FlowLauncher");
+            var portableDataDir = DataLocation.PortableDataPath;
+            var roamingDataDir = DataLocation.RoamingDataPath;
 
             // Get full path to the .dead files for each case
             var portableDataDeleteFilePath = Path.Combine(portableDataDir, DataLocation.DeletionIndicatorFile);

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

@@ -58,10 +58,11 @@
     <PackageReference Include="Droplex" Version="1.7.0" />
     <PackageReference Include="Flow.Launcher.Localization" Version="0.0.6" />
     <PackageReference Include="FSharp.Core" Version="9.0.303" />
-    <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.4" />
+    <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.5" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0" />
-    <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
+    <!-- Do not upgrade this to higher version since higher version removes UpdateManager instance -->
+    <PackageReference Include="squirrel.windows" Version="1.9.0" NoWarn="NU1701" />
     <PackageReference Include="StreamJsonRpc" Version="2.22.11" />
   </ItemGroup>
 

Flow.Launcher.Core/Plugin/PluginConfig.cs

@@ -5,6 +5,7 @@
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin;
 using System.Text.Json;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.Core.Plugin
 {
@@ -25,7 +26,7 @@ public static List<PluginMetadata> Parse(string[] pluginDirectories)
             // todo use linq when diable plugin is implmented since parallel.foreach + list is not thread saft
             foreach (var directory in directories)
             {
-                if (File.Exists(Path.Combine(directory, "NeedDelete.txt")))
+                if (File.Exists(Path.Combine(directory, DataLocation.PluginDeleteFile)))
                 {
                     try
                     {

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -807,7 +807,7 @@ internal static async Task<bool> UninstallPluginAsync(PluginMetadata plugin, boo
             }
 
             // Marked for deletion. Will be deleted on next start up
-            using var _ = File.CreateText(Path.Combine(plugin.PluginDirectory, "NeedDelete.txt"));
+            using var _ = File.CreateText(Path.Combine(plugin.PluginDirectory, DataLocation.PluginDeleteFile));
 
             if (checkModified)
             {