mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-27 14:59:16 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Bundle WebView2 installer into PT installer (#15814)

Browse Source
This commit is contained in:
Stefan Markovic 2022-01-28 18:22:12 +01:00 committed by GitHub
parent 814c8e382c
commit d302c761d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
installer/PowerToysSetup/PowerToys.wxs
View File

@ -22,7 +22,8 @@
<util:FileSearch Variable="HasDotnet3122" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.22\System.Xaml.dll" Result="exists" />
<util:FileSearch Variable="HasDotnet5013" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\5.0.13\System.Xaml.dll" Result="exists" />
<util:RegistrySearch Variable="HasWebView2" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
<util:RegistrySearch Variable="HasWebView2PerMachine" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
<util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]PowerToys" bal:Overridable="yes"/>
@ -77,21 +78,15 @@
</ExePackage>
<ExePackage
Name="MicrosoftEdgeWebview2Setup.exe"
Compressed="no"
Compressed="yes"
Id="WebView2"
DetectCondition="HasWebView2"
DownloadUrl="https://go.microsoft.com/fwlink/p/?LinkId=2124703"
DetectCondition="HasWebView2PerMachine OR HasWebView2PerUser"
SourceFile="WebView2\MicrosoftEdgeWebview2Setup.exe"
InstallCommand="/silent /install"
RepairCommand="/repair /passive"
Permanent="yes"
PerMachine="yes"
UninstallCommand="/silent /uninstall">
<RemotePayload
Description="Microsoft Edge WebView2"
ProductName="Microsoft Edge WebView2"
Size="1839936"
Version="1.3.153.57"
Hash="425CFFDAFADA1CCB9CE0825B43CD69C163C1400E" />
</ExePackage>
<MsiPackage
SourceFile="x64\Release\PowerToysSetup-$(var.Version)-x64.msi"

BIN
installer/PowerToysSetup/WebView2/MicrosoftEdgeWebview2Setup.exe Normal file
View File

Binary file not shown.