From 8cea72d18b374f3f00f4f0b69d6084205fa0d35c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20B=C3=BCchel?= <damian.buechel@let.ethz.ch>
Date: Thu, 25 Mar 2021 16:46:26 +0100
Subject: [PATCH] SEBWIN-470: Added WebView2 runtime bootstrapper to setup
 bundle.

---
 SetupBundle/Bundle.wxs          |  1 +
 SetupBundle/SetupBundle.wixproj |  1 +
 SetupBundle/WebView2Runtime.wxs | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 SetupBundle/WebView2Runtime.wxs

diff --git a/SetupBundle/Bundle.wxs b/SetupBundle/Bundle.wxs
index 38e877da..50c3bf39 100644
--- a/SetupBundle/Bundle.wxs
+++ b/SetupBundle/Bundle.wxs
@@ -10,6 +10,7 @@
         <Chain>
             <PackageGroupRef Id="DotNetFramework" />
             <PackageGroupRef Id="VisualCppRuntime" />
+            <PackageGroupRef Id="WebView2Runtime" />
             <MsiPackage Id="SetupX64" InstallCondition='VersionNT64' SourceFile="$(var.Setup.ProjectDir)bin\x64\Release\$(var.Setup.TargetFileName)"
                         Compressed="yes" DisplayInternalUI="no" Vital="yes" />
             <MsiPackage Id="SetupX86" InstallCondition='NOT VersionNT64' SourceFile="$(var.Setup.ProjectDir)bin\x86\Release\$(var.Setup.TargetFileName)"
diff --git a/SetupBundle/SetupBundle.wixproj b/SetupBundle/SetupBundle.wixproj
index 5a5a6e41..e5e46af2 100644
--- a/SetupBundle/SetupBundle.wixproj
+++ b/SetupBundle/SetupBundle.wixproj
@@ -31,6 +31,7 @@
     <Compile Include="Bundle.wxs" />
     <Compile Include="DotNetFramework.wxs" />
     <Compile Include="VisualCppRuntime.wxs" />
+    <Compile Include="WebView2Runtime.wxs" />
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixNetFxExtension">
diff --git a/SetupBundle/WebView2Runtime.wxs b/SetupBundle/WebView2Runtime.wxs
new file mode 100644
index 00000000..2279afc5
--- /dev/null
+++ b/SetupBundle/WebView2Runtime.wxs
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+    <Fragment>
+        <util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Value="EBWebView"
+                             Variable="RuntimeInstalled" Win64="no" />
+        <PackageGroup Id="WebView2Runtime">
+            <ExePackage Name="WebView2 Bootstrapper" DisplayName="Microsoft Edge WebView2 Evergreen Bootstrapper" Cache="no" Compressed="no"
+                        PerMachine="yes" Permanent="yes" Vital="yes" DownloadUrl="https://go.microsoft.com/fwlink/p/?LinkId=2124703"
+                        InstallCommand="/silent /install" InstallCondition="NOT (REMOVE OR RuntimeInstalled)">
+                <RemotePayload ProductName="MicrosoftEdgeWebview2Setup" Description="Microsoft Edge WebView2 Update Setup"
+                               CertificatePublicKey="1392A8505C3B192F62311EA9005E49C1B5358F6B" Hash="82B42348804E8D82C773DC3391B691712BB1B388"
+                               Size="1815832" Version="1.3.135.41" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>