diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
index dfa8d316f..f63f395fa 100644
--- a/.pipelines/pipeline.user.windows.yml
+++ b/.pipelines/pipeline.user.windows.yml
@@ -131,6 +131,7 @@ build:
- 'modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Wox.Plugin.dll'
- 'modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Telemetry.dll'
- 'modules\launcher\Plugins\Service\Microsoft.PowerToys.Run.Plugin.Service.dll'
+ - 'modules\launcher\Plugins\System\Microsoft.PowerToys.Run.Plugin.System.dll'
- 'modules\launcher\PowerLauncher.dll'
- 'modules\launcher\PowerLauncher.exe'
- 'modules\launcher\PowerLauncher.Telemetry.dll'
diff --git a/PowerToys.sln b/PowerToys.sln
index 72da819c2..08c27c1d8 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -241,9 +241,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest-ColorPickerUI", "s
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Sys", "src\modules\launcher\Plugins\Microsoft.Plugin.Sys\Microsoft.Plugin.Sys.csproj", "{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.System", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.System\Microsoft.PowerToys.Run.Plugin.System.csproj", "{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Sys.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Sys.UnitTests\Microsoft.Plugin.Sys.UnitTests.csproj", "{DA5A6FE9-0040-40CC-83CC-764AE5306590}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.System.UnitTests", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.System.UnitTests\Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj", "{DA5A6FE9-0040-40CC-83CC-764AE5306590}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Service", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Service\Microsoft.PowerToys.Run.Plugin.Service.csproj", "{0351ADA4-0C32-4652-9BA0-41F7B602372B}"
EndProject
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 802640f68..9cb606c06 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -253,6 +253,9 @@
+
+
+
@@ -996,6 +999,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/ImageTests.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/ImageTests.cs
similarity index 97%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/ImageTests.cs
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/ImageTests.cs
index 01db4be45..953e90283 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/ImageTests.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/ImageTests.cs
@@ -10,7 +10,7 @@ using NUnit.Framework;
using Wox.Infrastructure;
using Wox.Plugin;
-namespace Microsoft.Plugin.Sys.UnitTests
+namespace Microsoft.PowerToys.Run.Plugin.System.UnitTests
{
public class ImageTests
{
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/Microsoft.Plugin.Sys.UnitTests.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj
similarity index 90%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/Microsoft.Plugin.Sys.UnitTests.csproj
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj
index 66493439f..d653865ae 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/Microsoft.Plugin.Sys.UnitTests.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj
@@ -5,7 +5,7 @@
false
x64
- Microsoft.Plugin.Sys.UnitTests
+ Microsoft.PowerToys.Run.Plugin.System.UnitTests
true
@@ -25,7 +25,7 @@
-
+
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/QueryTests.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs
similarity index 95%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/QueryTests.cs
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs
index 69c7d6ca9..17d94cbd1 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys.UnitTests/QueryTests.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs
@@ -9,7 +9,7 @@ using NUnit.Framework;
using Wox.Infrastructure;
using Wox.Plugin;
-namespace Microsoft.Plugin.Sys.UnitTests
+namespace Microsoft.PowerToys.Run.Plugin.System.UnitTests
{
public class QueryTests
{
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/lock.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/lock.dark.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/lock.dark.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/lock.dark.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/lock.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/lock.light.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/lock.light.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/lock.light.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/logoff.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/logoff.dark.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/logoff.dark.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/logoff.dark.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/logoff.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/logoff.light.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/logoff.light.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/logoff.light.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/recyclebin.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/recyclebin.dark.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/recyclebin.dark.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/recyclebin.dark.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/recyclebin.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/recyclebin.light.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/recyclebin.light.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/recyclebin.light.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/restart.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/restart.dark.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/restart.dark.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/restart.dark.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/restart.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/restart.light.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/restart.light.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/restart.light.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/shutdown.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/shutdown.dark.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/shutdown.dark.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/shutdown.dark.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/shutdown.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/shutdown.light.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/shutdown.light.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/shutdown.light.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/sleep.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/sleep.dark.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/sleep.dark.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/sleep.dark.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/sleep.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/sleep.light.png
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Images/sleep.light.png
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Images/sleep.light.png
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Main.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs
similarity index 98%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Main.cs
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs
index 00dd6bc1c..9bcca9663 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs
@@ -8,11 +8,11 @@ using System.Diagnostics;
using System.Windows;
using System.Windows.Interop;
using ManagedCommon;
-using Microsoft.Plugin.Sys.Win32;
+using Microsoft.PowerToys.Run.Plugin.System.Win32;
using Wox.Infrastructure;
using Wox.Plugin;
-namespace Microsoft.Plugin.Sys
+namespace Microsoft.PowerToys.Run.Plugin.System
{
public class Main : IPlugin, IPluginI18n
{
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Microsoft.Plugin.Sys.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj
similarity index 95%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Microsoft.Plugin.Sys.csproj
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj
index 1c192329a..fbd094c28 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Microsoft.Plugin.Sys.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj
@@ -5,8 +5,8 @@
Library
netcoreapp3.1
Properties
- Microsoft.Plugin.Sys
- Microsoft.Plugin.Sys
+ Microsoft.PowerToys.Run.Plugin.System
+ Microsoft.PowerToys.Run.Plugin.System
$(Version).0
true
false
@@ -17,7 +17,7 @@
true
- ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Sys\
+ ..\..\..\..\..\x64\Debug\modules\launcher\Plugins\System\
DEBUG;TRACE
full
x64
@@ -29,7 +29,7 @@
- ..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Sys\
+ ..\..\..\..\..\x64\Release\modules\launcher\Plugins\System\
TRACE
true
pdbonly
@@ -84,7 +84,6 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Properties/Resources.Designer.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs
similarity index 97%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Properties/Resources.Designer.cs
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs
index 6aa3b2f62..f33c0e500 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Properties/Resources.Designer.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-namespace Microsoft.Plugin.Sys.Properties {
+namespace Microsoft.PowerToys.Run.Plugin.System.Properties {
using System;
@@ -39,7 +39,7 @@ namespace Microsoft.Plugin.Sys.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Plugin.Sys.Properties.Resources", typeof(Resources).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.PowerToys.Run.Plugin.System.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.resx
similarity index 100%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Properties/Resources.resx
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.resx
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Win32/NativeMethods.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Win32/NativeMethods.cs
similarity index 94%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Win32/NativeMethods.cs
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Win32/NativeMethods.cs
index 7e63e1de2..dc1aa75f0 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/Win32/NativeMethods.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Win32/NativeMethods.cs
@@ -5,7 +5,7 @@
using System;
using System.Runtime.InteropServices;
-namespace Microsoft.Plugin.Sys.Win32
+namespace Microsoft.PowerToys.Run.Plugin.System.Win32
{
internal class NativeMethods
{
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/plugin.json b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/plugin.json
similarity index 83%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Sys/plugin.json
rename to src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/plugin.json
index 759d7259b..52fc0614f 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Sys/plugin.json
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/plugin.json
@@ -7,6 +7,6 @@
"Version":"1.0.0",
"Language":"csharp",
"Website":"https://aka.ms/powertoys",
- "ExecuteFileName":"Microsoft.Plugin.Sys.dll",
+ "ExecuteFileName":"Microsoft.PowerToys.Run.Plugin.System.dll",
"IcoPath":"Images\\lock.png"
}
diff --git a/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs b/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs
index 098d66766..9b0bce9c3 100644
--- a/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs
+++ b/src/modules/launcher/Wox.Infrastructure/StringMatcher.cs
@@ -9,7 +9,7 @@ using System.Linq;
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.Plugin.Program.UnitTests")]
-[assembly: InternalsVisibleTo("Microsoft.Plugin.Sys.UnitTests")]
+[assembly: InternalsVisibleTo("Microsoft.PowerToys.Run.Plugin.System.UnitTests")]
namespace Wox.Infrastructure
{