From 22e4c4ce2a5f601bbe1fa8d3fd21e39cf743af6f Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Thu, 25 May 2023 11:26:21 +0200
Subject: [PATCH] [Installer][PTRun]Fix PowerToys plugin setup (#26157)

---
 installer/PowerToysSetup/Resources.wxs          |  11 ++++++++++-
 .../generateAllFileComponents.ps1               |   5 +++++
 .../Images/PowerToys.dark.png                   | Bin 329 -> 166 bytes
 .../Images/PowerToys.light.png                  | Bin 320 -> 154 bytes
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/installer/PowerToysSetup/Resources.wxs b/installer/PowerToysSetup/Resources.wxs
index 4b43801c54..a4dd7067c3 100644
--- a/installer/PowerToysSetup/Resources.wxs
+++ b/installer/PowerToysSetup/Resources.wxs
@@ -383,7 +383,16 @@
           <RegistryValue Type="string" Name="Launcher_History_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
         </RegistryKey>
         <File Id="Launcher_History_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\History\$(var.Language)\Microsoft.PowerToys.Run.Plugin.History.resources.dll" />
-      </Component>	  
+      </Component>
+      <Component
+          Id="Launcher_PowerToys_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder"
+          Guid="$(var.CompGUIDPrefix)1C">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_PowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_PowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)modules\launcher\Plugins\PowerToys\$(var.Language)\Microsoft.PowerToys.Run.Plugin.PowerToys.resources.dll" />
+      </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
       <?endforeach?>
diff --git a/installer/PowerToysSetup/generateAllFileComponents.ps1 b/installer/PowerToysSetup/generateAllFileComponents.ps1
index de54116831..e435ff8bdb 100644
--- a/installer/PowerToysSetup/generateAllFileComponents.ps1
+++ b/installer/PowerToysSetup/generateAllFileComponents.ps1
@@ -198,6 +198,11 @@ Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$
 Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\WindowsTerminal\Images"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+###PowerToys
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json"" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\modules\launcher\Plugins\PowerToys\Images"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
 ## Plugins
 
 #ShortcutGuide
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Images/PowerToys.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Images/PowerToys.dark.png
index 2277ad614683eb58c9512f1777bae9cef837f1bb..49a0a39e6dd8e8908c00c092cd7163ddb7344685 100644
GIT binary patch
delta 139
zcmX@fw2X0ray>(?r;B4q1>@Tr8+i{ah_EHj`jUA={qv<%rZ&&%itoM)Z2MxcZ}LAz
zyUyzu&YU^3P3NRKH|v?_Obu~6-e)>|43-PGSr};g;5jeD=7RcshXw{lCKe6>1t{Y~
p_Q$ve@eARRlgf=Z-!<CI?DKj(XVHA23<e<ZboFy#S?83{1OSjeIH3Rl

delta 303
zcmV+~0nq-Y0m%Z8BYy!9Nkl<ZcmeI0feC{!5Jep!BXk5es2kJ`nh`ocfsRl*K{hd)
z=mxsMHNX!9kfViM<nSIGK%w{VVS*;zsW1$~FbpE{sissb)ni4^yX4>wA)+9|NeDy)
zEUCttA?QC88I#1a$-}!&kV3*sG#wl4u>o1JX44H#T>}A^H-C1`rkPih0s;bUu_usW
z8wy|orw|~b9<TjgtH7i95bM<m;P+5SjOqkR3E<TU@DfS{$}d*%)GqMRA+SGuP_u-X
z;S~rl!!rk!>s}r8BD?%C{6akQ5dsc_y?^+BNEMk1OrF{!<z|Qaoy|I{yjCe2L*gcM
zu{9whO0CUE!YClaNnh?pZ0uTW=;=GdFbu;u6JJagqJ1IZag_i7002ovPDHLkV1oIl
BflUAa

diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Images/PowerToys.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Images/PowerToys.light.png
index 3de8782dad0a6c09d11f6cc7910bb9246f15ae7e..ccf947383126208cca15455f16b5b15d9b30ee59 100644
GIT binary patch
delta 126
zcmX@WG>dV9aydhyr;B4q1>@Tr8+jWHcw7&fd@;G%UU}Kjv29^8=Ldm_GKXwm@)xv9
zPY<1}^0LELc<q0w0O9gJhLme=3{j8P&5(Z4x%(~y3TU|gXgfpn8ow=j*GyCK)PKhn
UvM817^+}K#Pgg&ebxsLQ07;B5*#H0l

delta 294
zcmV+>0oneV0l)%~BYy!0Nkl<ZcmZM<1%P(Uzyx6!h@u%GBRE1gup8J7yb&Bgz!Ag=
zx=FH$-JsbZ9`Jz!Fi^;~9K8o00VMw(J%#3MIF92u#7Uf$Q#)nFnfIVbL`hXnLRWV(
z3Kq_!P%@$e5`7^td<=>R3DP)p3i^!b%Aq3#hsK~!6hG{4RDa~PPtd0zuy+9PC$Jwb
za0-EelkjO$;35962dgVI3yH~`fRsSUh(KGyoB$y4y{C17k2L`~{A^=|8pGQV*gpKo
zx&Fx^0+$WLFPz%Q_XvTA!QPxE5X_CtjXtxll*M1_1tfOW-n9zILgJ=$v6aw~wRRH{
ss>#|<nNU(X4j)}`CWSNMIF92uKbr+FxV2+Y*Z=?k07*qoM6N<$g0}~NbN~PV