From f4a2741ba024b9935b66eb0adabaf63c2094df7c Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Date: Mon, 6 Apr 2020 14:00:14 -0700 Subject: [PATCH 1/6] Renamed Wox.Plugin.Indexer to Microsoft.Plugin.Indexer --- PowerToys.sln | 14 +++++++------- .../Images/WindowsIndexerImg.bmp | Bin .../Main.cs | 4 ++-- .../Microsoft.Plugin.Indexer.csproj} | 0 .../SearchHelper/SearchResult.cs | 2 +- .../SearchHelper/WindowsSearchAPI.cs | 2 +- .../Settings.cs | 2 +- .../plugin.json | 0 .../Wox.Test/Plugins/WindowsIndexerTest.cs | 2 +- src/modules/launcher/Wox.Test/Wox.Test.csproj | 1 - 10 files changed, 13 insertions(+), 14 deletions(-) rename src/modules/launcher/Plugins/{Wox.Plugin.Indexer => Microsoft.Plugin.Indexer}/Images/WindowsIndexerImg.bmp (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Indexer => Microsoft.Plugin.Indexer}/Main.cs (98%) rename src/modules/launcher/Plugins/{Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj => Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj} (100%) rename src/modules/launcher/Plugins/{Wox.Plugin.Indexer => Microsoft.Plugin.Indexer}/SearchHelper/SearchResult.cs (84%) rename src/modules/launcher/Plugins/{Wox.Plugin.Indexer => Microsoft.Plugin.Indexer}/SearchHelper/WindowsSearchAPI.cs (98%) rename src/modules/launcher/Plugins/{Wox.Plugin.Indexer => Microsoft.Plugin.Indexer}/Settings.cs (94%) rename src/modules/launcher/Plugins/{Wox.Plugin.Indexer => Microsoft.Plugin.Indexer}/plugin.json (100%) diff --git a/PowerToys.sln b/PowerToys.sln index a3c610b38b..27405f3231 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -139,7 +139,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox", "src\modules\launcher {59BD9891-3837-438A-958D-ADC7F91F6F7E} = {59BD9891-3837-438A-958D-ADC7F91F6F7E} {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} - {8DD27FDE-7B2F-45D8-A148-3340205A7BEF} = {8DD27FDE-7B2F-45D8-A148-3340205A7BEF} + {F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {F8B870EB-D5F5-45BA-9CF7-A5C459818820} EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Core", "src\modules\launcher\Wox.Core\Wox.Core.csproj", "{B749F0DB-8E75-47DB-9E5E-265D16D0C0D2}" @@ -165,7 +165,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wox.Launcher", "src\modules {DB90F671-D861-46BB-93A3-F1304F5BA1C5} = {DB90F671-D861-46BB-93A3-F1304F5BA1C5} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Indexer", "src\modules\launcher\Plugins\Wox.Plugin.Indexer\Wox.Plugin.Indexer.csproj", "{8DD27FDE-7B2F-45D8-A148-3340205A7BEF}" +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}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -305,10 +305,10 @@ Global {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64 {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64 {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64 - {8DD27FDE-7B2F-45D8-A148-3340205A7BEF}.Debug|x64.ActiveCfg = Debug|x64 - {8DD27FDE-7B2F-45D8-A148-3340205A7BEF}.Debug|x64.Build.0 = Debug|x64 - {8DD27FDE-7B2F-45D8-A148-3340205A7BEF}.Release|x64.ActiveCfg = Release|x64 - {8DD27FDE-7B2F-45D8-A148-3340205A7BEF}.Release|x64.Build.0 = Release|x64 + {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.ActiveCfg = Debug|x64 + {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.Build.0 = Debug|x64 + {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.ActiveCfg = Release|x64 + {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -350,7 +350,7 @@ Global {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} - {8DD27FDE-7B2F-45D8-A148-3340205A7BEF} = {4AFC9975-2456-4C70-94A4-84073C1CED93} + {F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {4AFC9975-2456-4C70-94A4-84073C1CED93} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0} diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Images/WindowsIndexerImg.bmp b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Images/WindowsIndexerImg.bmp similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/Images/WindowsIndexerImg.bmp rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Images/WindowsIndexerImg.bmp diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs similarity index 98% rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs index 8d6af797e9..7a08f635f1 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs @@ -8,10 +8,10 @@ using Wox.Plugin; using System.IO; using System.ComponentModel; using Wox.Infrastructure.Storage; -using Wox.Plugin.Indexer.SearchHelper; +using Microsoft.Plugin.Indexer.SearchHelper; using Microsoft.Search.Interop; -namespace Wox.Plugin.Indexer +namespace Microsoft.Plugin.Indexer { class Main : IPlugin, ISavable, IPluginI18n { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/SearchResult.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/SearchResult.cs similarity index 84% rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/SearchResult.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/SearchResult.cs index fc4c0ed770..4a097530d1 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/SearchResult.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/SearchResult.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Wox.Plugin.Indexer.SearchHelper +namespace Microsoft.Plugin.Indexer.SearchHelper { public class SearchResult { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs similarity index 98% rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs index fb7b6ffcd1..bb6cf764e4 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Data.OleDb; using Microsoft.Search.Interop; -namespace Wox.Plugin.Indexer.SearchHelper +namespace Microsoft.Plugin.Indexer.SearchHelper { public class WindowsSearchAPI { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Settings.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Settings.cs similarity index 94% rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/Settings.cs rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Settings.cs index 6fc9bbbf94..cdfc3600c1 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Settings.cs +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Settings.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Wox.Plugin.Indexer +namespace Microsoft.Plugin.Indexer { public class Settings { diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json similarity index 100% rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/plugin.json rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json diff --git a/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs b/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs index 9df2aa5892..c8d82f9a5b 100644 --- a/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs +++ b/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Data.OleDb; using Microsoft.Search.Interop; -using Wox.Plugin.Indexer.SearchHelper; +using Microsoft.Plugin.Indexer.SearchHelper; namespace Wox.Test.Plugins { diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index a0fe13e072..5e77b8d02c 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -39,7 +39,6 @@ - From ba081c783729fea7835a508f025c7bd56ae2c676 Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Date: Mon, 6 Apr 2020 15:48:58 -0700 Subject: [PATCH 2/6] Renamed Wox.Launcher to Microsoft.Launcher --- PowerToys.sln | 16 ++++++++-------- .../Microsoft.Launcher.rc} | Bin .../Microsoft.Launcher.vcxproj} | 8 ++++---- .../Microsoft.Launcher.vcxproj.filters} | 2 +- .../dllmain.cpp | 10 +++++----- .../pch.cpp | 0 .../{Wox.Launcher => Microsoft.Launcher}/pch.h | 0 .../resource.h | 0 .../trace.cpp | 0 .../trace.h | 0 src/modules/launcher/Wox.Test/Wox.Test.csproj | 1 + src/runner/main.cpp | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) rename src/modules/launcher/{Wox.Launcher/Wox.Launcher.rc => Microsoft.Launcher/Microsoft.Launcher.rc} (100%) rename src/modules/launcher/{Wox.Launcher/Wox.Launcher.vcxproj => Microsoft.Launcher/Microsoft.Launcher.vcxproj} (98%) rename src/modules/launcher/{Wox.Launcher/Wox.Launcher.vcxproj.filters => Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters} (88%) rename src/modules/launcher/{Wox.Launcher => Microsoft.Launcher}/dllmain.cpp (96%) rename src/modules/launcher/{Wox.Launcher => Microsoft.Launcher}/pch.cpp (100%) rename src/modules/launcher/{Wox.Launcher => Microsoft.Launcher}/pch.h (100%) rename src/modules/launcher/{Wox.Launcher => Microsoft.Launcher}/resource.h (100%) rename src/modules/launcher/{Wox.Launcher => Microsoft.Launcher}/trace.cpp (100%) rename src/modules/launcher/{Wox.Launcher => Microsoft.Launcher}/trace.h (100%) diff --git a/PowerToys.sln b/PowerToys.sln index 27405f3231..4a94b005ea 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -160,12 +160,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Shell", "src\mod 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}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wox.Launcher", "src\modules\launcher\Wox.Launcher\Wox.Launcher.vcxproj", "{E364F67B-BB12-4E91-B639-355866EBCD8B}" +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 - {DB90F671-D861-46BB-93A3-F1304F5BA1C5} = {DB90F671-D861-46BB-93A3-F1304F5BA1C5} + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} = {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} EndProjectSection 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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Launcher", "src\modules\launcher\Microsoft.Launcher\Microsoft.Launcher.vcxproj", "{E364F67B-BB12-4E91-B639-355866EBCD8B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -301,14 +301,14 @@ Global {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x64.Build.0 = Debug|x64 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.ActiveCfg = Release|x64 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.Build.0 = Release|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.ActiveCfg = Debug|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.ActiveCfg = Debug|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.Build.0 = Debug|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.ActiveCfg = Release|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.Build.0 = Release|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.ActiveCfg = Debug|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -349,8 +349,8 @@ Global {FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} - {E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {4AFC9975-2456-4C70-94A4-84073C1CED93} + {E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0} diff --git a/src/modules/launcher/Wox.Launcher/Wox.Launcher.rc b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc similarity index 100% rename from src/modules/launcher/Wox.Launcher/Wox.Launcher.rc rename to src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc diff --git a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj similarity index 98% rename from src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj rename to src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 992ac59354..b578b9c6b9 100644 --- a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -16,7 +16,7 @@ Win32Proj Wox_Launcher 10.0 - Wox.Launcher + Microsoft.Launcher @@ -109,14 +109,14 @@ - - - {74485049-c722-400f-abe5-86ac52d929b3} + + + diff --git a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj.filters b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters similarity index 88% rename from src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj.filters rename to src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters index da67056517..bb7d8ab134 100644 --- a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj.filters +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/modules/launcher/Wox.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp similarity index 96% rename from src/modules/launcher/Wox.Launcher/dllmain.cpp rename to src/modules/launcher/Microsoft.Launcher/dllmain.cpp index 76057c0e13..76d902a2c5 100644 --- a/src/modules/launcher/Wox.Launcher/dllmain.cpp +++ b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp @@ -29,7 +29,7 @@ struct ModuleSettings { } g_settings; // Implement the PowerToy Module Interface and all the required methods. -class Wox_Launcher : public PowertoyModuleIface { +class Microsoft_Launcher : public PowertoyModuleIface { private: // The PowerToy state. bool m_enabled = false; @@ -45,12 +45,12 @@ private: public: // Constructor - Wox_Launcher() { + Microsoft_Launcher() { app_name = GET_RESOURCE_STRING(IDS_LAUNCHER_NAME); init_settings(); }; - ~Wox_Launcher() { + ~Microsoft_Launcher() { if (m_enabled) { TerminateProcess(m_hProcess, 1); @@ -179,7 +179,7 @@ public: }; // Load the settings file. -void Wox_Launcher::init_settings() { +void Microsoft_Launcher::init_settings() { try { // Load and parse the settings file for this PowerToy. PowerToysSettings::PowerToyValues settings = @@ -193,5 +193,5 @@ void Wox_Launcher::init_settings() { extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() { - return new Wox_Launcher(); + return new Microsoft_Launcher(); } diff --git a/src/modules/launcher/Wox.Launcher/pch.cpp b/src/modules/launcher/Microsoft.Launcher/pch.cpp similarity index 100% rename from src/modules/launcher/Wox.Launcher/pch.cpp rename to src/modules/launcher/Microsoft.Launcher/pch.cpp diff --git a/src/modules/launcher/Wox.Launcher/pch.h b/src/modules/launcher/Microsoft.Launcher/pch.h similarity index 100% rename from src/modules/launcher/Wox.Launcher/pch.h rename to src/modules/launcher/Microsoft.Launcher/pch.h diff --git a/src/modules/launcher/Wox.Launcher/resource.h b/src/modules/launcher/Microsoft.Launcher/resource.h similarity index 100% rename from src/modules/launcher/Wox.Launcher/resource.h rename to src/modules/launcher/Microsoft.Launcher/resource.h diff --git a/src/modules/launcher/Wox.Launcher/trace.cpp b/src/modules/launcher/Microsoft.Launcher/trace.cpp similarity index 100% rename from src/modules/launcher/Wox.Launcher/trace.cpp rename to src/modules/launcher/Microsoft.Launcher/trace.cpp diff --git a/src/modules/launcher/Wox.Launcher/trace.h b/src/modules/launcher/Microsoft.Launcher/trace.h similarity index 100% rename from src/modules/launcher/Wox.Launcher/trace.h rename to src/modules/launcher/Microsoft.Launcher/trace.h diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index 5e77b8d02c..0fb2a5e1f1 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -39,6 +39,7 @@ + diff --git a/src/runner/main.cpp b/src/runner/main.cpp index c5aad127e2..19151588d8 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -176,7 +176,7 @@ int runner(bool isProcessElevated) L"shortcut_guide.dll", L"fancyzones.dll", L"PowerRenameExt.dll", - L"Wox.Launcher.dll" + L"Microsoft.Launcher.dll" }; for (auto& file : std::filesystem::directory_iterator(L"modules/")) { From d69383d78b233c5bacc43cbf34f8487a10e76812 Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Date: Wed, 8 Apr 2020 10:13:48 -0700 Subject: [PATCH 3/6] Modified the output folder produced --- .../Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj index 742e35a3e9..1c158f9685 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj @@ -13,7 +13,7 @@ true - ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Indexer\ + ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Indexer\ DEBUG;TRACE full x64 @@ -25,7 +25,7 @@ - ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Indexer\ + ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Indexer\ TRACE true pdbonly From 5e28d39f09b287e024a1b9eb9c6f51916c25dec6 Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Date: Wed, 8 Apr 2020 10:38:26 -0700 Subject: [PATCH 4/6] Renamed the dll produced --- .../Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj index 1c158f9685..3101a08655 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj @@ -4,8 +4,8 @@ netcoreapp3.1 {F8B870EB-D5F5-45BA-9CF7-A5C459818820} Properties - Wox.Plugin.Indexer - Wox.Plugin.Indexer + Microsoft.Plugin.Indexer + Microsoft.Plugin.Indexer false false x64 From 7151d5eac2dd06207760e9745d9d1ee7a7121e9f Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Date: Wed, 8 Apr 2020 10:39:02 -0700 Subject: [PATCH 5/6] Added dependency on PowerLauncher to the Microsoft.Launcher project --- PowerToys.sln | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/PowerToys.sln b/PowerToys.sln index 6c8a527d66..1be956df78 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -166,6 +166,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Indexer", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Launcher", "src\modules\launcher\Microsoft.Launcher\Microsoft.Launcher.vcxproj", "{E364F67B-BB12-4E91-B639-355866EBCD8B}" + ProjectSection(ProjectDependencies) = postProject {F97E5003-F263-4D4A-A964-0F1F3C82DEF2} = {F97E5003-F263-4D4A-A964-0F1F3C82DEF2} EndProjectSection EndProject @@ -315,10 +316,6 @@ Global {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64 {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64 {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64 - {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.ActiveCfg = Debug|x64 - {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.Build.0 = Debug|x64 - {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.ActiveCfg = Release|x64 - {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.Build.0 = Release|x64 {F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Debug|x64.ActiveCfg = Debug|x64 {F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Debug|x64.Build.0 = Debug|x64 {F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Release|x64.ActiveCfg = Release|x64 @@ -371,7 +368,6 @@ Global {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} - {F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {F97E5003-F263-4D4A-A964-0F1F3C82DEF2} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {4A3DE70C-684C-410D-B851-C23B6DAEDF16} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} EndGlobalSection From 3a46260937f501f6c49aec143c78ce47a6087011 Mon Sep 17 00:00:00 2001 From: Alekhya Reddy Date: Wed, 8 Apr 2020 10:52:03 -0700 Subject: [PATCH 6/6] modified the name of the dll in the indexer plugin --- .../launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json index 741c57ddcc..d34b40f822 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json @@ -7,6 +7,6 @@ "Version": "1.0.0", "Language": "csharp", "Website": "http://www.wox.one/plugin", - "ExecuteFileName": "Wox.Plugin.Indexer.dll", + "ExecuteFileName": "Microsoft.Plugin.Indexer.dll", "IcoPath": "Images\\WindowsIndexerImg.bmp" }