maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add VC142 CRT MergeModules to installer (#2862)

Browse source
This commit is contained in:
Tomas Agustin Raies 2020-05-11 15:05:10 -07:00 committed by GitHub
parent 50d91670ec
commit 5f42866cea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -336,4 +336,8 @@ src/settings/settings-html/200.html
src/settings/settings-html/404.html
# Temp telemetry files.
src/common/Telemetry/*.etl
src/common/Telemetry/*.etl
# Don't ignore MergeModules
!**/MergeModules/Release/
!**/MergeModules/Debug/

BIN
installer/MergeModules/Debug/Microsoft_VC142_CRT_x64.msm Normal file
View file

Binary file not shown.

BIN
installer/MergeModules/Release/Microsoft_VC142_CRT_x64.msm Normal file
View file

Binary file not shown.

8
installer/PowerToysSetup/Product.wxs
View file

@ -185,6 +185,14 @@
BinaryKey="PTCustomActions"
DllEntry="DetectPrevInstallPathCA"
/>
<!-- Redist merge modules -->
<DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist" SourceFile="$(var.RepoDir)installer\MergeModules\$(var.Configuration)\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
</DirectoryRef>
<Feature Id="VCRedist" Title="Visual C++ 14.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist"/>
</Feature>
<!-- Close 'PowerToys.exe' before uninstall-->
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" />