Release 2.1.0 | Plugin 5.2.0

.github/workflows/default_plugins.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
         with:

.github/workflows/dotnet.yml

@@ -20,7 +20,7 @@ jobs:
       NUGET_CERT_REVOCATION_MODE: offline
       BUILD_NUMBER: ${{ github.run_number }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set Flow.Launcher.csproj version
         id: update
         uses: vers-one/dotnet-project-version-updater@v1.7
@@ -54,36 +54,36 @@ jobs:
         shell: powershell
         run: .\Scripts\post_build.ps1
       - name: Upload Plugin Nupkg
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: Plugin nupkg
           path: |
             Output\Release\Flow.Launcher.Plugin.*.nupkg
           compression-level: 0
       - name: Upload Setup
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: Flow Installer
           path: |
             Output\Packages\Flow-Launcher-*.exe
           compression-level: 0
       - name: Upload Portable Version
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: Portable Version
           path: |
             Output\Packages\Flow-Launcher-Portable.zip
           compression-level: 0
       - name: Upload Full Nupkg
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: Full nupkg
           path: |
             Output\Packages\FlowLauncher-*-full.nupkg
 
           compression-level: 0
       - name: Upload Release Information
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: RELEASES
           path: |

.github/workflows/pr_assignee.yml

@@ -14,4 +14,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Assign PR to creator
-      uses: toshimaru/auto-author-assign@v2.1.1
+      uses: toshimaru/auto-author-assign@v3.0.1

.github/workflows/release_pr.yml

@@ -11,7 +11,7 @@ jobs:
   update-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-python@v6
         with:

Flow.Launcher.Core/Configuration/Portable.cs

@@ -3,10 +3,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 using Microsoft.Win32;
 using Squirrel;
@@ -17,8 +15,6 @@ public class Portable : IPortable
     {
         private static readonly string ClassName = nameof(Portable);
 
-        private readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();
-
         /// <summary>
         /// As at Squirrel.Windows version 1.5.2, UpdateManager needs to be disposed after finish
         /// </summary>
@@ -45,13 +41,13 @@ public void DisablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.PortableDataPath);
 
-                API.ShowMsgBox(API.GetTranslation("restartToDisablePortableMode"));
+                PublicApi.Instance.ShowMsgBox(Localize.restartToDisablePortableMode());
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
             catch (Exception e)
             {
-                API.LogException(ClassName, "Error occurred while disabling portable mode", e);
+                PublicApi.Instance.LogException(ClassName, "Error occurred while disabling portable mode", e);
             }
         }
 
@@ -68,13 +64,13 @@ public void EnablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.RoamingDataPath);
 
-                API.ShowMsgBox(API.GetTranslation("restartToEnablePortableMode"));
+                PublicApi.Instance.ShowMsgBox(Localize.restartToEnablePortableMode());
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
             catch (Exception e)
             {
-                API.LogException(ClassName, "Error occurred while enabling portable mode", e);
+                PublicApi.Instance.LogException(ClassName, "Error occurred while enabling portable mode", e);
             }
         }
 
@@ -94,13 +90,13 @@ public void RemoveUninstallerEntry()
 
         public void MoveUserDataFolder(string fromLocation, string toLocation)
         {
-            FilesFolders.CopyAll(fromLocation, toLocation, (s) => API.ShowMsgBox(s));
+            FilesFolders.CopyAll(fromLocation, toLocation, (s) => PublicApi.Instance.ShowMsgBox(s));
             VerifyUserDataAfterMove(fromLocation, toLocation);
         }
 
         public void VerifyUserDataAfterMove(string fromLocation, string toLocation)
         {
-            FilesFolders.VerifyBothFolderFilesEqual(fromLocation, toLocation, (s) => API.ShowMsgBox(s));
+            FilesFolders.VerifyBothFolderFilesEqual(fromLocation, toLocation, (s) => PublicApi.Instance.ShowMsgBox(s));
         }
 
         public void CreateShortcuts()
@@ -150,12 +146,12 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             // delete it and prompt the user to pick the portable data location
             if (File.Exists(roamingDataDeleteFilePath))
             {
-                FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => API.ShowMsgBox(s));
+                FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => PublicApi.Instance.ShowMsgBox(s));
 
-                if (API.ShowMsgBox(API.GetTranslation("moveToDifferentLocation"), 
+                if (PublicApi.Instance.ShowMsgBox(Localize.moveToDifferentLocation(), 
                     string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
-                    FilesFolders.OpenPath(Constant.RootDirectory, (s) => API.ShowMsgBox(s));
+                    FilesFolders.OpenPath(Constant.RootDirectory, (s) => PublicApi.Instance.ShowMsgBox(s));
 
                     Environment.Exit(0);
                 }
@@ -164,9 +160,9 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             // delete it and notify the user about it.
             else if (File.Exists(portableDataDeleteFilePath))
             {
-                FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => API.ShowMsgBox(s));
+                FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => PublicApi.Instance.ShowMsgBox(s));
 
-                API.ShowMsgBox(API.GetTranslation("shortcutsUninstallerCreated"));
+                PublicApi.Instance.ShowMsgBox(Localize.shortcutsUninstallerCreated());
             }
         }
 
