Bundle WebView2 installer into PT installer (#15814)

microsoft · Jan 28, 2022 · d302c76 · d302c76
1 parent 814c8e3
commit d302c76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
@@ -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"

diff --git a/installer/PowerToysSetup/WebView2/MicrosoftEdgeWebview2Setup.exe b/installer/PowerToysSetup/WebView2/MicrosoftEdgeWebview2Setup.exe