From 539fe048aba7a9d39a7c69527ebcb179a4b38381 Mon Sep 17 00:00:00 2001
From: Stefan Markovic <stefan@janeasystems.com>
Date: Thu, 2 Jun 2022 12:45:43 +0200
Subject: [PATCH] Sign dll Add PowerToys preffix Add assets to installer

---
 .pipelines/ESRPSigning_core.json                    |  1 +
 installer/PowerToysSetup/Product.wxs                | 13 +++++++++++--
 .../PowerRenameContextMenu/AppxManifest.xml         |  2 +-
 .../PowerRenameContextMenu.vcxproj                  |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json
index ec5928075a..6609540a4c 100644
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -106,6 +106,7 @@
 
                 "modules\\PowerRename\\PowerToys.PowerRenameExt.dll",
                 "modules\\PowerRename\\PowerToys.PowerRename.exe",
+                "modules\\PowerRename\\PowerToys.PowerRenameContextMenu.dll",
                 "modules\\PowerRename\\PowerRenameContextMenuPackage.msix",
 
                 "modules\\ShortcutGuide\\ShortcutGuide\\PowerToys.ShortcutGuide.exe",
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index f59aa4b386..0a5033f677 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -104,9 +104,11 @@
 
 	<?define WinTermCmpFiles=plugin.json;Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json;Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll;PowerToys.ManagedTelemetry.dll?>
 
-    <?define PowerRenameFiles=PowerRenameUI.ico;Microsoft.WindowsAppRuntime.Bootstrap.dll;PowerToys.PowerRename.exe;resources.pri;PowerToys.PowerRenameExt.dll;PowerRenameContextMenuPackage.msix?>
+    <?define PowerRenameFiles=PowerRenameUI.ico;Microsoft.WindowsAppRuntime.Bootstrap.dll;PowerToys.PowerRename.exe;resources.pri;PowerToys.PowerRenameExt.dll;PowerRenameContextMenuPackage.msix;PowerToys.PowerRenameContextMenu.dll?>
 
-	<Product Id="*"
+    <?define PowerRenameSparsePackageAssets=BadgeLogo.scale-100.png;BadgeLogo.scale-125.png;BadgeLogo.scale-150.png;BadgeLogo.scale-200.png;BadgeLogo.scale-400.png;LargeTile.scale-100.png;LargeTile.scale-125.png;LargeTile.scale-150.png;LargeTile.scale-200.png;LargeTile.scale-400.png;SmallTile.scale-100.png;SmallTile.scale-125.png;SmallTile.scale-150.png;SmallTile.scale-200.png;SmallTile.scale-400.png;SplashScreen.png;SplashScreen.scale-100.png;SplashScreen.scale-125.png;SplashScreen.scale-150.png;SplashScreen.scale-200.png;SplashScreen.scale-400.png;Square150x150Logo.scale-100.png;Square150x150Logo.scale-125.png;Square150x150Logo.scale-150.png;Square150x150Logo.scale-200.png;Square150x150Logo.scale-400.png;Square44x44Logo.altform-lightunplated_targetsize-16.png;Square44x44Logo.altform-lightunplated_targetsize-24.png;Square44x44Logo.altform-lightunplated_targetsize-256.png;Square44x44Logo.altform-lightunplated_targetsize-32.png;Square44x44Logo.altform-lightunplated_targetsize-48.png;Square44x44Logo.altform-unplated_targetsize-16.png;Square44x44Logo.altform-unplated_targetsize-24.png;Square44x44Logo.altform-unplated_targetsize-256.png;Square44x44Logo.altform-unplated_targetsize-32.png;Square44x44Logo.altform-unplated_targetsize-48.png;Square44x44Logo.scale-100.png;Square44x44Logo.scale-125.png;Square44x44Logo.scale-150.png;Square44x44Logo.scale-200.png;Square44x44Logo.scale-400.png;Square44x44Logo.targetsize-16.png;Square44x44Logo.targetsize-24.png;Square44x44Logo.targetsize-256.png;Square44x44Logo.targetsize-32.png;Square44x44Logo.targetsize-48.png;storelogo.scale-100.png;storelogo.scale-125.png;storelogo.scale-150.png;storelogo.scale-200.png;storelogo.scale-400.png;Wide310x150Logo.scale-100.png;Wide310x150Logo.scale-125.png;Wide310x150Logo.scale-150.png;Wide310x150Logo.scale-200.png;Wide310x150Logo.scale-400.png?>
+
+    <Product Id="*"
        Name="PowerToys (Preview)"
        Language="1033"
        Version="$(var.Version)"
@@ -730,6 +732,12 @@
                 <File Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\file.png" />
                 <File Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\folder.png" />
             </Component>
+            <!-- !Warning! Make sure to change Component Guid if you update the file list -->
+            <Component Id="PowerRename_PowerRenameSparsePackageAssets" Guid="A32B528D-2771-4853-9775-1791D39DF30E" Win64="yes">
+                <?foreach File in $(var.PowerRenameSparsePackageAssets)?>
+                    <File Source="$(var.BinDir)modules\$(var.PowerRenameProjectName)\Assets\$(var.File)" />
+                <?endforeach?>
+            </Component>
         </DirectoryRef>
         <!-- MouseUtils -->
         <DirectoryRef Id="MouseUtilsInstallFolder" FileSource="$(var.BinDir)modules\$(var.MouseUtilsProjectName)">
@@ -976,6 +984,7 @@
 			    <ComponentRef Id="PowerRename_$(var.File)" />
 			<?endforeach?>
 			<ComponentRef Id="Module_PowerRename_Assets" />
+			<ComponentRef Id="PowerRename_PowerRenameSparsePackageAssets" />
             <?foreach File in $(var.ImageResizerFiles)?>
                 <ComponentRef Id="Module_ImageResizer_$(var.File)" />
             <?endforeach?>                
diff --git a/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml b/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml
index 03eb0d70a4..0015178c97 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml
+++ b/src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml
@@ -45,7 +45,7 @@
         <com:Extension Category="windows.comServer">
           <com:ComServer>
             <com:SurrogateServer  DisplayName="Context menu verb handler">
-              <com:Class Id="1861E28B-A1F0-4EF4-A1FE-4C8CA88E2174" Path="PowerRenameContextMenu.dll" ThreadingModel="STA"/>
+              <com:Class Id="1861E28B-A1F0-4EF4-A1FE-4C8CA88E2174" Path="PowerToys.PowerRenameContextMenu.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
         </com:Extension>
diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
index ca61f06037..49341b8d60 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
+++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
@@ -32,7 +32,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <TargetName>PowerRename.PowerRenameContextMenu</TargetName>
+    <TargetName>PowerToys.PowerRenameContextMenu</TargetName>
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\PowerRename\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">