Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Installer]Update VCRedist version to latest (#19107)

Browse Source 
* Update VCRedist version to latest

* Silently continue when VCRedist hits 0x666 error
This commit is contained in:
Jeremy Sinclair
2022-06-29 11:30:40 -04:00
committed by GitHub
parent 28eb4c80f6
commit 81f99264b3
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
installer/PowerToysSetup/PowerToys.wxs
View File

@@ -10,9 +10,9 @@
<?define Dotnet6PayloadSize="57791288"?> <?define Dotnet6PayloadSize="57791288"?>
<?define Dotnet6PayloadHash="B5B1819CCA753B070181F50411375B80412860A3"?> <?define Dotnet6PayloadHash="B5B1819CCA753B070181F50411375B80412860A3"?>
<?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/426A34C6F10EA8F7DA58A8C976B586AD84DD4BAB42A0CFDBE941F1763B7755E5/VC_redist.x64.exe"?> <?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/ed95ef9e-da02-4735-9064-bd1f7f69b6ed/CE6593A1520591E7DEA2B93FD03116E3FC3B3821A0525322B0A430FAA6B3C0B4/VC_redist.x64.exe"?>
<?define VCRedistPayloadSize="25337776"?> <?define VCRedistPayloadSize="25234792"?>
<?define VCRedistPayloadHash="47996AAB6A20DBBA69969C4B36F8FC718877751F"?> <?define VCRedistPayloadHash="D4F9181E70E3F1AA6C8EDFFCC15B3C3D4BABE36B"?>
<?define PlatformProgramFiles="[ProgramFiles64Folder]"?> <?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
<?else?> <?else?>
@@ -24,9 +24,9 @@
<?define Dotnet6PayloadSize="51774400"?> <?define Dotnet6PayloadSize="51774400"?>
<?define Dotnet6PayloadHash="62C15858951B123AFD4D3E14F8BE4829A7CAFF18"?> <?define Dotnet6PayloadHash="62C15858951B123AFD4D3E14F8BE4829A7CAFF18"?>
<?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/6114C0A7A526EA47D9ADD78C718BEA0BA32EEF0826AA5610AF76877CC5FEB7F3/VC_redist.arm64.exe"?> <?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/ed95ef9e-da02-4735-9064-bd1f7f69b6ed/8E126191012691AE22A0D5A89FAC01B59BABC7B680E5D9B65828935FD366E375/VC_redist.arm64.exe"?>
<?define VCRedistPayloadSize="11596400"?> <?define VCRedistPayloadSize="11500416"?>
<?define VCRedistPayloadHash="DEF8E16367DE4BDDE0399614B7E358629A959942"?> <?define VCRedistPayloadHash="FEECAC80EF04125B058381487332872896F38477"?>
<!--TODO: define to ARM64 Program files once it's available--> <!--TODO: define to ARM64 Program files once it's available-->
<?define PlatformProgramFiles="[ProgramFiles6432Folder]"?> <?define PlatformProgramFiles="[ProgramFiles6432Folder]"?>
@@ -104,7 +104,7 @@
UninstallCommand="/silent /uninstall"> UninstallCommand="/silent /uninstall">
</ExePackage> </ExePackage>
<ExePackage <ExePackage
Name="VCRedist-14.32.31326.exe" Name="VCRedist-14.32.31332.exe"
DetectCondition="DetectedVCRedistVersion >= 32" DetectCondition="DetectedVCRedistVersion >= 32"
Compressed="no" Compressed="no"
Id="VCRedist" Id="VCRedist"
@@ -112,11 +112,12 @@
InstallCommand="/install /quiet /norestart" InstallCommand="/install /quiet /norestart"
RepairCommand="/repair /quiet /norestart" RepairCommand="/repair /quiet /norestart"
Permanent="yes"> Permanent="yes">
<ExitCode Value="1638" Behavior="success"/>
<RemotePayload <RemotePayload
Description="Microsoft Visual C++ 2015-2022 Redistributable ($(var.PowerToysPlatform)) - 14.32.31326" Description="Microsoft Visual C++ 2015-2022 Redistributable ($(var.PowerToysPlatform)) - 14.32.31332"
ProductName="Microsoft Visual C++ 2015-2022 Redistributable ($(var.PowerToysPlatform)) - 14.32.31326" ProductName="Microsoft Visual C++ 2015-2022 Redistributable ($(var.PowerToysPlatform)) - 14.32.31332"
Size="$(var.VCRedistPayloadSize)" Size="$(var.VCRedistPayloadSize)"
Version="14.32.31326.0" Version="14.32.31332.0"
Hash="$(var.VCRedistPayloadHash)" /> Hash="$(var.VCRedistPayloadHash)" />
</ExePackage> </ExePackage>
<MsiPackage <MsiPackage