diff --git a/PowerToys.sln b/PowerToys.sln index 8d6502809d..3250682df6 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -156,8 +156,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerCommon", "sr EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "launcher", "launcher", "{C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Core", "src\modules\launcher\Wox.Core\Wox.Core.csproj", "{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Infrastructure", "src\modules\launcher\Wox.Infrastructure\Wox.Infrastructure.csproj", "{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin", "src\modules\launcher\Wox.Plugin\Wox.Plugin.csproj", "{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}" @@ -383,10 +381,6 @@ Global {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Debug|x64.Build.0 = Debug|x64 {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Release|x64.ActiveCfg = Release|x64 {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Release|x64.Build.0 = Release|x64 - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|x64.ActiveCfg = Debug|x64 - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Debug|x64.Build.0 = Debug|x64 - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|x64.ActiveCfg = Release|x64 - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}.Release|x64.Build.0 = Release|x64 {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x64.ActiveCfg = Debug|x64 {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Debug|x64.Build.0 = Debug|x64 {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}.Release|x64.ActiveCfg = Release|x64 @@ -589,7 +583,6 @@ Global {38BDB927-829B-4C65-9CD9-93FB05D66D65} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65} {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} - {B749F0DB-8E75-47DB-9E5E-265D16D0C0D2} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {4FD29318-A8AB-4D8F-AA47-60BC241B8DA3} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {FF742965-9A80-41A5-B042-D6C7D3A21708} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 3a8aabb04c..1b435e081e 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -886,7 +886,7 @@ - + diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs index 66955e7822..59025bf5dc 100644 --- a/src/modules/launcher/PowerLauncher/App.xaml.cs +++ b/src/modules/launcher/PowerLauncher/App.xaml.cs @@ -10,9 +10,9 @@ using ManagedCommon; using Microsoft.PowerLauncher.Telemetry; using Microsoft.PowerToys.Telemetry; using PowerLauncher.Helper; +using PowerLauncher.Plugin; using PowerLauncher.ViewModel; using Wox; -using Wox.Core.Plugin; using Wox.Infrastructure; using Wox.Infrastructure.Http; using Wox.Infrastructure.Image; diff --git a/src/modules/launcher/Wox.Core/Resource/FontHelper.cs b/src/modules/launcher/PowerLauncher/Helper/FontHelper.cs similarity index 98% rename from src/modules/launcher/Wox.Core/Resource/FontHelper.cs rename to src/modules/launcher/PowerLauncher/Helper/FontHelper.cs index 8575bc1d53..2da591b3fa 100644 --- a/src/modules/launcher/Wox.Core/Resource/FontHelper.cs +++ b/src/modules/launcher/PowerLauncher/Helper/FontHelper.cs @@ -3,14 +3,13 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; using System.Linq; using System.Reflection; using System.Windows; using System.Windows.Media; using Wox.Plugin.Logger; -namespace Wox.Core.Resource +namespace PowerLauncher.Helper { public static class FontHelper { diff --git a/src/modules/launcher/Wox.Core/Plugin/PluginConfig.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginConfig.cs similarity index 99% rename from src/modules/launcher/Wox.Core/Plugin/PluginConfig.cs rename to src/modules/launcher/PowerLauncher/Plugin/PluginConfig.cs index 36ab2b743b..4ca4f435e6 100644 --- a/src/modules/launcher/Wox.Core/Plugin/PluginConfig.cs +++ b/src/modules/launcher/PowerLauncher/Plugin/PluginConfig.cs @@ -11,7 +11,7 @@ using Newtonsoft.Json; using Wox.Plugin; using Wox.Plugin.Logger; -namespace Wox.Core.Plugin +namespace PowerLauncher.Plugin { internal abstract class PluginConfig { diff --git a/src/modules/launcher/Wox.Core/Plugin/PluginInstaller.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginInstaller.cs similarity index 99% rename from src/modules/launcher/Wox.Core/Plugin/PluginInstaller.cs rename to src/modules/launcher/PowerLauncher/Plugin/PluginInstaller.cs index 8a25e9d666..33b338bdb7 100644 --- a/src/modules/launcher/Wox.Core/Plugin/PluginInstaller.cs +++ b/src/modules/launcher/PowerLauncher/Plugin/PluginInstaller.cs @@ -12,7 +12,7 @@ using Newtonsoft.Json; using Wox.Plugin; using Wox.Plugin.Logger; -namespace Wox.Core.Plugin +namespace PowerLauncher.Plugin { internal class PluginInstaller { diff --git a/src/modules/launcher/Wox.Core/Plugin/PluginManager.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs similarity index 99% rename from src/modules/launcher/Wox.Core/Plugin/PluginManager.cs rename to src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs index a6b43df6eb..3359ec1041 100644 --- a/src/modules/launcher/Wox.Core/Plugin/PluginManager.cs +++ b/src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs @@ -16,7 +16,7 @@ using Wox.Infrastructure.UserSettings; using Wox.Plugin; using Wox.Plugin.Logger; -namespace Wox.Core.Plugin +namespace PowerLauncher.Plugin { /// /// The entry for managing Wox plugins diff --git a/src/modules/launcher/Wox.Core/Plugin/PluginsLoader.cs b/src/modules/launcher/PowerLauncher/Plugin/PluginsLoader.cs similarity index 96% rename from src/modules/launcher/Wox.Core/Plugin/PluginsLoader.cs rename to src/modules/launcher/PowerLauncher/Plugin/PluginsLoader.cs index 7093720698..073e113f8e 100644 --- a/src/modules/launcher/Wox.Core/Plugin/PluginsLoader.cs +++ b/src/modules/launcher/PowerLauncher/Plugin/PluginsLoader.cs @@ -5,14 +5,11 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using System.Runtime.Loader; using Wox.Infrastructure; -using Wox.Infrastructure.UserSettings; using Wox.Plugin; -using Wox.Plugin.Logger; -namespace Wox.Core.Plugin +namespace PowerLauncher.Plugin { public static class PluginsLoader { diff --git a/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs b/src/modules/launcher/PowerLauncher/Plugin/QueryBuilder.cs similarity index 99% rename from src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs rename to src/modules/launcher/PowerLauncher/Plugin/QueryBuilder.cs index 90e86f67b9..2b26ad2ac5 100644 --- a/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs +++ b/src/modules/launcher/PowerLauncher/Plugin/QueryBuilder.cs @@ -8,7 +8,7 @@ using System.Linq; using Mono.Collections.Generic; using Wox.Plugin; -namespace Wox.Core.Plugin +namespace PowerLauncher.Plugin { public static class QueryBuilder { diff --git a/src/modules/launcher/Wox.Core/Plugin/README.md b/src/modules/launcher/PowerLauncher/Plugin/README.md similarity index 100% rename from src/modules/launcher/Wox.Core/Plugin/README.md rename to src/modules/launcher/PowerLauncher/Plugin/README.md diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 8ce0e67d6a..4e96bebd36 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -109,6 +109,7 @@ all + @@ -124,7 +125,6 @@ - diff --git a/src/modules/launcher/PowerLauncher/PublicAPIInstance.cs b/src/modules/launcher/PowerLauncher/PublicAPIInstance.cs index da846f187f..0081167894 100644 --- a/src/modules/launcher/PowerLauncher/PublicAPIInstance.cs +++ b/src/modules/launcher/PowerLauncher/PublicAPIInstance.cs @@ -9,8 +9,8 @@ using System.Net; using System.Windows; using ManagedCommon; using PowerLauncher.Helper; +using PowerLauncher.Plugin; using PowerLauncher.ViewModel; -using Wox.Core.Plugin; using Wox.Infrastructure; using Wox.Infrastructure.Image; using Wox.Plugin; diff --git a/src/modules/launcher/PowerLauncher/SettingsWatcher.cs b/src/modules/launcher/PowerLauncher/SettingsWatcher.cs index b4b8b05b8c..6358b8003d 100644 --- a/src/modules/launcher/PowerLauncher/SettingsWatcher.cs +++ b/src/modules/launcher/PowerLauncher/SettingsWatcher.cs @@ -10,7 +10,7 @@ using System.Windows.Input; using ManagedCommon; using Microsoft.PowerToys.Settings.UI.Library; using PowerLauncher.Helper; -using Wox.Core.Plugin; +using PowerLauncher.Plugin; using Wox.Infrastructure.Hotkey; using Wox.Infrastructure.UserSettings; using Wox.Plugin; diff --git a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs index c845b9d716..230dbcfbec 100644 --- a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs +++ b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs @@ -16,8 +16,8 @@ using interop; using Microsoft.PowerLauncher.Telemetry; using Microsoft.PowerToys.Telemetry; using PowerLauncher.Helper; +using PowerLauncher.Plugin; using PowerLauncher.Storage; -using Wox.Core.Plugin; using Wox.Infrastructure; using Wox.Infrastructure.Hotkey; using Wox.Infrastructure.Storage; diff --git a/src/modules/launcher/PowerLauncher/ViewModel/ResultViewModel.cs b/src/modules/launcher/PowerLauncher/ViewModel/ResultViewModel.cs index 3f2a176b09..b089aa643f 100644 --- a/src/modules/launcher/PowerLauncher/ViewModel/ResultViewModel.cs +++ b/src/modules/launcher/PowerLauncher/ViewModel/ResultViewModel.cs @@ -7,7 +7,7 @@ using System.Collections.ObjectModel; using System.Windows.Input; using System.Windows.Media; using PowerLauncher.Helper; -using Wox.Core.Plugin; +using PowerLauncher.Plugin; using Wox.Infrastructure.Image; using Wox.Plugin; using Wox.Plugin.Logger; diff --git a/src/modules/launcher/Wox.Core/FodyWeavers.xml b/src/modules/launcher/Wox.Core/FodyWeavers.xml deleted file mode 100644 index 4e68ed1a8b..0000000000 --- a/src/modules/launcher/Wox.Core/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/modules/launcher/Wox.Core/FodyWeavers.xsd b/src/modules/launcher/Wox.Core/FodyWeavers.xsd deleted file mode 100644 index 69dbe488ce..0000000000 --- a/src/modules/launcher/Wox.Core/FodyWeavers.xsd +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - Used to control if the On_PropertyName_Changed feature is enabled. - - - - - Used to control if the Dependent properties feature is enabled. - - - - - Used to control if the IsChanged property feature is enabled. - - - - - Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. - - - - - Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project. - - - - - Used to control if equality checks should use the Equals method resolved from the base class. - - - - - Used to control if equality checks should use the static Equals method resolved from the base class. - - - - - Used to turn off build warnings from this weaver. - - - - - Used to turn off build warnings about mismatched On_PropertyName_Changed methods. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/src/modules/launcher/Wox.Core/README.md b/src/modules/launcher/Wox.Core/README.md deleted file mode 100644 index b2e9b83de3..0000000000 --- a/src/modules/launcher/Wox.Core/README.md +++ /dev/null @@ -1,9 +0,0 @@ -What does Wox.Core do? -===== - -* Handle Query -* Define Wox exceptions -* Manage Plugins (including system plugin and user plugin) -* Manage Themes -* Manage i18n -* Manage Update and version \ No newline at end of file diff --git a/src/modules/launcher/Wox.Core/Wox.Core.csproj b/src/modules/launcher/Wox.Core/Wox.Core.csproj deleted file mode 100644 index 2708128a28..0000000000 --- a/src/modules/launcher/Wox.Core/Wox.Core.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - - netcoreapp3.1 - true - true - Library - Properties - Wox.Core - Wox.Core - $(Version).0 - false - false - x64 - - - - true - ..\..\..\..\x64\Debug\modules\launcher\WoxCore - DEBUG;TRACE - full - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - false - - - - ..\..\..\..\x64\Release\modules\launcher\WoxCore - TRACE - true - pdbonly - x64 - 7.3 - prompt - MinimumRecommendedRules.ruleset - 4 - - - true - - - - true - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - all - - - - - - - - - - - - GlobalSuppressions.cs - - - StyleCop.json - - - - - 1.1.118 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - \ No newline at end of file diff --git a/src/modules/launcher/Wox.Test/PluginManagerTest.cs b/src/modules/launcher/Wox.Test/PluginManagerTest.cs index 98b49eb21d..7fb64bcf17 100644 --- a/src/modules/launcher/Wox.Test/PluginManagerTest.cs +++ b/src/modules/launcher/Wox.Test/PluginManagerTest.cs @@ -2,12 +2,10 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Collections.Generic; -using System.Text; using Moq; using NUnit.Framework; -using Wox.Core.Plugin; +using PowerLauncher.Plugin; using Wox.Plugin; namespace Wox.Test diff --git a/src/modules/launcher/Wox.Test/QueryBuilderTest.cs b/src/modules/launcher/Wox.Test/QueryBuilderTest.cs index 2b99aea2bd..02494e69f6 100644 --- a/src/modules/launcher/Wox.Test/QueryBuilderTest.cs +++ b/src/modules/launcher/Wox.Test/QueryBuilderTest.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using Mono.Collections.Generic; using NUnit.Framework; -using Wox.Core.Plugin; +using PowerLauncher.Plugin; using Wox.Plugin; namespace Wox.Test diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index 1d5b2a491a..8cec87eaf4 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -51,7 +51,6 @@ -