Skip to content

Commit eea2bfa

Browse files
vbaderksvbaderks
committed
Add Visual C++ 2015-2022 Redistributable for Arm64
1 parent 993ec47 commit eea2bfa

File tree

1 file changed

+69
-44
lines changed

1 file changed

+69
-44
lines changed

‎setup/bootstrapper/Bundle.wxs

+69-44
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
<!-- Use a different upgrade code for x86 to allow x86 and x64 versions to be installed side by side -->
1111
<?if $(sys.BUILDARCHSHORT) = "X86" ?>
12-
<?define UpgradeCode = "385a0ece-2336-4e92-985b-e68bd1794254" ?>
12+
<?define UpgradeCode = "385a0ece-2336-4e92-985b-e68bd1794254" ?>
1313
<?else?>
14-
<?define UpgradeCode = "385a0ece-2336-4e92-985b-e68bd1794255" ?>
14+
<?define UpgradeCode = "385a0ece-2336-4e92-985b-e68bd1794255" ?>
1515
<?endif?>
1616

1717
<Bundle Name="Netpbm WIC Codec ($(sys.BUILDARCH))"
@@ -68,52 +68,77 @@
6868
<Chain>
6969
<!-- Visual C++ 2015-2022 Redistributable (x86) -->
7070
<?if $(sys.BUILDARCHSHORT) = "X86" ?>
71-
<ExePackage
72-
Id="VC_REDIST_X86"
73-
DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
74-
Cache="remove"
75-
PerMachine="yes"
76-
Permanent="yes"
77-
Protocol="burn"
78-
InstallCondition="VersionNT"
79-
DetectCondition="(VCRUNTIME_X86_VER &gt;= VCRUNTIME_VER) AND VersionNT"
80-
InstallArguments="/install /quiet /norestart"
81-
RepairArguments="/repair /quiet /norestart"
82-
UninstallArguments="/uninstall /quiet /norestart">
83-
<ExePackagePayload
84-
Name="VC_redist.x86.exe"
85-
ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
86-
Description="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
87-
Hash="91a6283f774f9e2338b65aa835156854e9e76aed32f821b13cfd070dd6c87e1542ce2d5845beb5e4af1ddb102314bb6e0ad6214d896bb3e387590a01eae0c182"
88-
Size="13867304"
89-
Version="14.40.33810.0"
90-
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/9c69db26-cda4-472d-bdae-f2b87f4a0177/A32DD41EAAB0C5E1EAA78BE3C0BB73B48593DE8D97A7510B97DE3FD993538600/VC_redist.x86.exe" />
91-
</ExePackage>
71+
<ExePackage
72+
Id="VC_REDIST_X86"
73+
DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
74+
Cache="remove"
75+
PerMachine="yes"
76+
Permanent="yes"
77+
Protocol="burn"
78+
InstallCondition="VersionNT"
79+
DetectCondition="(VCRUNTIME_X86_VER &gt;= VCRUNTIME_VER) AND VersionNT"
80+
InstallArguments="/install /quiet /norestart"
81+
RepairArguments="/repair /quiet /norestart"
82+
UninstallArguments="/uninstall /quiet /norestart">
83+
<ExePackagePayload
84+
Name="VC_redist.x86.exe"
85+
ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
86+
Description="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
87+
Hash="91a6283f774f9e2338b65aa835156854e9e76aed32f821b13cfd070dd6c87e1542ce2d5845beb5e4af1ddb102314bb6e0ad6214d896bb3e387590a01eae0c182"
88+
Size="13867304"
89+
Version="14.40.33810.0"
90+
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/9c69db26-cda4-472d-bdae-f2b87f4a0177/A32DD41EAAB0C5E1EAA78BE3C0BB73B48593DE8D97A7510B97DE3FD993538600/VC_redist.x86.exe" />
91+
</ExePackage>
9292
<?endif?>
9393

