|
53 | 53 | <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IconsDesktop" Variable="IconsDesktop" Condition="IconsDesktopExists"/> |
54 | 54 | <util:DirectorySearch Path="[InstallFolder]" Variable="Installed" Result="exists"/> |
55 | 55 | <util:FileSearch Path="[ProgramFiles64Folder]\Open-EID\ID-Updater.exe" Variable="InstallX64" Result="exists" Condition="Installed"/> |
56 | | - <util:ProductSearch Id="VCREDIST_140_x86" UpgradeCode="65E5BD06-6392-3027-8C26-853107D3CF1A" Result="version" Variable="VCREDIST_140_x86" /> |
57 | | - <util:ProductSearch Id="VCREDIST_140_x64" UpgradeCode="36F68A90-239C-34DF-B58C-64B30153CE35" Result="version" Variable="VCREDIST_140_x64" /> |
58 | 56 | <util:ProductSearch Id="Old311_Installed" UpgradeCode="58A1DBA8-81A2-4D58-980B-4A6174D5B66B" Result="version" Variable="Old311Installed" /> |
59 | 57 | <util:ProductSearch Id="QtConf_Installed" UpgradeCode="471cf7f5-b418-4463-9a55-e3895c8519e0" Result="version" Variable="QtConfInstalled" /> |
60 | 58 | <util:ProductSearch Id="Firefox_Installed" UpgradeCode="4e7f96ae-a8c9-45ae-bcf1-1fb64597df5b" Result="version" Variable="FirefoxInstalled" /> |
|
75 | 73 | <MsiProperty Name="TARGETDIR" Value="[InstallFolder]"/> |
76 | 74 | </MsiPackage> |
77 | 75 |
|
78 | | - <ExePackage Id="vcredist_x86" Cache="no" PerMachine="yes" SourceFile="$(var.vcredist).x86.exe" Compressed="$(var.embed)" DownloadUrl="$(var.URL)" |
79 | | - InstallCommand="/install /quiet /norestart" Permanent="yes" DetectCondition="(VCREDIST_140_x86 >= v14.16.27033.0)"> |
80 | | - <ExitCode Value="3010" Behavior="forceReboot"/> |
81 | | - <!-- Ignore "Newer version installed" error --> |
82 | | - <ExitCode Value="1638" Behavior="success"/> |
83 | | - </ExePackage> |
84 | | - <ExePackage Id="vcredist_x64" Cache="no" PerMachine="yes" SourceFile="$(var.vcredist).x64.exe" Compressed="$(var.embed)" DownloadUrl="$(var.URL)" InstallCondition="VersionNT64" |
85 | | - InstallCommand="/install /quiet /norestart" Permanent="yes" DetectCondition="(VCREDIST_140_x64 >= v14.16.27033.0)"> |
86 | | - <ExitCode Value="3010" Behavior="forceReboot"/> |
87 | | - <!-- Ignore "Newer version installed" error --> |
88 | | - <ExitCode Value="1638" Behavior="success"/> |
89 | | - </ExePackage> |
90 | | - |
91 | 76 | <MsiPackage Id="Minidriver.X64" InstallCondition="VersionNT64 AND MinidriverInstall = 1" ForcePerMachine="yes" |
92 | 77 | SourceFile="$(var.minidriver).x64.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)"> |
93 | 78 | <MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/> |
|
0 commit comments