From e776f9c7d8cb072886eeebcc20f7226bc0f459d0 Mon Sep 17 00:00:00 2001 From: ryanbodrug-microsoft <56318517+ryanbodrug-microsoft@users.noreply.github.com> Date: Sun, 3 May 2020 18:20:27 -0700 Subject: [PATCH] Moving Plugins from Wox.Plugin.* to Microsoft.Plugin.*. This is to rename the assemblies that get saved to the settings directory. External plugins will get saved to their on assembly folder in the future. --- PowerToys.sln | 10 ++-- .../Images/calculator.png | Bin .../Languages/de.xaml | 0 .../Languages/en.xaml | 0 .../Languages/pl.xaml | 0 .../Languages/tr.xaml | 0 .../Languages/zh-cn.xaml | 0 .../Languages/zh-tw.xaml | 0 .../Main.cs | 3 +- .../Microsoft.Plugin.Calculator.csproj} | 8 +-- .../NumberTranslator.cs | 2 +- .../plugin.json | 2 +- .../ContextMenuLoader.cs | 5 +- .../FolderLink.cs | 2 +- .../FolderPluginSettings.xaml | 2 +- .../FolderPluginSettings.xaml.cs | 3 +- .../Images/copy.png | Bin .../Images/deletefilefolder.png | Bin .../Images/file.png | Bin .../Images/folder.png | Bin .../Images/user.png | Bin .../Languages/de.xaml | 0 .../Languages/en.xaml | 0 .../Languages/pl.xaml | 0 .../Languages/tr.xaml | 0 .../Languages/zh-cn.xaml | 0 .../Languages/zh-tw.xaml | 0 .../Main.cs | 3 +- .../Microsoft.Plugin.Folder.csproj} | 8 +-- .../Settings.cs | 2 +- .../plugin.json | 2 +- .../ContextMenuLoader.cs | 2 +- .../AddProgramSource.xaml | 2 +- .../AddProgramSource.xaml.cs | 7 +-- .../AppxPackagingTlb.dll | Bin .../FileChangeWatcher.cs | 4 +- .../Images/cmd.png | Bin .../Images/disable.png | Bin .../Images/folder.png | Bin .../Images/program.png | Bin .../Images/user.png | Bin .../Languages/de.xaml | 0 .../Languages/en.xaml | 0 .../Languages/ja.xaml | 0 .../Languages/pl.xaml | 0 .../Languages/tr.xaml | 0 .../Languages/zh-cn.xaml | 0 .../Languages/zh-tw.xaml | 0 .../LocationConverter.cs | 2 +- .../Logger/ProgramLogger.cs | 6 +-- .../Main.cs | 50 +++++++++--------- .../Microsoft.Plugin.Program.csproj} | 8 +-- .../ProgramSuffixes.xaml | 2 +- .../ProgramSuffixes.xaml.cs | 3 +- .../Programs/IProgram.cs | 3 +- .../Programs/UWP.cs | 5 +- .../Programs/Win32.cs | 5 +- .../Settings.cs | 2 +- .../ShObjIdlTlb.dll | Bin .../SuffixesConverter.cs | 2 +- .../Views/Commands/ProgramSettingDisplay.cs | 4 +- .../Views/Models/ProgramSource.cs | 2 +- .../Views/ProgramSetting.xaml | 4 +- .../Views/ProgramSetting.xaml.cs | 11 ++-- .../plugin.json | 2 +- .../Images/shell.png | Bin .../Images/user.png | Bin .../Languages/de.xaml | 0 .../Languages/en.xaml | 0 .../Languages/pl.xaml | 0 .../Languages/tr.xaml | 0 .../Languages/zh-cn.xaml | 0 .../Languages/zh-tw.xaml | 0 .../Main.cs | 7 +-- .../Microsoft.Plugin.Shell.csproj} | 8 +-- .../Settings.cs | 2 +- .../ShellSetting.xaml | 2 +- .../ShellSetting.xaml.cs | 2 +- .../plugin.json | 2 +- .../Components/FuzzyMatching.cs | 2 +- .../Components/InteropAndHelpers.cs | 2 +- .../Components/LivePreview.cs | 2 +- .../Components/OpenWindows.cs | 2 +- .../Components/SearchController.cs | 2 +- .../Components/SearchResult.cs | 2 +- .../Components/SearchString.cs | 2 +- .../Components/Window.cs | 2 +- .../Components/WindowResult.cs | 2 +- .../Images/windowwalker.png | Bin .../Languages/en.xaml | 0 .../Main.cs | 5 +- .../Microsoft.Plugin.WindowWalker.csproj} | 8 +-- .../plugin.json | 2 +- 93 files changed, 124 insertions(+), 110 deletions(-) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Images/calculator.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Languages/de.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Languages/en.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Languages/pl.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Languages/tr.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Languages/zh-cn.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Languages/zh-tw.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/Main.cs (98%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj => Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj} (94%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/NumberTranslator.cs (99%) rename src/modules/launcher/Plugins/{Wox.Plugin.Calculator => Microsoft.Plugin.Calculator}/plugin.json (85%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/ContextMenuLoader.cs (97%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/FolderLink.cs (92%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/FolderPluginSettings.xaml (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/FolderPluginSettings.xaml.cs (98%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Images/copy.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Images/deletefilefolder.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Images/file.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Images/folder.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Images/user.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Languages/de.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Languages/en.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Languages/pl.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Languages/tr.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Languages/zh-cn.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Languages/zh-tw.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Main.cs (99%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder/Wox.Plugin.Folder.csproj => Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj} (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/Settings.cs (87%) rename src/modules/launcher/Plugins/{Wox.Plugin.Folder => Microsoft.Plugin.Folder}/plugin.json (85%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/AddProgramSource.xaml (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/AddProgramSource.xaml.cs (94%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/AppxPackagingTlb.dll (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/FileChangeWatcher.cs (96%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Images/cmd.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Images/disable.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Images/folder.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Images/program.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Images/user.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Languages/de.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Languages/en.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Languages/ja.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Languages/pl.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Languages/tr.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Languages/zh-cn.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Languages/zh-tw.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/LocationConverter.cs (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Logger/ProgramLogger.cs (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Main.cs (77%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program/Wox.Plugin.Program.csproj => Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj} (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/ProgramSuffixes.xaml (94%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/ProgramSuffixes.xaml.cs (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Programs/IProgram.cs (83%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Programs/UWP.cs (99%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Programs/Win32.cs (99%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Settings.cs (97%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/ShObjIdlTlb.dll (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/SuffixesConverter.cs (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Views/Commands/ProgramSettingDisplay.cs (98%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Views/Models/ProgramSource.cs (58%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Views/ProgramSetting.xaml (97%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/Views/ProgramSetting.xaml.cs (97%) rename src/modules/launcher/Plugins/{Wox.Plugin.Program => Microsoft.Plugin.Program}/plugin.json (84%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Images/shell.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Images/user.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Languages/de.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Languages/en.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Languages/pl.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Languages/tr.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Languages/zh-cn.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Languages/zh-tw.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Main.cs (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell/Wox.Plugin.Shell.csproj => Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj} (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/Settings.cs (96%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/ShellSetting.xaml (96%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/ShellSetting.xaml.cs (98%) rename src/modules/launcher/Plugins/{Wox.Plugin.Shell => Microsoft.Plugin.Shell}/plugin.json (86%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/FuzzyMatching.cs (96%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/InteropAndHelpers.cs (97%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/LivePreview.cs (94%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/OpenWindows.cs (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/SearchController.cs (96%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/SearchResult.cs (95%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/SearchString.cs (93%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/Window.cs (96%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Components/WindowResult.cs (90%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Images/windowwalker.png (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Languages/en.xaml (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/Main.cs (93%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker/Wox.Plugin.WindowWalker.csproj => Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj} (91%) rename src/modules/launcher/Plugins/{Wox.Plugin.WindowWalker => Microsoft.Plugin.WindowWalker}/plugin.json (85%) diff --git a/PowerToys.sln b/PowerToys.sln index 5903ea5d04..0f868736b8 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -176,13 +176,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Test", "src\modules\lau EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{4AFC9975-2456-4C70-94A4-84073C1CED93}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Calculator", "src\modules\launcher\Plugins\Wox.Plugin.Calculator\Wox.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Calculator", "src\modules\launcher\Plugins\Microsoft.Plugin.Calculator\Microsoft.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.WindowWalker", "src\modules\launcher\Plugins\Wox.Plugin.WindowWalker\Wox.Plugin.WindowWalker.csproj", "{74F1B9ED-F59C-4FE7-B473-7B453E30837E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.WindowWalker", "src\modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Microsoft.Plugin.WindowWalker.csproj", "{74F1B9ED-F59C-4FE7-B473-7B453E30837E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Program", "src\modules\launcher\Plugins\Wox.Plugin.Program\Wox.Plugin.Program.csproj", "{FDB3555B-58EF-4AE6-B5F1-904719637AB4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Program", "src\modules\launcher\Plugins\Microsoft.Plugin.Program\Microsoft.Plugin.Program.csproj", "{FDB3555B-58EF-4AE6-B5F1-904719637AB4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Shell", "src\modules\launcher\Plugins\Wox.Plugin.Shell\Wox.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Shell", "src\modules\launcher\Plugins\Microsoft.Plugin.Shell\Microsoft.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Indexer", "src\modules\launcher\Plugins\Microsoft.Plugin.Indexer\Microsoft.Plugin.Indexer.csproj", "{F8B870EB-D5F5-45BA-9CF7-A5C459818820}" ProjectSection(ProjectDependencies) = postProject @@ -242,7 +242,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common-md-flag", "src\commo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "interop-tests", "src\common\interop-tests\interop-tests.csproj", "{437AD818-3F1F-4CA5-A79B-25233A157026}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Folder", "src\modules\launcher\Plugins\Wox.Plugin.Folder\Wox.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder\Microsoft.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Images/calculator.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Images/calculator.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Images/calculator.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Images/calculator.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/de.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/de.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/de.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/de.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/en.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/en.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/en.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/en.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/pl.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/pl.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/pl.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/pl.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/tr.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/tr.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/tr.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/tr.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/zh-cn.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/zh-cn.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/zh-cn.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/zh-cn.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/zh-tw.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/zh-tw.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Languages/zh-tw.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Languages/zh-tw.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs similarity index 98% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Main.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs index fab0b8e030..3cdd0ffeb7 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs @@ -3,8 +3,9 @@ using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Windows; using Mages.Core; +using Wox.Plugin; -namespace Wox.Plugin.Caculator +namespace Microsoft.Plugin.Caculator { public class Main : IPlugin, IPluginI18n { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj similarity index 94% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj index 02e9cb96ac..b6e606ce8e 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Microsoft.Plugin.Calculator.csproj @@ -4,8 +4,8 @@ netcoreapp3.1 {59BD9891-3837-438A-958D-ADC7F91F6F7E} Properties - Wox.Plugin.Caculator - Wox.Plugin.Caculator + Microsoft.Plugin.Caculator + Microsoft.Plugin.Caculator true false false @@ -14,7 +14,7 @@ true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Caculator\ + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Caculator\ DEBUG;TRACE full x64 @@ -26,7 +26,7 @@ - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Caculator\ + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Caculator\ TRACE true pdbonly diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/NumberTranslator.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/NumberTranslator.cs similarity index 99% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/NumberTranslator.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/NumberTranslator.cs index 448301d4fb..7d43209270 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/NumberTranslator.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/NumberTranslator.cs @@ -6,7 +6,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace Wox.Plugin.Caculator +namespace Microsoft.Plugin.Caculator { /// /// Tries to convert all numbers in a text from one culture format to another. diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json similarity index 85% rename from src/modules/launcher/Plugins/Wox.Plugin.Calculator/plugin.json rename to src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json index 925099548c..9879d61f47 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Calculator/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json @@ -7,6 +7,6 @@ "Version":"1.0.0", "Language":"csharp", "Website":"http://www.wox.one/plugin", - "ExecuteFileName":"Wox.Plugin.Caculator.dll", + "ExecuteFileName":"Microsoft.Plugin.Caculator.dll", "IcoPath":"Images\\calculator.png" } \ No newline at end of file diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs similarity index 97% rename from src/modules/launcher/Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs index f6e83b1787..d8fe84cc30 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Folder/ContextMenuLoader.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/ContextMenuLoader.cs @@ -7,8 +7,9 @@ using System.Windows; using Wox.Infrastructure.Logger; using Wox.Infrastructure.Image; using Wox.Plugin.SharedCommands; +using Wox.Plugin; -namespace Wox.Plugin.Folder +namespace Microsoft.Plugin.Folder { internal class ContextMenuLoader : IContextMenu { @@ -118,7 +119,7 @@ namespace Wox.Plugin.Folder public void LogException(string message, Exception e) { - Log.Exception($"|Wox.Plugin.Folder.ContextMenu|{message}", e); + Log.Exception($"|Microsoft.Plugin.Folder.ContextMenu|{message}", e); } private bool CanRunAsDifferentUser(string path) diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Folder/FolderLink.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/FolderLink.cs similarity index 92% rename from src/modules/launcher/Plugins/Wox.Plugin.Folder/FolderLink.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Folder/FolderLink.cs index 8148c45bf4..cc64529542 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Folder/FolderLink.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/FolderLink.cs @@ -2,7 +2,7 @@ using System.Linq; using Newtonsoft.Json; -namespace Wox.Plugin.Folder +namespace Microsoft.Plugin.Folder { [JsonObject(MemberSerialization.OptIn)] public class FolderLink diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/FolderPluginSettings.xaml similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Folder/FolderPluginSettings.xaml index 93b9178e01..4cb54d6c7a 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/FolderPluginSettings.xaml @@ -1,4 +1,4 @@ -netcoreapp3.1 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} Properties - Wox.Plugin.Folder - Wox.Plugin.Folder + Microsoft.Plugin.Folder + Microsoft.Plugin.Folder true false false @@ -14,7 +14,7 @@ true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Folder\ + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Folder\ DEBUG;TRACE full x64 @@ -26,7 +26,7 @@ - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Folder\ + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Folder\ TRACE true pdbonly diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Folder/Settings.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Settings.cs similarity index 87% rename from src/modules/launcher/Plugins/Wox.Plugin.Folder/Settings.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Settings.cs index 27518258f9..70b6aed4f5 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Folder/Settings.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Settings.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Wox.Infrastructure.Storage; -namespace Wox.Plugin.Folder +namespace Microsoft.Plugin.Folder { public class Settings { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Folder/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json similarity index 85% rename from src/modules/launcher/Plugins/Wox.Plugin.Folder/plugin.json rename to src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json index 662a4df6eb..89cfd783d9 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Folder/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json @@ -7,6 +7,6 @@ "Version":"1.0.0", "Language":"csharp", "Website":"http://www.wox.one/plugin", - "ExecuteFileName":"Wox.Plugin.Folder.dll", + "ExecuteFileName":"Microsoft.Plugin.Folder.dll", "IcoPath":"Images\\folder.png" } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs index 9f054cdd91..56424b5b21 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/ContextMenuLoader.cs @@ -97,7 +97,7 @@ namespace Microsoft.Plugin.Indexer public void LogException(string message, Exception e) { - Log.Exception($"|Wox.Plugin.Folder.ContextMenu|{message}", e); + Log.Exception($"|Microsoft.Plugin.Folder.ContextMenu|{message}", e); } } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/AddProgramSource.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/AddProgramSource.xaml similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/AddProgramSource.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/AddProgramSource.xaml index 6e3d66ff5b..782b3f0490 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/AddProgramSource.xaml +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/AddProgramSource.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for AddProgramSource.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/AppxPackagingTlb.dll b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/AppxPackagingTlb.dll similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/AppxPackagingTlb.dll rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/AppxPackagingTlb.dll diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/FileChangeWatcher.cs similarity index 96% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/FileChangeWatcher.cs index 0df361215c..6ecea2e89a 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/FileChangeWatcher.cs @@ -2,9 +2,9 @@ using System.IO; using System.Threading.Tasks; using Wox.Infrastructure.Logger; -using Wox.Plugin.Program.Programs; +using Microsoft.Plugin.Program.Programs; -namespace Wox.Plugin.Program +namespace Microsoft.Plugin.Program { //internal static class FileChangeWatcher //{ diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Images/cmd.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/cmd.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Images/cmd.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/cmd.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Images/disable.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/disable.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Images/disable.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/disable.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Images/folder.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/folder.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Images/folder.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/folder.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Images/program.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/program.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Images/program.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/program.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Images/user.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/user.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Images/user.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Images/user.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/de.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/de.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/de.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/de.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/en.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/en.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/en.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/en.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/ja.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/ja.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/ja.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/ja.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/pl.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/pl.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/pl.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/pl.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/tr.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/tr.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/tr.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/tr.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/zh-cn.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/zh-cn.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/zh-cn.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/zh-cn.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/zh-tw.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/zh-tw.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Languages/zh-tw.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Languages/zh-tw.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/LocationConverter.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/LocationConverter.cs similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/LocationConverter.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/LocationConverter.cs index bd28bc9441..d52e96b45e 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/LocationConverter.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/LocationConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Windows.Data; using System.Windows.Markup; -namespace Wox.Plugin.Program +namespace Microsoft.Plugin.Program { public class LocationConverter : MarkupExtension, IValueConverter { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Logger/ProgramLogger.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Logger/ProgramLogger.cs similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Logger/ProgramLogger.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Logger/ProgramLogger.cs index 587aba6857..94078bb57e 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Logger/ProgramLogger.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Logger/ProgramLogger.cs @@ -8,7 +8,7 @@ using System.Runtime.CompilerServices; using System.Security; using Wox.Infrastructure; -namespace Wox.Plugin.Program.Logger +namespace Microsoft.Plugin.Program.Logger { /// /// The Program plugin has seen many issues recorded in the Wox repo related to various loading of Windows programs. @@ -56,7 +56,7 @@ namespace Wox.Plugin.Program.Logger var possibleResolution = "Not yet known"; var errorStatus = "UNKNOWN"; - logger.Error("------------- BEGIN Wox.Plugin.Program exception -------------"); + logger.Error("------------- BEGIN Microsoft.Plugin.Program exception -------------"); do { @@ -86,7 +86,7 @@ namespace Wox.Plugin.Program.Logger e = e.InnerException; } while (e != null); - logger.Error("------------- END Wox.Plugin.Program exception -------------"); + logger.Error("------------- END Microsoft.Plugin.Program exception -------------"); } /// diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs similarity index 77% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Main.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs index 444e6525e8..3b5ae7c6a3 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs @@ -9,17 +9,19 @@ using System.Timers; using System.Windows.Controls; using Wox.Infrastructure.Logger; using Wox.Infrastructure.Storage; -using Wox.Plugin.Program.Programs; -using Wox.Plugin.Program.Views; +using Wox.Plugin; +using Microsoft.Plugin.Program.Views; + using Stopwatch = Wox.Infrastructure.Stopwatch; -namespace Wox.Plugin.Program + +namespace Microsoft.Plugin.Program { public class Main : ISettingProvider, IPlugin, IPluginI18n, IContextMenu, ISavable, IReloadable { private static readonly object IndexLock = new object(); - internal static Win32[] _win32s { get; set; } - internal static UWP.Application[] _uwps { get; set; } + internal static Programs.Win32[] _win32s { get; set; } + internal static Programs.UWP.Application[] _uwps { get; set; } internal static Settings _settings { get; set; } FileSystemWatcher _watcher = null; @@ -29,8 +31,8 @@ namespace Wox.Plugin.Program private static PluginInitContext _context; - private static BinaryStorage _win32Storage; - private static BinaryStorage _uwpStorage; + private static BinaryStorage _win32Storage; + private static BinaryStorage _uwpStorage; private readonly PluginJsonStorage _settingsStorage; public Main() @@ -38,26 +40,26 @@ namespace Wox.Plugin.Program _settingsStorage = new PluginJsonStorage(); _settings = _settingsStorage.Load(); - Stopwatch.Normal("|Wox.Plugin.Program.Main|Preload programs cost", () => + Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Preload programs cost", () => { - _win32Storage = new BinaryStorage("Win32"); - _win32s = _win32Storage.TryLoad(new Win32[] { }); - _uwpStorage = new BinaryStorage("UWP"); - _uwps = _uwpStorage.TryLoad(new UWP.Application[] { }); + _win32Storage = new BinaryStorage("Win32"); + _win32s = _win32Storage.TryLoad(new Programs.Win32[] { }); + _uwpStorage = new BinaryStorage("UWP"); + _uwps = _uwpStorage.TryLoad(new Programs.UWP.Application[] { }); }); - Log.Info($"|Wox.Plugin.Program.Main|Number of preload win32 programs <{_win32s.Length}>"); - Log.Info($"|Wox.Plugin.Program.Main|Number of preload uwps <{_uwps.Length}>"); + Log.Info($"|Microsoft.Plugin.Program.Main|Number of preload win32 programs <{_win32s.Length}>"); + Log.Info($"|Microsoft.Plugin.Program.Main|Number of preload uwps <{_uwps.Length}>"); var a = Task.Run(() => { if (IsStartupIndexProgramsRequired || !_win32s.Any()) - Stopwatch.Normal("|Wox.Plugin.Program.Main|Win32Program index cost", IndexWin32Programs); + Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", IndexWin32Programs); }); var b = Task.Run(() => { if (IsStartupIndexProgramsRequired || !_uwps.Any()) - Stopwatch.Normal("|Wox.Plugin.Program.Main|Win32Program index cost", IndexUWPPrograms); + Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", IndexUWPPrograms); }); Task.WaitAll(a, b); @@ -77,8 +79,8 @@ namespace Wox.Plugin.Program public List Query(Query query) { - Win32[] win32; - UWP.Application[] uwps; + Programs.Win32[] win32; + Programs.UWP.Application[] uwps; lock (IndexLock) { @@ -106,7 +108,7 @@ namespace Wox.Plugin.Program public static void IndexWin32Programs() { - var win32S = Win32.All(_settings); + var win32S = Programs.Win32.All(_settings); lock (IndexLock) { _win32s = win32S; @@ -118,7 +120,7 @@ namespace Wox.Plugin.Program var windows10 = new Version(10, 0); var support = Environment.OSVersion.Version.Major >= windows10.Major; - var applications = support ? UWP.All() : new UWP.Application[] { }; + var applications = support ? Programs.UWP.All() : new Programs.UWP.Application[] { }; lock (IndexLock) { _uwps = applications; @@ -153,7 +155,7 @@ namespace Wox.Plugin.Program public List LoadContextMenus(Result selectedResult) { var menuOptions = new List(); - var program = selectedResult.ContextData as IProgram; + var program = selectedResult.ContextData as Programs.IProgram; if (program != null) { menuOptions = program.ContextMenus(_context.API); @@ -217,7 +219,7 @@ namespace Wox.Plugin.Program //When a watched directory changes then reset the timer. private void OnChanged(object source, FileSystemEventArgs e) { - Log.Debug($"|Wox.Plugin.Program.Main|Directory Changed: {e.FullPath} {e.ChangeType} - Resetting timer."); + Log.Debug($"|Microsoft.Plugin.Program.Main|Directory Changed: {e.FullPath} {e.ChangeType} - Resetting timer."); _timer.Stop(); _timer.Start(); } @@ -226,9 +228,9 @@ namespace Wox.Plugin.Program { Task.Run(() => { - Log.Debug($"|Wox.Plugin.Program.Main| ReIndexing UWP Programs"); + Log.Debug($"|Microsoft.Plugin.Program.Main| ReIndexing UWP Programs"); IndexUWPPrograms(); - Log.Debug($"|Wox.Plugin.Program.Main| Done ReIndexing"); + Log.Debug($"|Microsoft.Plugin.Program.Main| Done ReIndexing"); }); } } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj index 0bed61a1ab..4373f6c47d 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Microsoft.Plugin.Program.csproj @@ -4,8 +4,8 @@ netcoreapp3.1 {FDB3555B-58EF-4AE6-B5F1-904719637AB4} Properties - Wox.Plugin.Program - Wox.Plugin.Program + Microsoft.Plugin.Program + Microsoft.Plugin.Program true true false @@ -15,7 +15,7 @@ true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Program\ + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Program\ DEBUG;TRACE full x64 @@ -27,7 +27,7 @@ - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Program\ + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Program\ TRACE true pdbonly diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramSuffixes.xaml similarity index 94% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramSuffixes.xaml index 03d399a197..02e0ec0f9e 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ProgramSuffixes.xaml @@ -1,4 +1,4 @@ - /// ProgramSuffixes.xaml 的交互逻辑 diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/IProgram.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IProgram.cs similarity index 83% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/IProgram.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IProgram.cs index e183ecaad9..b5edcb280b 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/IProgram.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IProgram.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using Wox.Plugin; -namespace Wox.Plugin.Program.Programs +namespace Microsoft.Plugin.Program.Programs { public interface IProgram { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/UWP.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs similarity index 99% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/UWP.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs index 3b783fcda5..95e12225d9 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/UWP.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs @@ -13,14 +13,15 @@ using Windows.Management.Deployment; using AppxPackaing; using Shell; using Wox.Infrastructure; -using Wox.Plugin.Program.Logger; +using Microsoft.Plugin.Program.Logger; using IStream = AppxPackaing.IStream; using Rect = System.Windows.Rect; using Windows.UI.Xaml.Media.Imaging; using Windows.UI.Xaml.Media; using System.Windows.Controls; +using Wox.Plugin; -namespace Wox.Plugin.Program.Programs +namespace Microsoft.Plugin.Program.Programs { [Serializable] public class UWP diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs similarity index 99% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs index 3dc0202d83..c9ab274a97 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Programs/Win32.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32.cs @@ -10,9 +10,10 @@ using System.Threading.Tasks; using Microsoft.Win32; using Shell; using Wox.Infrastructure; -using Wox.Plugin.Program.Logger; +using Microsoft.Plugin.Program.Logger; +using Wox.Plugin; -namespace Wox.Plugin.Program.Programs +namespace Microsoft.Plugin.Program.Programs { [Serializable] public class Win32 : IProgram diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Settings.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Settings.cs similarity index 97% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Settings.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Settings.cs index 1ead3f9c32..e598bd4f7f 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Settings.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Settings.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace Wox.Plugin.Program +namespace Microsoft.Plugin.Program { public class Settings { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/ShObjIdlTlb.dll b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/ShObjIdlTlb.dll similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/ShObjIdlTlb.dll rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/ShObjIdlTlb.dll diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/SuffixesConverter.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/SuffixesConverter.cs similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/SuffixesConverter.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/SuffixesConverter.cs index 5db4ec945f..88981d8823 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/SuffixesConverter.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/SuffixesConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Windows.Data; using System.Windows.Markup; -namespace Wox.Plugin.Program +namespace Microsoft.Plugin.Program { public class SuffixesConvert : MarkupExtension, IValueConverter { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs similarity index 98% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs index 21bba677a5..41aa3f2202 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Wox.Plugin.Program.Views.Models; +using Microsoft.Plugin.Program.Views.Models; -namespace Wox.Plugin.Program.Views.Commands +namespace Microsoft.Plugin.Program.Views.Commands { internal static class ProgramSettingDisplay { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/Models/ProgramSource.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/Models/ProgramSource.cs similarity index 58% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Views/Models/ProgramSource.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/Models/ProgramSource.cs index c2995f74da..f9783c6853 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/Models/ProgramSource.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/Models/ProgramSource.cs @@ -1,5 +1,5 @@  -namespace Wox.Plugin.Program.Views.Models +namespace Microsoft.Plugin.Program.Views.Models { public class ProgramSource : Settings.ProgramSource { } } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/ProgramSetting.xaml similarity index 97% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/ProgramSetting.xaml index 0fe8d3bd85..65887d6e4c 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/ProgramSetting.xaml @@ -1,9 +1,9 @@ - diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/ProgramSetting.xaml.cs similarity index 97% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/ProgramSetting.xaml.cs index 72a4f57466..79b5cbbc68 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/ProgramSetting.xaml.cs @@ -5,13 +5,14 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using Wox.Plugin.Program.Views.Models; -using Wox.Plugin.Program.Views.Commands; -using Wox.Plugin.Program.Programs; +using Microsoft.Plugin.Program.Views.Models; +using Microsoft.Plugin.Program.Views.Commands; +using Microsoft.Plugin.Program.Programs; using System.ComponentModel; using System.Windows.Data; +using Wox.Plugin; -namespace Wox.Plugin.Program.Views +namespace Microsoft.Plugin.Program.Views { /// /// Interaction logic for ProgramSetting.xaml @@ -27,7 +28,7 @@ namespace Wox.Plugin.Program.Views // this as temporary holder for displaying all loaded programs sources. internal static List ProgramSettingDisplayList { get; set; } - public ProgramSetting(PluginInitContext context, Settings settings, Win32[] win32s, UWP.Application[] uwps) + public ProgramSetting(PluginInitContext context, Settings settings, Programs.Win32[] win32s, UWP.Application[] uwps) { this.context = context; InitializeComponent(); diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Program/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json similarity index 84% rename from src/modules/launcher/Plugins/Wox.Plugin.Program/plugin.json rename to src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json index 86fd8ebd62..dbc61450ef 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Program/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json @@ -7,6 +7,6 @@ "Version":"1.0.0", "Language":"csharp", "Website":"http://www.wox.one/plugin", - "ExecuteFileName":"Wox.Plugin.Program.dll", + "ExecuteFileName":"Microsoft.Plugin.Program.dll", "IcoPath":"Images\\program.png" } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Images/shell.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Images/shell.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Images/shell.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Images/shell.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Images/user.png b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Images/user.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Images/user.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Images/user.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/de.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/de.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/de.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/de.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/en.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/en.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/en.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/en.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/pl.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/pl.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/pl.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/pl.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/tr.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/tr.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/tr.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/tr.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/zh-cn.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/zh-cn.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/zh-cn.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/zh-cn.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/zh-tw.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/zh-tw.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Languages/zh-tw.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Languages/zh-tw.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs index 09fee7d80f..d794472f36 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Main.cs @@ -14,11 +14,12 @@ using Wox.Infrastructure.Hotkey; using Wox.Infrastructure.Logger; using Wox.Infrastructure.Storage; using Wox.Plugin.SharedCommands; +using Wox.Plugin; using Application = System.Windows.Application; using Control = System.Windows.Controls.Control; using Keys = System.Windows.Forms.Keys; -namespace Wox.Plugin.Shell +namespace Microsoft.Plugin.Shell { public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, ISavable { @@ -96,7 +97,7 @@ namespace Wox.Plugin.Shell } catch (Exception e) { - Log.Exception($"|Wox.Plugin.Shell.Main.Query|Exception when query for <{query}>", e); + Log.Exception($"|Microsoft.Plugin.Shell.Main.Query|Exception when query for <{query}>", e); } return results; } @@ -315,7 +316,7 @@ namespace Wox.Plugin.Shell private void OnWinRPressed() { - _context.API.ChangeQuery($"{_context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeperater}"); + _context.API.ChangeQuery($"{_context.CurrentPluginMetadata.ActionKeywords[0]}{Wox.Plugin.Query.TermSeperater}"); Application.Current.MainWindow.Visibility = Visibility.Visible; } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj index 9c3951afd6..9d41e75f4a 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Microsoft.Plugin.Shell.csproj @@ -4,8 +4,8 @@ netcoreapp3.1 {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} Properties - Wox.Plugin.Shell - Wox.Plugin.Shell + Microsoft.Plugin.Shell + Microsoft.Plugin.Shell true false false @@ -14,7 +14,7 @@ true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Shell\ + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Shell\ DEBUG;TRACE full x64 @@ -26,7 +26,7 @@ - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Shell\ + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Shell\ TRACE true pdbonly diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Settings.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Settings.cs similarity index 96% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/Settings.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Settings.cs index e4e1cd43fc..61c9af1b01 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Settings.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/Settings.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Wox.Plugin.Shell +namespace Microsoft.Plugin.Shell { public class Settings { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/ShellSetting.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/ShellSetting.xaml similarity index 96% rename from src/modules/launcher/Plugins/Wox.Plugin.Shell/ShellSetting.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.Shell/ShellSetting.xaml index dc6de53bac..07bdee4630 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Shell/ShellSetting.xaml +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/ShellSetting.xaml @@ -1,4 +1,4 @@ - /// Class housing fuzzy matching methods diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/InteropAndHelpers.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/InteropAndHelpers.cs similarity index 97% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/InteropAndHelpers.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/InteropAndHelpers.cs index 8bd6266adf..f20aa03319 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/InteropAndHelpers.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/InteropAndHelpers.cs @@ -6,7 +6,7 @@ using System; using System.Runtime.InteropServices; using System.Text; -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { /// /// Interop calls with helper layers diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/LivePreview.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/LivePreview.cs similarity index 94% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/LivePreview.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/LivePreview.cs index 1adf836736..13685f890d 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/LivePreview.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/LivePreview.cs @@ -4,7 +4,7 @@ using System; -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { /// /// Class containg methods to control the live preview diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/OpenWindows.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/OpenWindows.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs index 0d36f4a8b9..7340eac8f6 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/OpenWindows.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { /// /// Class that represents the state of the desktops windows diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchController.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchController.cs similarity index 96% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchController.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchController.cs index 0edc3777e9..35cf3bbe4f 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchController.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchController.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { /// /// Responsible for searching and finding matches for the strings provided. diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchResult.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchResult.cs similarity index 95% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchResult.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchResult.cs index f27ec80205..c9c9330a62 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchResult.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchResult.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { /// /// Contains search result windows with each window including the reason why the result was included diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchString.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchString.cs similarity index 93% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchString.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchString.cs index 8e08f8dea7..0a246a64e9 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/SearchString.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchString.cs @@ -2,7 +2,7 @@ // The Microsoft Corporation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. Code forked from Betsegaw Tadele's https://github.com/betsegaw/windowwalker/ -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { /// /// A class to represent a search string diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/Window.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/Window.cs similarity index 96% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/Window.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/Window.cs index 16098534d2..4f5d8e11c1 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/Window.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/Window.cs @@ -14,7 +14,7 @@ using System.Windows.Interop; using System.Windows.Media; using System.Windows.Media.Imaging; -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { /// /// Represents a specific open window diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/WindowResult.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/WindowResult.cs similarity index 90% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/WindowResult.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/WindowResult.cs index c7f790b596..0a766b3256 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/WindowResult.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/WindowResult.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Wox.Plugin.WindowWalker.Components +namespace Microsoft.Plugin.WindowWalker.Components { class WindowResult:Window { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Images/windowwalker.png b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Images/windowwalker.png similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Images/windowwalker.png rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Images/windowwalker.png diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Languages/en.xaml b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Languages/en.xaml similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Languages/en.xaml rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Languages/en.xaml diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs similarity index 93% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Main.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs index df1387e440..fc80252b84 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Main.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; -using Wox.Plugin.WindowWalker.Components; +using Microsoft.Plugin.WindowWalker.Components; +using Wox.Plugin; -namespace Wox.Plugin.WindowWalker +namespace Microsoft.Plugin.WindowWalker { public class Main : IPlugin, IPluginI18n { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Wox.Plugin.WindowWalker.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj similarity index 91% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Wox.Plugin.WindowWalker.csproj rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj index 0e0b414355..7ce1345832 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Wox.Plugin.WindowWalker.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Microsoft.Plugin.WindowWalker.csproj @@ -4,8 +4,8 @@ netcoreapp3.1 {74F1B9ED-F59C-4FE7-B473-7B453E30837E} Properties - Wox.Plugin.WindowWalker - Wox.Plugin.WindowWalker + Microsoft.Plugin.WindowWalker + Microsoft.Plugin.WindowWalker true false false @@ -14,7 +14,7 @@ true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.WindowWalker\ + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\ DEBUG;TRACE full x64 @@ -26,7 +26,7 @@ - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.WindowWalker\ + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\ TRACE true pdbonly diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json similarity index 85% rename from src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/plugin.json rename to src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json index 29281097a1..e88e91cc07 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json @@ -7,6 +7,6 @@ "Version":"1.0.0", "Language":"csharp", "Website":"http://www.windowwalker.com/", - "ExecuteFileName":"Wox.Plugin.WindowWalker.dll", + "ExecuteFileName":"Microsoft.Plugin.WindowWalker.dll", "IcoPath":"Images\\windowwalker.png" } \ No newline at end of file