From e9a6dc978beb4e6d3a87ea16a57d4e78a0a8553b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Thu, 15 Sep 2022 17:55:27 +0200
Subject: [PATCH] Fix code sign in windows

---
 azure-pipelines-windows-template-qt6.yml | 6 +++---
 azure-pipelines-windows-template.yml     | 6 +++---
 ci/win/build_installer.iss               | 1 +
 ci/win/build_installer_qt6.iss           | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/azure-pipelines-windows-template-qt6.yml b/azure-pipelines-windows-template-qt6.yml
index 0a83adf9..f4623f01 100644
--- a/azure-pipelines-windows-template-qt6.yml
+++ b/azure-pipelines-windows-template-qt6.yml
@@ -43,14 +43,14 @@ jobs:
     displayName: 'Run tests'
   - ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
     - task: DownloadSecureFile@1
-      name: pdxFile
+      name: pfxFile
       displayName: 'Get the pfx file certificate'
       inputs:
-        secureFile: 'certificate.pdx'
+        secureFile: 'certificate.pfx'
   - script: |
       set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
       cd $(Build.SourcesDirectory)\ci\win
-      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt6 $(pdxFile) $(pdxPassword)
+      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5 $(pfxFile.secureFilePath)  $(pdxPassword)
     displayName: 'Create installer'
   - task: CopyFiles@2
     inputs:
diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml
index 8fae23f7..98ecac22 100644
--- a/azure-pipelines-windows-template.yml
+++ b/azure-pipelines-windows-template.yml
@@ -43,14 +43,14 @@ jobs:
     displayName: 'Run tests'
   - ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
     - task: DownloadSecureFile@1
-      name: pdxFile
+      name: pfxFile
       displayName: 'Get the pfx file certificate'
       inputs:
-        secureFile: 'certificate.pdx'
+        secureFile: 'certificate.pfx'
   - script: |
       set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
       cd $(Build.SourcesDirectory)\ci\win
-      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5 $(pdxFile) $(pdxPassword)
+      .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5 $(pfxFile.secureFilePath)  $(pdxPassword)
     displayName: 'Create installer'
   - task: CopyFiles@2
     inputs:
diff --git a/ci/win/build_installer.iss b/ci/win/build_installer.iss
index 420ab1d0..7a2e9a83 100644
--- a/ci/win/build_installer.iss
+++ b/ci/win/build_installer.iss
@@ -15,6 +15,7 @@ SetupIconFile=setup.ico
 UninstallDisplayIcon=uninstall.ico
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
+SignTool=signtool
 
 [Registry]
 Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association
diff --git a/ci/win/build_installer_qt6.iss b/ci/win/build_installer_qt6.iss
index 3db56cf7..ec5fe9e9 100644
--- a/ci/win/build_installer_qt6.iss
+++ b/ci/win/build_installer_qt6.iss
@@ -15,6 +15,7 @@ SetupIconFile=setup.ico
 UninstallDisplayIcon=uninstall.ico
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
+SignTool=signtool
 
 [Registry]
 Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association
@@ -98,7 +99,7 @@ Source: "vc_redist.{#PLATFORM}.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 Source: utils\7z.dll; DestDir: {app}\utils\
 
 ;Bin
-Source: YACReader.exe; DestDir: {app}; Permissions: everyone-full
+Source: YACReader.exe; DestDir: {app}; Permissions: everyone-full;
 Source: YACReaderLibrary.exe; DestDir: {app}; Permissions: everyone-full; Tasks:
 Source: YACReaderLibraryServer.exe; DestDir: {app}; Permissions: everyone-full; Tasks: