|
46 | 46 | <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="AutoUpdate" Variable="AutoUpdate" Condition="AutoUpdateExists" After="AutoUpdateExists" /> |
47 | 47 | <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IconsDesktop" Variable="IconsDesktopExists" Result="exists" Id="IconsDesktopExists" /> |
48 | 48 | <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IconsDesktop" Variable="IconsDesktop" Condition="IconsDesktopExists" After="IconsDesktopExists" /> |
| 49 | + <util:RegistrySearch Id="DetectARM64Processor" Root="HKLM" Result="value" Variable="ARCH" |
| 50 | + Key="SYSTEM\CurrentControlSet\Control\Session Manager\Environment" Value="PROCESSOR_ARCHITECTURE" /> |
49 | 51 |
|
50 | 52 | <Chain> |
51 | | - <MsiPackage Id="IDEMIA" InstallCondition="MinidriverInstall = 1" ForcePerMachine="yes" |
| 53 | + <MsiPackage Id="IDEMIA" InstallCondition="MinidriverInstall = 1 AND NOT ARCH="ARM64"" ForcePerMachine="yes" |
52 | 54 | SourceFile="$(var.idemia)" Compressed="yes"> |
53 | 55 | <Payload SourceFile="$(var.path)\RemoveAWPBlock.mst" Name="RemoveAWPBlock.mst" Compressed="yes" /> |
54 | 56 | <MsiProperty Name="TRANSFORMS" Value="RemoveAWPBlock.mst" /> |
|
58 | 60 | <MsiProperty Name="PKCS11" Value="0" /> |
59 | 61 | <MsiProperty Name="IDPLUG_SERVICES" Value="[InstallCertSynchronizer]" /> |
60 | 62 | </MsiPackage> |
61 | | - <MsiPackage Id="THALES" InstallCondition="MinidriverInstall = 1" ForcePerMachine="yes" |
62 | | - SourceFile="$(var.thales)" Compressed="yes"> |
| 63 | + <MsiPackage Id="THALES.X64" InstallCondition="MinidriverInstall = 1 AND NOT ARCH="ARM64"" ForcePerMachine="yes" |
| 64 | + SourceFile="$(var.thales_x64)" Compressed="yes"> |
63 | 65 | <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> |
64 | 66 | </MsiPackage> |
65 | | - <MsiPackage Id="THALES.CERTDEL" InstallCondition="MinidriverInstall = 1 AND InstallCertSynchronizer = 1" ForcePerMachine="yes" |
66 | | - SourceFile="$(var.thales_certdel)" Compressed="yes"> |
| 67 | + <MsiPackage Id="THALES.ARM64" InstallCondition="MinidriverInstall = 1 AND ARCH="ARM64"" ForcePerMachine="yes" |
| 68 | + SourceFile="$(var.thales_arm64)" Compressed="yes"> |
| 69 | + <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> |
| 70 | + </MsiPackage> |
| 71 | + <MsiPackage Id="CERTDEL.X64" InstallCondition="MinidriverInstall = 1 AND InstallCertSynchronizer = 1 AND NOT ARCH="ARM64"" ForcePerMachine="yes" |
| 72 | + SourceFile="$(var.certdel_x64)" Compressed="yes"> |
| 73 | + <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> |
| 74 | + </MsiPackage> |
| 75 | + <MsiPackage Id="CERTDEL.ARM64" InstallCondition="MinidriverInstall = 1 AND InstallCertSynchronizer = 1 AND ARCH="ARM64"" ForcePerMachine="yes" |
| 76 | + SourceFile="$(var.certdel_arm64)" Compressed="yes"> |
67 | 77 | <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> |
68 | 78 | </MsiPackage> |
69 | 79 |
|
|
0 commit comments