9494
<!-- Visual C++ 2015-2022 Redistributable (x64) -->
9595
<?if $(sys.BUILDARCHSHORT) = "X64" ?>
96-
<ExePackage
97-
Id="VC_REDIST_X64"
98-
DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
99-
Cache="remove"
100-
PerMachine="yes"
101-
Permanent="yes"
102-
Protocol="burn"
103-
InstallCondition="VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
104-
DetectCondition="(VCRUNTIME_X64_VER &gt;= VCRUNTIME_VER) AND VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
105-
InstallArguments="/install /quiet /norestart"
106-
RepairArguments="/repair /quiet /norestart"
107-
UninstallArguments="/uninstall /quiet /norestart">
108-
<ExePackagePayload
109-
Name="VC_redist.x64.exe"
110-
ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
111-
Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
112-
Hash="5935b69f5138ac3fbc33813c74da853269ba079f910936aefa95e230c6092b92f6225bffb594e5dd35ff29bf260e4b35f91adede90fdf5f062030d8666fd0104"
113-
Size="25397512"
114-
Version="14.40.33810.0"
115-
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/3642E3F95D50CC193E4B5A0B0FFBF7FE2C08801517758B4C8AEB7105A091208A/VC_redist.x64.exe" />
116-
</ExePackage>
96+
<ExePackage
97+
Id="VC_REDIST_X64"
98+
DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
99+
Cache="remove"
100+
PerMachine="yes"
101+
Permanent="yes"
102+
Protocol="burn"
103+
InstallCondition="VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
104+
DetectCondition="(VCRUNTIME_X64_VER &gt;= VCRUNTIME_VER) AND VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
105+
InstallArguments="/install /quiet /norestart"
106+
RepairArguments="/repair /quiet /norestart"
107+
UninstallArguments="/uninstall /quiet /norestart">
108+
<ExePackagePayload
109+
Name="VC_redist.x64.exe"
110+
ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
111+
Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
112+
Hash="5935b69f5138ac3fbc33813c74da853269ba079f910936aefa95e230c6092b92f6225bffb594e5dd35ff29bf260e4b35f91adede90fdf5f062030d8666fd0104"
113+
Size="25397512"
114+
Version="14.40.33810.0"
115+
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/3642E3F95D50CC193E4B5A0B0FFBF7FE2C08801517758B4C8AEB7105A091208A/VC_redist.x64.exe" />
116+
</ExePackage>
117+
<?endif?>
118+
119+
<!-- Visual C++ 2015-2022 Redistributable (Arm64) -->
120+
<?if $(sys.BUILDARCHSHORT) = "A64" ?>
121+
<ExePackage
122+
Id="VC_REDIST_ARM64"
123+
DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (Arm64) - 14.40.33810"
124+
Cache="remove"
125+
PerMachine="yes"
126+
Permanent="yes"
127+
Protocol="burn"
128+
InstallCondition="(ARCH_NAME = &quot;ARM64&quot;)"
129+
DetectCondition="(VCRUNTIME_ARM64_VER &gt;= VCRUNTIME_VER) AND (ARCH_NAME = &quot;ARM64&quot;)"
130+
InstallArguments="/install /quiet /norestart"
131+
RepairArguments="/repair /quiet /norestart"
132+
UninstallArguments="/uninstall /quiet /norestart">
133+
<ExePackagePayload
134+
Name="VC_redist.arm64.exe"
135+
ProductName="Microsoft Visual C++ 2022 Redistributable (Arm64) - 14.40.33810"
136+
Description="Microsoft Visual C++ 2022 Redistributable (Arm64) - 14.40.33810"
137+
Hash="76A467E992E4F2CBAE261CFB8C64274782E3D420A61F52458662AA1C3A843ED8F4E340D4C237BB080BE1F2E86D7C4E5F4859FFDA8FDCA4E77375FD4D49663D14"
138+
Size="11531032"
139+
Version="14.40.33810.0"
140+
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/15B8F5B2106DC7A7BD83AB57B796770E0F4ECB891AD19BF655C9D6A9DA650AD2/VC_redist.arm64.exe" />
141+
</ExePackage>
117142
<?endif?>
118143

119144
<MsiPackage

0 commit comments

Comments
 (0)