From a925d9e6e121b874d81978b1572a30fc2aa06e7d Mon Sep 17 00:00:00 2001
From: Jaime Bernardo <jaime@janeasystems.com>
Date: Thu, 12 Aug 2021 12:26:49 +0100
Subject: [PATCH] [Build] Sign PowerToysSetupCustomActions.dll (#12746)

---
 .pipelines/build-installer-PTCustomActions.cmd |  5 +++++
 .pipelines/pipeline.user.windows.yml           | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 .pipelines/build-installer-PTCustomActions.cmd

diff --git a/.pipelines/build-installer-PTCustomActions.cmd b/.pipelines/build-installer-PTCustomActions.cmd
new file mode 100644
index 0000000000..1187edc019
--- /dev/null
+++ b/.pipelines/build-installer-PTCustomActions.cmd
@@ -0,0 +1,5 @@
+cd /D "%~dp0"
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0
+SET IsPipeline=1
+call msbuild ../installer/PowerToysSetup.sln /target:PowerToysSetupCustomActions /p:Configuration=Release /p:Platform=x64 /p:CIBuild=true || exit /b 1
diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
index 1917779e55..fdaea129f6 100644
--- a/.pipelines/pipeline.user.windows.yml
+++ b/.pipelines/pipeline.user.windows.yml
@@ -177,7 +177,7 @@ build:
             - 'Settings\Telemetry.dll'
             - 'Settings\ManagedCommon.dll'
           signing_options:
-            sign_inline: true  # This does signing a soon as this command completes
+            sign_inline: true  # This does signing as soon as this command completes
     - !!buildcommand
       name: 'Build Power Toys Tools'
       command: '.pipelines\build-tools.cmd'
@@ -188,7 +188,17 @@ build:
             - 'BugReportTool\BugReportTool.exe'
             - 'WebcamReportTool\WebcamReportTool.exe'
           signing_options:
-            sign_inline: true  # This does signing a soon as this command completes
+            sign_inline: true  # This does signing as soon as this command completes
+    - !!buildcommand
+      name: 'Build Power Toys Installer Custom Action' # Need to do separately to sign dll before building installer
+      command: '.pipelines\build-installer-PTCustomActions.cmd'
+      artifacts:
+        - from: 'installer\PowerToysSetupCustomActions\x64\Release'
+          to: 'Build_Output'
+          include:
+            - 'PowerToysSetupCustomActions.dll'
+          signing_options:
+            sign_inline: true  # This does signing as soon as this command completes
     - !!buildcommand
       name: 'Build Power Toys Installer'
       command: '.pipelines\build-installer.cmd'
@@ -198,7 +208,7 @@ build:
           include:
             - 'PowerToysSetup-*.msi'
           signing_options:
-            sign_inline: true  # This does signing a soon as this command completes
+            sign_inline: true  # This does signing as soon as this command completes
     - !!buildcommand
       name: 'Build Power Toys Bootstrapper'
       command: '.pipelines\build-bootstrapper.cmd'
@@ -211,7 +221,7 @@ build:
           include:
             - 'PowerToysSetup-*.exe'
           signing_options:
-            sign_inline: true  # This does signing a soon as this command completes
+            sign_inline: true  # This does signing as soon as this command completes
 
 
 #package: