From c92f318a083c9bfa9cd9d7871e4ab1e030738856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20B=C3=BCchel?= <damian.buechel@let.ethz.ch>
Date: Mon, 16 Aug 2021 11:18:09 +0200
Subject: [PATCH] SEBWIN-506: Switched from remote payload to embedding the
 WebView2 bootstrapper.

---
 SetupBundle/WebView2Runtime.wxs | 8 ++------
 appveyor-release.yml            | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/SetupBundle/WebView2Runtime.wxs b/SetupBundle/WebView2Runtime.wxs
index 06bd51c2..039da361 100644
--- a/SetupBundle/WebView2Runtime.wxs
+++ b/SetupBundle/WebView2Runtime.wxs
@@ -4,13 +4,9 @@
         <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 Runtime" Cache="no" Compressed="no"
-                        PerMachine="yes" Permanent="yes" Vital="yes" DownloadUrl="https://go.microsoft.com/fwlink/p/?LinkId=2124703"
+            <ExePackage Name="WebView2 Bootstrapper" DisplayName="Microsoft Edge WebView2 Runtime" Cache="no" Compressed="yes"
+                        PerMachine="yes" Permanent="yes" Vital="yes" SourceFile="..\MicrosoftEdgeWebview2Setup.exe"
                         InstallCommand="/silent /install" InstallCondition="NOT (REMOVE OR RuntimeInstalled)">
-                <!-- Must be generated with the following command: "heat payload MicrosoftEdgeWebview2Setup.exe -out MicrosoftEdgeWebview2Setup.wxs" -->
-                <RemotePayload ProductName="MicrosoftEdgeWebview2Setup" Description="Microsoft Edge WebView2 Update Setup"
-                               CertificatePublicKey="358CD8B7FB6F985952B53A93374BBB6E1F3DEE08" Hash="1408B1EE098A8B5002AF3150456672AF5FEE1CD4"
-                               CertificateThumbprint="C774204049D25D30AF9AC2F116B3C1FB88EE00A4" Size="1776920" Version="1.3.147.37" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
diff --git a/appveyor-release.yml b/appveyor-release.yml
index a95d3487..7e7f4eda 100644
--- a/appveyor-release.yml
+++ b/appveyor-release.yml
@@ -38,6 +38,7 @@ for:
    - nuget restore
    - md "Setup\bin\x64\%CONFIGURATION%"
    - move "%TEMP%\SEB_Setup.msi" "Setup\bin\x64\%CONFIGURATION%\Setup.msi"
+   - appveyor DownloadFile https://go.microsoft.com/fwlink/p/?LinkId=2124703
   after_build:
    - appveyor PushArtifact "Setup\bin\%PLATFORM%\%CONFIGURATION%\Setup.msi" -FileName "SEB_%APPVEYOR_BUILD_VERSION%_%PLATFORM%_Setup.msi" -DeploymentName "%APPVEYOR_BUILD_VERSION% Setup (%PLATFORM%)"
    - appveyor PushArtifact "SetupBundle\bin\%PLATFORM%\%CONFIGURATION%\SetupBundle.exe" -FileName "SEB_%APPVEYOR_BUILD_VERSION%_SetupBundle.exe" -DeploymentName "%APPVEYOR_BUILD_VERSION% Setup Bundle"