From bfd4ae05cf54892be12ef78cc575d78631ca8190 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 12:35:01 -0800 Subject: [PATCH 1/8] Update release.yml --- .pipelines/release.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.pipelines/release.yml b/.pipelines/release.yml index b4326403220a..9863d8d208ce 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -239,6 +239,46 @@ jobs: clean: true maximumCpuCount: true + - task: CmdLine@2 + displayName: 'Insignia: Extract Engine from Bundle' + script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' + + + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + displayName: 'ESRP CodeSigning (Engine)' + inputs: + ConnectedServiceName: 'Terminal/Console/WinAppDriver Team Code Signing Connection' + FolderPath: 'installer' + Pattern: engine.exe + signConfigType: inlineSignParams + inlineOperation: | + [ + { + "KeyCode": "CP-230012", + "OperationCode": "SigntoolSign", + "Parameters": { + "OpusName": "Microsoft", + "OpusInfo": "http://www.microsoft.com", + "FileDigest": "/fd \"SHA256\"", + "PageHash": "/NPH", + "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256" + }, + "ToolName": "sign", + "ToolVersion": "1.0" + }, + { + "KeyCode": "CP-230012", + "OperationCode": "SigntoolVerify", + "Parameters": {}, + "ToolName": "sign", + "ToolVersion": "1.0" + } + ] + + - task: CmdLine@2 + displayName: 'Insignia: Merge Engine into Bundle' + script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' + - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 displayName: Sign Boostrapper inputs: From 3d778f7bf46bf4a1cc6772f60c75f7788179ec6f Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 12:45:36 -0800 Subject: [PATCH 2/8] Update release.yml --- .pipelines/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 9863d8d208ce..caced4df4307 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -241,7 +241,8 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Extract Engine from Bundle' - script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' + inputs: + script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 @@ -277,7 +278,8 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Merge Engine into Bundle' - script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' + inputs: + script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 displayName: Sign Boostrapper From 07c2a6d716a4585d40ee075848ff6a0afde7661b Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 14:45:32 -0800 Subject: [PATCH 3/8] fixing paths --- .pipelines/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/release.yml b/.pipelines/release.yml index caced4df4307..917dbc992691 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -242,7 +242,7 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Extract Engine from Bundle' inputs: - script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' + script: '.installer\packages\WiX.3.11.2\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 @@ -279,7 +279,7 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Merge Engine into Bundle' inputs: - script: '.\packages\WiX.3.14.0.4118\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' + script: '.installer\packages\WiX.3.11.2\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 displayName: Sign Boostrapper From d04e4cecd774654c128ca75ec522176965f37f49 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 15:01:21 -0800 Subject: [PATCH 4/8] now i'm actually fixing paths --- .pipelines/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 917dbc992691..6320cb123a68 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -242,7 +242,7 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Extract Engine from Bundle' inputs: - script: '.installer\packages\WiX.3.11.2\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' + script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 @@ -279,7 +279,7 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Merge Engine into Bundle' inputs: - script: '.installer\packages\WiX.3.11.2\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' + script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 displayName: Sign Boostrapper From 4ced2a0e0e025d209bd88c8ee030259c8a999c94 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 16:02:04 -0800 Subject: [PATCH 5/8] hangs head ... yet another file path correction --- .pipelines/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 6320cb123a68..878d26773eba 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -242,7 +242,7 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Extract Engine from Bundle' inputs: - script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ib installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' + script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 @@ -279,7 +279,7 @@ jobs: - task: CmdLine@2 displayName: 'Insignia: Merge Engine into Bundle' inputs: - script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ab installer\engine.exe installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' + script: '.\installer\packages\WiX.3.11.2\tools\insignia.exe -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform).exe' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 displayName: Sign Boostrapper From 2fec6a68dca57f1ae13acf65cef8e2b291dbd6cb Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 20:42:45 -0800 Subject: [PATCH 6/8] Update ESRPSigning_core.json --- .pipelines/ESRPSigning_core.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 8370f8e07a60..788b3162bbcf 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -4,7 +4,7 @@ "SignBatches": [ { "MatchedPath": [ - "!(ModernWpf)*.resources.dll", + "!ModernWpf*.resources.dll", "PowerToysSetupCustomActions.dll", From a0af654fc78219ca38b69bca2d4ca674b5e6d531 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 22:50:27 -0800 Subject: [PATCH 7/8] Update ESRPSigning_core.json --- .pipelines/ESRPSigning_core.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 788b3162bbcf..4d1e8a971840 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -1,6 +1,6 @@ { "Version": "1.0.0", - "UseMinimatch": false, + "UseMinimatch": true, "SignBatches": [ { "MatchedPath": [ From 4fef83c8be029ae8934e64659747af486e812895 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Mon, 20 Dec 2021 22:52:40 -0800 Subject: [PATCH 8/8] Update ESRPSigning_core.json --- .pipelines/ESRPSigning_core.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 4d1e8a971840..7365acf945f8 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -1,10 +1,10 @@ { "Version": "1.0.0", - "UseMinimatch": true, + "UseMinimatch": false, "SignBatches": [ { "MatchedPath": [ - "!ModernWpf*.resources.dll", + "*.resources.dll", "PowerToysSetupCustomActions.dll",