@@ -177,8 +173,7 @@ public bool CanUpdatePortability()
 
             if (roamingLocationExists && portableLocationExists)
             {
-                API.ShowMsgBox(string.Format(API.GetTranslation("userDataDuplicated"), 
-                    DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
+                PublicApi.Instance.ShowMsgBox(Localize.userDataDuplicated(DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
 
                 return false;
             }

Flow.Launcher.Core/ExternalPlugins/CommunityPluginSource.cs

@@ -8,7 +8,6 @@
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.Http;
 using Flow.Launcher.Plugin;
 
@@ -18,13 +17,9 @@ public record CommunityPluginSource(string ManifestFileUrl)
     {
         private static readonly string ClassName = nameof(CommunityPluginSource);
 
-        // We should not initialize API in static constructor because it will create another API instance
-        private static IPublicAPI api = null;
-        private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
-
         private string latestEtag = "";
 
-        private List<UserPlugin> plugins = new();
+        private List<UserPlugin> plugins = [];
 
         private static readonly JsonSerializerOptions PluginStoreItemSerializationOption = new()
         {
@@ -41,7 +36,7 @@ public record CommunityPluginSource(string ManifestFileUrl)
         /// </remarks>
         public async Task<List<UserPlugin>> FetchAsync(CancellationToken token)
         {
-            API.LogInfo(ClassName, $"Loading plugins from {ManifestFileUrl}");
+            PublicApi.Instance.LogInfo(ClassName, $"Loading plugins from {ManifestFileUrl}");
 
             var request = new HttpRequestMessage(HttpMethod.Get, ManifestFileUrl);
 
@@ -59,40 +54,40 @@ public async Task<List<UserPlugin>> FetchAsync(CancellationToken token)
                         .ConfigureAwait(false);
                     latestEtag = response.Headers.ETag?.Tag;
 
-                    API.LogInfo(ClassName, $"Loaded {plugins.Count} plugins from {ManifestFileUrl}");
+                    PublicApi.Instance.LogInfo(ClassName, $"Loaded {plugins.Count} plugins from {ManifestFileUrl}");
                     return plugins;
                 }
                 else if (response.StatusCode == HttpStatusCode.NotModified)
                 {
-                    API.LogInfo(ClassName, $"Resource {ManifestFileUrl} has not been modified.");
+                    PublicApi.Instance.LogInfo(ClassName, $"Resource {ManifestFileUrl} has not been modified.");
                     return plugins;
                 }
                 else
                 {
-                    API.LogWarn(ClassName, $"Failed to load resource {ManifestFileUrl} with response {response.StatusCode}");
+                    PublicApi.Instance.LogWarn(ClassName, $"Failed to load resource {ManifestFileUrl} with response {response.StatusCode}");
                     return null;
                 }
             }
             catch (OperationCanceledException) when (token.IsCancellationRequested)
             {
-                API.LogDebug(ClassName, $"Fetching from {ManifestFileUrl} was cancelled by caller.");
+                PublicApi.Instance.LogDebug(ClassName, $"Fetching from {ManifestFileUrl} was cancelled by caller.");
                 return null;
             }
             catch (TaskCanceledException)
             {
                 // Likely an HttpClient timeout or external cancellation not requested by our token
-                API.LogWarn(ClassName, $"Fetching from {ManifestFileUrl} timed out.");
+                PublicApi.Instance.LogWarn(ClassName, $"Fetching from {ManifestFileUrl} timed out.");
                 return null;
             }
             catch (Exception e)
             {
                 if (e is HttpRequestException or WebException or SocketException || e.InnerException is TimeoutException)
                 {
-                    API.LogException(ClassName, $"Check your connection and proxy settings to {ManifestFileUrl}.", e);
+                    PublicApi.Instance.LogException(ClassName, $"Check your connection and proxy settings to {ManifestFileUrl}.", e);
                 }
                 else
                 {
-                    API.LogException(ClassName, "Error Occurred", e);
+                    PublicApi.Instance.LogException(ClassName, "Error Occurred", e);
                 }
                 return null;
             }

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

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Forms;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
@@ -15,7 +14,7 @@ public abstract class AbstractPluginEnvironment
     {
         private static readonly string ClassName = nameof(AbstractPluginEnvironment);
 
-        protected readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();
+        protected readonly IPublicAPI API = PublicApi.Instance;
 
         internal abstract string Language { get; }
 
@@ -58,15 +57,10 @@ internal IEnumerable<PluginPair> Setup()
                 return SetPathForPluginPairs(PluginsSettingsFilePath, Language);
             }
 
-            var noRuntimeMessage = string.Format(
-                API.GetTranslation("runtimePluginInstalledChooseRuntimePrompt"),
-                Language,
-                EnvName,
-                Environment.NewLine
-            );
+            var noRuntimeMessage = Localize.runtimePluginInstalledChooseRuntimePrompt(Language, EnvName, Environment.NewLine);
             if (API.ShowMsgBox(noRuntimeMessage, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
             {
-                var msg = string.Format(API.GetTranslation("runtimePluginChooseRuntimeExecutable"), EnvName);
+                var msg = Localize.runtimePluginChooseRuntimeExecutable(EnvName);
 
                 var selectedFile = GetFileFromDialog(msg, FileDialogFilter);
 
@@ -77,12 +71,7 @@ internal IEnumerable<PluginPair> Setup()
                 // Nothing selected because user pressed cancel from the file dialog window
                 else
                 {
-                    var forceDownloadMessage = string.Format(
-                        API.GetTranslation("runtimeExecutableInvalidChooseDownload"),
-                        Language,
-                        EnvName,
-                        Environment.NewLine
-                    );
+                    var forceDownloadMessage = Localize.runtimeExecutableInvalidChooseDownload(Language, EnvName, Environment.NewLine);
 
                     // Let users select valid path or choose to download
                     while (string.IsNullOrEmpty(selectedFile))
@@ -120,7 +109,7 @@ internal IEnumerable<PluginPair> Setup()
             }
             else
             {
-                API.ShowMsgBox(string.Format(API.GetTranslation("runtimePluginUnableToSetExecutablePath"), Language));
+                API.ShowMsgBox(Localize.runtimePluginUnableToSetExecutablePath(Language));
                 API.LogError(ClassName,
                     $"Not able to successfully set {EnvName} path, setting's plugin executable path variable is still an empty string.",
                     $"{Language}Environment");
@@ -248,7 +237,7 @@ private static bool IsUsingRoamingPath(string filePath)
         private static string GetUpdatedEnvironmentPath(string filePath)
         {
             var index = filePath.IndexOf(DataLocation.PluginEnvironments);
-            
+
             // get the substring after "Environments" because we can not determine it dynamically
             var executablePathSubstring = filePath[(index + DataLocation.PluginEnvironments.Length)..];
             return $"{DataLocation.PluginEnvironmentsPath}{executablePathSubstring}";

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

@@ -51,7 +51,7 @@ internal override void InstallEnvironment()
                 }
                 catch (System.Exception e)
                 {
-                    API.ShowMsgError(API.GetTranslation("failToInstallPythonEnv"));
+                    API.ShowMsgError(Localize.failToInstallPythonEnv());
                     API.LogException(ClassName, "Failed to install Python environment", e);
                 }
             });

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

@@ -46,7 +46,7 @@ internal override void InstallEnvironment()
                 }
                 catch (System.Exception e)
                 {
-                    API.ShowMsgError(API.GetTranslation("failToInstallTypeScriptEnv"));
+                    API.ShowMsgError(Localize.failToInstallTypeScriptEnv());
                     API.LogException(ClassName, "Failed to install TypeScript environment", e);
                 }
             });

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

@@ -46,7 +46,7 @@ internal override void InstallEnvironment()
                 }
                 catch (System.Exception e)
                 {
-                    API.ShowMsgError(API.GetTranslation("failToInstallTypeScriptEnv"));
+                    API.ShowMsgError(Localize.failToInstallTypeScriptEnv());
                     API.LogException(ClassName, "Failed to install TypeScript environment", e);
                 }
             });

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Infrastructure;
 
@@ -23,10 +22,6 @@ public static class PluginsManifest
         private static DateTime lastFetchedAt = DateTime.MinValue;
         private static readonly TimeSpan fetchTimeout = TimeSpan.FromMinutes(2);
 
-        // We should not initialize API in static constructor because it will create another API instance
-        private static IPublicAPI api = null;
-        private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
-
         public static List<UserPlugin> UserPlugins { get; private set; }
 
         public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = false, CancellationToken token = default)
@@ -67,7 +62,7 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
             }
             catch (Exception e)
             {
-                API.LogException(ClassName, "Http request failed", e);
+                PublicApi.Instance.LogException(ClassName, "Http request failed", e);
             }
             finally
             {
@@ -90,12 +85,12 @@ private static bool IsMinimumAppVersionSatisfied(UserPlugin plugin, SemanticVers
             }
             catch (Exception e)
             {
-                API.LogException(ClassName, $"Failed to parse the minimum app version {plugin.MinimumAppVersion} for plugin {plugin.Name}. "
+                PublicApi.Instance.LogException(ClassName, $"Failed to parse the minimum app version {plugin.MinimumAppVersion} for plugin {plugin.Name}. "
                     + "Plugin excluded from manifest", e);
                 return false;
             }
 
-            API.LogInfo(ClassName, $"Plugin {plugin.Name} requires minimum Flow Launcher version {plugin.MinimumAppVersion}, "
+            PublicApi.Instance.LogInfo(ClassName, $"Plugin {plugin.Name} requires minimum Flow Launcher version {plugin.MinimumAppVersion}, "
                     + $"but current version is {Constant.Version}. Plugin excluded from manifest.");
 
             return false;