diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bbeba3..be47b4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,9 @@ jobs: echo "PLUGIN_VERSION=$($xml.Project.PropertyGroup.Version)" >> $env:GITHUB_ENV - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Build run: dotnet build Community.PowerToys.Run.Plugin.EdgeFavorite.sln --configuration Release /p:Platform=${{matrix.platform}} /p:EnableWindowsTargeting=true diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests.csproj b/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests.csproj index 54c2faa..2eb8c3e 100644 --- a/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests.csproj +++ b/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests/Community.PowerToys.Run.Plugin.EdgeFavorite.Tests.csproj @@ -1,9 +1,10 @@ - + - net7.0-windows + net8.0-windows enable false + true x64;ARM64 false false @@ -11,12 +12,11 @@ true - true 1591 - + diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Community.PowerToys.Run.Plugin.EdgeFavorite.csproj b/Community.PowerToys.Run.Plugin.EdgeFavorite/Community.PowerToys.Run.Plugin.EdgeFavorite.csproj index a2e2ebf..4136dcf 100644 --- a/Community.PowerToys.Run.Plugin.EdgeFavorite/Community.PowerToys.Run.Plugin.EdgeFavorite.csproj +++ b/Community.PowerToys.Run.Plugin.EdgeFavorite/Community.PowerToys.Run.Plugin.EdgeFavorite.csproj @@ -1,7 +1,7 @@ - + - net7.0-windows + net8.0-windows enable true true @@ -12,7 +12,6 @@ true - true 1591 diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteProvider.cs b/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteProvider.cs index 8a4bd79..d971ff5 100644 --- a/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteProvider.cs +++ b/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteProvider.cs @@ -67,7 +67,7 @@ private void InitFavorites() _root = newRoot; } - private void ProcessFavorites(JsonElement element, FavoriteItem parent, string path, bool root) + private static void ProcessFavorites(JsonElement element, FavoriteItem parent, string path, bool root) { if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("children", out var children)) { diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteQuery.cs b/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteQuery.cs index 50c9520..b2da530 100644 --- a/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteQuery.cs +++ b/Community.PowerToys.Run.Plugin.EdgeFavorite/Helpers/FavoriteQuery.cs @@ -32,10 +32,10 @@ public IEnumerable Search(FavoriteItem node, string[] path, int de { if (depth == path.Length - 1) { - return node.Childrens.Where(f => f.Name != null && f.Name.StartsWith(path[depth], StringComparison.InvariantCultureIgnoreCase)); + return node.Childrens.Where(f => f.Name != null && f.Name.StartsWith(path[depth], StringComparison.OrdinalIgnoreCase)); } - var folder = node.Childrens.SingleOrDefault(f => f.Type == FavoriteType.Folder && f.Name != null && f.Name.Equals(path[depth], StringComparison.InvariantCultureIgnoreCase)); + var folder = node.Childrens.SingleOrDefault(f => f.Type == FavoriteType.Folder && f.Name != null && f.Name.Equals(path[depth], StringComparison.OrdinalIgnoreCase)); if (folder != null) { diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Common.UI.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Common.UI.dll index f88099e..bb3438a 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Common.UI.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Common.UI.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.ManagedCommon.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.ManagedCommon.dll index 7164dac..131c073 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.ManagedCommon.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.ManagedCommon.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Settings.UI.Lib.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Settings.UI.Lib.dll index 96319c9..eab5f5a 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Settings.UI.Lib.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/PowerToys.Settings.UI.Lib.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Infrastructure.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Infrastructure.dll index 3bb01d2..d0f0bb1 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Infrastructure.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Infrastructure.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Plugin.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Plugin.dll index 4c669d7..1a5d585 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Plugin.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/ARM64/Wox.Plugin.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Common.UI.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Common.UI.dll index 8247986..efcf86a 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Common.UI.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Common.UI.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.ManagedCommon.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.ManagedCommon.dll index bec76f0..e60d514 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.ManagedCommon.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.ManagedCommon.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Settings.UI.Lib.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Settings.UI.Lib.dll index 2241ee5..4ee83d3 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Settings.UI.Lib.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/PowerToys.Settings.UI.Lib.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Infrastructure.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Infrastructure.dll index 1f6e811..45c346e 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Infrastructure.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Infrastructure.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Plugin.dll b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Plugin.dll index 1c7ecac..d642dac 100644 Binary files a/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Plugin.dll and b/Community.PowerToys.Run.Plugin.EdgeFavorite/Libs/x64/Wox.Plugin.dll differ diff --git a/Community.PowerToys.Run.Plugin.EdgeFavorite/Models/FavoriteItem.cs b/Community.PowerToys.Run.Plugin.EdgeFavorite/Models/FavoriteItem.cs index 1aa9e9b..cab8f96 100644 --- a/Community.PowerToys.Run.Plugin.EdgeFavorite/Models/FavoriteItem.cs +++ b/Community.PowerToys.Run.Plugin.EdgeFavorite/Models/FavoriteItem.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.Reflection; using System.Windows; using System.Windows.Input; using ManagedCommon; @@ -15,6 +16,7 @@ namespace Community.PowerToys.Run.Plugin.EdgeFavorite.Models { public class FavoriteItem { + private static readonly string _pluginName = Assembly.GetExecutingAssembly().GetName().Name ?? string.Empty; private static string? _folderIcoPath; private static string? _urlIcoPath; private readonly List _childrens = new(); @@ -92,6 +94,7 @@ public List CreateContextMenuResult() FontFamily = "Segoe Fluent Icons,Segoe MDL2 Assets", AcceleratorKey = Key.C, AcceleratorModifiers = ModifierKeys.Control, + PluginName = _pluginName, Action = _ => { try @@ -113,6 +116,7 @@ public List CreateContextMenuResult() FontFamily = "Segoe Fluent Icons,Segoe MDL2 Assets", AcceleratorKey = Key.P, AcceleratorModifiers = ModifierKeys.Control, + PluginName = _pluginName, Action = _ => { Helper.OpenInShell(@"shell:AppsFolder\Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge", $"-private {Url}"); diff --git a/Directory.Build.props b/Directory.Build.props index 16bb1c7..6319153 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 0.1.0 + 0.2.0 diff --git a/README.md b/README.md index e7adda1..05afd91 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Simple [PowerToys Run](https://learn.microsoft.com/windows/powertoys/run) experi ## Requirements - Microsoft Edge set as default browser -- PowerToys minimum version 0.75.0 +- PowerToys minimum version 0.76.0 ## Installation