diff --git a/PowerToys.sln b/PowerToys.sln
index 3e563f1f47..1f32cc9e9a 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -183,13 +183,16 @@ 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
+ {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} = {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}
+ 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
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Indexer", "src\modules\launcher\Plugins\Wox.Plugin.Indexer\Wox.Plugin.Indexer.csproj", "{F8B870EB-D5F5-45BA-9CF7-A5C459818820}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher", "src\modules\launcher\PowerLauncher\PowerLauncher.csproj", "{F97E5003-F263-4D4A-A964-0F1F3C82DEF2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerLauncher.UI", "src\modules\launcher\PowerLauncher.UI\PowerLauncher.UI.csproj", "{4A3DE70C-684C-410D-B851-C23B6DAEDF16}"
@@ -362,14 +365,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
{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
@@ -460,8 +463,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}
{F97E5003-F263-4D4A-A964-0F1F3C82DEF2} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
{4A3DE70C-684C-410D-B851-C23B6DAEDF16} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
{880ED251-9E16-4713-9A70-D35FE0C01669} = {E775CC2C-24CB-48D6-9C3A-BE4CCE0DB17A}
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/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 d55b42671d..06f6cdac78 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 91%
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
index 010d0bbe19..af55922653 100644
--- a/src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.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
true
false
false
@@ -14,7 +14,7 @@
true
- ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Indexer\
+ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Indexer\
DEBUG;TRACE
full
x64
@@ -26,7 +26,7 @@
- ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Indexer\
+ ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Indexer\
TRACE
true
pdbonly
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 88%
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 d43a0fc701..048191fa23 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 6d2b9b1881..83bcda7418 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 85%
rename from src/modules/launcher/Plugins/Wox.Plugin.Indexer/plugin.json
rename to src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json
index 741c57ddcc..d34b40f822 100644
--- a/src/modules/launcher/Plugins/Wox.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"
}
diff --git a/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs b/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs
index fae98e9ab8..b3677629c4 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 3ddcec6c93..df7e04b573 100644
--- a/src/modules/launcher/Wox.Test/Wox.Test.csproj
+++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj
@@ -39,7 +39,7 @@
-
+
diff --git a/src/runner/main.cpp b/src/runner/main.cpp
index 4ff08be639..da62525a8e 100644
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -201,7 +201,7 @@ int runner(bool isProcessElevated)
L"shortcut_guide.dll",
L"fancyzones.dll",
L"PowerRenameExt.dll",
- L"Wox.Launcher.dll",
+ L"Microsoft.Launcher.dll",
L"ImageResizerExt.dll",
L"powerpreview.dll",
L"WindowWalker.dll"