From abf9287a999d42132e1a6351ff41a0d5ef1c5830 Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Fri, 8 Jan 2021 16:11:30 +0100
Subject: [PATCH] PT Run sys plugin added to setup (#8974)

sys plugin renamed to system
---
 .pipelines/pipeline.user.windows.yml          |   1 +
 PowerToys.sln                                 |   4 +--
 installer/PowerToysSetup/Product.wxs          |  24 ++++++++++++++++++
 .../ImageTests.cs                             |   2 +-
 ...erToys.Run.Plugin.System.UnitTests.csproj} |   4 +--
 .../QueryTests.cs                             |   2 +-
 .../Images/lock.dark.png                      | Bin
 .../Images/lock.light.png                     | Bin
 .../Images/logoff.dark.png                    | Bin
 .../Images/logoff.light.png                   | Bin
 .../Images/recyclebin.dark.png                | Bin
 .../Images/recyclebin.light.png               | Bin
 .../Images/restart.dark.png                   | Bin
 .../Images/restart.light.png                  | Bin
 .../Images/shutdown.dark.png                  | Bin
 .../Images/shutdown.light.png                 | Bin
 .../Images/sleep.dark.png                     | Bin
 .../Images/sleep.light.png                    | Bin
 .../Main.cs                                   |   4 +--
 ...rosoft.PowerToys.Run.Plugin.System.csproj} |   9 +++----
 .../Properties/Resources.Designer.cs          |   4 +--
 .../Properties/Resources.resx                 |   0
 .../Win32/NativeMethods.cs                    |   2 +-
 .../plugin.json                               |   2 +-
 .../Wox.Infrastructure/StringMatcher.cs       |   2 +-
 25 files changed, 42 insertions(+), 18 deletions(-)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys.UnitTests => Microsoft.PowerToys.Run.Plugin.System.UnitTests}/ImageTests.cs (97%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys.UnitTests/Microsoft.Plugin.Sys.UnitTests.csproj => Microsoft.PowerToys.Run.Plugin.System.UnitTests/Microsoft.PowerToys.Run.Plugin.System.UnitTests.csproj} (90%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys.UnitTests => Microsoft.PowerToys.Run.Plugin.System.UnitTests}/QueryTests.cs (95%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/lock.dark.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/lock.light.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/logoff.dark.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/logoff.light.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/recyclebin.dark.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/recyclebin.light.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/restart.dark.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/restart.light.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/shutdown.dark.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/shutdown.light.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/sleep.dark.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Images/sleep.light.png (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Main.cs (98%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys/Microsoft.Plugin.Sys.csproj => Microsoft.PowerToys.Run.Plugin.System/Microsoft.PowerToys.Run.Plugin.System.csproj} (95%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Properties/Resources.Designer.cs (97%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Properties/Resources.resx (100%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/Win32/NativeMethods.cs (94%)
 rename src/modules/launcher/Plugins/{Microsoft.Plugin.Sys => Microsoft.PowerToys.Run.Plugin.System}/plugin.json (83%)

diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
index dfa8d316fb..f63f395faf 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 72da819c2f..08c27c1d8f 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 802640f683..9cb606c067 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -253,6 +253,9 @@
                 <Directory Id="ServicePluginFolder" Name="Service">
                   <Directory Id="ServiceImagesFolder" Name="Images" />
                 </Directory>
+                <Directory Id="SystemPluginFolder" Name="System">
+                  <Directory Id="SystemImagesFolder" Name="Images" />
+                </Directory>
               </Directory>
               <Directory Id="LauncherPropertiesFolder" Name="Properties" />
             </Directory>
@@ -996,6 +999,27 @@
         <File Id="ServiceDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\Service\Images\service.dark.png" />
         <File Id="ServiceLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\Service\Images\service.light.png" />
       </Component>
+      
+      <!-- System Plugin -->
+      <Component Id="SystemComponent" Directory="SystemPluginFolder" Guid="05894C7C-7207-4669-ADB9-E02DD9DB4CCD">
+        <?foreach File in plugin.json;Microsoft.PowerToys.Run.Plugin.System.deps.json;Microsoft.PowerToys.Run.Plugin.System.dll?>
+          <File Id="System_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\$(var.File)" />
+        <?endforeach?>
+      </Component>
+      <Component Id="SystemImagesComponent" Directory="SystemImagesFolder" Guid="8886318A-0CD8-4990-85D1-50D44D5ADA21">
+        <File Id="SystemLockDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\lock.dark.png" />
+        <File Id="SystemLockLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\lock.light.png" />
+        <File Id="SystemLogoffDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\logoff.dark.png" />
+        <File Id="SystemLogoffLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\logoff.light.png" />
+        <File Id="SystemRecyclebinDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\recyclebin.dark.png" />
+        <File Id="SystemRecyclebinLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\recyclebin.light.png" />
+        <File Id="SystemRestartDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\restart.dark.png" />
+        <File Id="SystemRestartLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\restart.light.png" />
+        <File Id="SystemShutdownDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\shutdown.dark.png" />
+        <File Id="SystemShutdownLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\shutdown.light.png" />
+        <File Id="SystemSleepDarkIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\sleep.dark.png" />
+        <File Id="SystemSleepLightIcon" Source="$(var.BinX64Dir)modules\launcher\Plugins\System\Images\sleep.light.png" />
+      </Component>
     
     </ComponentGroup>
   </Fragment>
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 01db4be454..953e90283e 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 66493439fe..d653865ae0 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 @@
 
     <IsPackable>false</IsPackable>
 	<Platforms>x64</Platforms>
-    <RootNamespace>Microsoft.Plugin.Sys.UnitTests</RootNamespace>
+    <RootNamespace>Microsoft.PowerToys.Run.Plugin.System.UnitTests</RootNamespace>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Plugin.Sys\Microsoft.Plugin.Sys.csproj" />
+    <ProjectReference Include="..\Microsoft.PowerToys.Run.Plugin.System\Microsoft.PowerToys.Run.Plugin.System.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\codeAnalysis\GlobalSuppressions.cs">
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 69c7d6ca93..17d94cbd16 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 00dd6bc1c7..9bcca96634 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 1c192329af..fbd094c28c 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 @@
     <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Plugin.Sys</RootNamespace>
-    <AssemblyName>Microsoft.Plugin.Sys</AssemblyName>
+    <RootNamespace>Microsoft.PowerToys.Run.Plugin.System</RootNamespace>
+    <AssemblyName>Microsoft.PowerToys.Run.Plugin.System</AssemblyName>
     <Version>$(Version).0</Version>
     <useWPF>true</useWPF>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -17,7 +17,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Sys\</OutputPath>
+    <OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\System\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Sys\</OutputPath>
+    <OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\System\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -84,7 +84,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 	
   <ItemGroup>
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 6aa3b2f624..f33c0e5005 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 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-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 7e63e1de2c..dc1aa75f02 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 759d7259b9..52fc0614f3 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 098d66766d..9b0bce9c3c 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
 {