From c76fc619f4db214026df2f1bbd888d46c96f401c Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Thu, 30 May 2024 10:02:17 +0300
Subject: [PATCH] Remove obsolete browser restart notification

IB-8097

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 README.md                |  8 ++++++--
 bootstrapper.wxs         | 20 --------------------
 browserrestart.en-US.wxl |  5 -----
 browserrestart.et-EE.wxl |  5 -----
 browserrestart.wxs       | 25 -------------------------
 build.ps1                |  6 ------
 metainfo.wxs             | 10 ----------
 7 files changed, 6 insertions(+), 73 deletions(-)
 delete mode 100644 browserrestart.en-US.wxl
 delete mode 100644 browserrestart.et-EE.wxl
 delete mode 100644 browserrestart.wxs

diff --git a/README.md b/README.md
index 8effdc9..45c9340 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,15 @@ A WIX bootstrapper EXE with DigiDoc4 Client and package with various drivers and
    * web-eid*x64.msi
    * AWP*x64*.msi
 
-3. Run build.ps1 script, optional parameter -msiversion
+4. Install WIX toolset
+
+   https://wixtoolset.org/docs/intro/#nettool
+
+5. Run build.ps1 script, optional parameter -msiversion
 
         powershell -ExecutionPolicy ByPass -File build.ps1
 
-4. Execute
+6. Execute
 
         Open-EID.exe
 
diff --git a/bootstrapper.wxs b/bootstrapper.wxs
index 717671a..1f47d63 100644
--- a/bootstrapper.wxs
+++ b/bootstrapper.wxs
@@ -33,7 +33,6 @@
 
     <?define REGPath = "Software\[WixBundleManufacturer]\Open-EID"?>
     <util:ProductSearch Id="OpenEID_Installed" UpgradeCode="42137cbc-8356-4ac4-9295-735f258b5abb" Variable="Installed" /><!-- metainfo.msi -->
-    <util:ProductSearch Id="WebEID_Installed" UpgradeCode="4f0e0fef-0dbc-481b-9d81-08921740f781" Variable="WebEIDInstalled" />
     <util:RegistrySearch Variable="ChromeSupport" Condition="Installed &gt; v0.0.0.0" Result="exists" Root="HKLM"
       Key="SOFTWARE\Google\Chrome\Extensions\ncibgoaomkmdpilpocfeponihegamlic" Value="update_url" After="OpenEID_Installed" />
     <util:RegistrySearch Variable="EdgeSupport" Condition="Installed &gt; v0.0.0.0" Result="exists" Root="HKLM"
@@ -52,25 +51,8 @@
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="AutoUpdate" Variable="AutoUpdate" Condition="AutoUpdateExists" After="AutoUpdateExists" />
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IconsDesktop" Variable="IconsDesktopExists" Result="exists" Id="IconsDesktopExists" />
     <util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IconsDesktop" Variable="IconsDesktop" Condition="IconsDesktopExists" After="IconsDesktopExists" />
-    <util:RegistrySearch Root="HKLM" Key="SOFTWARE\Policies\Microsoft\Edge" Value="StartupBoostEnabled" Variable="StartupBoostEnabledSet" Result="exists" Id="StartupBoostEnabledSet" />
-    <util:RegistrySearch Root="HKLM" Key="SOFTWARE\Policies\Microsoft\Edge" Value="StartupBoostEnabled" Variable="StartupBoostEnabledValue" Condition="StartupBoostEnabledSet" After="StartupBoostEnabledSet" />
 
     <Chain>
-      <MsiPackage Id="BrowserRestart.EN" ForcePerMachine="yes" SourceFile="browserrestart.en-US.msi" Compressed="yes"
-          InstallCondition="NOT UserLanguageID = 1061 AND Installed &gt; v0.0.0.0 AND WebEIDInstalled = v0.0.0.0 AND NoBrowserRestart = 0 AND ((ChromeSupport AND ForceChromeExtensionActivation2) OR FirefoxSupport)">
-        <MsiProperty Name="TARGETDIR" Value="[InstallFolder]" />
-        <MsiProperty Name="RESTARTCHROME" Value="[ForceChromeExtensionActivation2]" />
-        <MsiProperty Name="RESTARTEDGE" Value="[ForceEdgeExtensionActivation2]" />
-        <MsiProperty Name="RESTARTFIREFOX" Value="[FirefoxSupport]" />
-      </MsiPackage>
-      <MsiPackage Id="BrowserRestart.ET" ForcePerMachine="yes" SourceFile="browserrestart.et-EE.msi" Compressed="yes"
-          InstallCondition="UserLanguageID = 1061 AND Installed &gt; v0.0.0.0 AND WebEIDInstalled = v0.0.0.0 AND NoBrowserRestart = 0 AND ((ChromeSupport AND ForceChromeExtensionActivation2) OR FirefoxSupport)">
-        <MsiProperty Name="TARGETDIR" Value="[InstallFolder]" />
-        <MsiProperty Name="RESTARTCHROME" Value="[ForceChromeExtensionActivation2]" />
-        <MsiProperty Name="RESTARTEDGE" Value="[ForceEdgeExtensionActivation2]" />
-        <MsiProperty Name="RESTARTFIREFOX" Value="[FirefoxSupport]" />
-      </MsiPackage>
-
       <MsiPackage Id="IDEMIA.en_US.X64" InstallCondition="NOT UserLanguageID = 1061 AND MinidriverInstall = 1" ForcePerMachine="yes"
           SourceFile="$(var.idemia).en-US.msi" Compressed="yes">
         <MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]" />
@@ -118,8 +100,6 @@
         <MsiProperty Name="Qdigidoc4Install" Value="[Qdigidoc4Install]" />
         <MsiProperty Name="AutoUpdate" Value="[AutoUpdate]" />
         <MsiProperty Name="IconsDesktop" Value="[IconsDesktop]" />
-        <MsiProperty Name="StartupBoostEnabledSet" Value="[StartupBoostEnabledSet]" />
-        <MsiProperty Name="StartupBoostEnabledValue" Value="[StartupBoostEnabledValue]" />
       </MsiPackage>
     </Chain>
   </Bundle>
diff --git a/browserrestart.en-US.wxl b/browserrestart.en-US.wxl
deleted file mode 100644
index d8c463c..0000000
--- a/browserrestart.en-US.wxl
+++ /dev/null
@@ -1,5 +0,0 @@
-<WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl">
-    <String Id="restartChrome" Overridable="yes" Value="Google Chrome browser must be closed before the installation can proceed. Press Ignore to close the browser or close the browser and press Retry. To cancel the installation press Abort." />
-    <String Id="restartEdge" Overridable="yes" Value="Microsoft Edge browser must be closed before the installation can proceed. Press Ignore to close the browser or close the browser and press Retry. To cancel the installation press Abort." />
-    <String Id="restartFirefox" Overridable="yes" Value="Firefox browser must be closed before the installation can proceed. Press Ignore to close the browser or close the browser and press Retry. To cancel the installation press Abort." />
-</WixLocalization>
diff --git a/browserrestart.et-EE.wxl b/browserrestart.et-EE.wxl
deleted file mode 100644
index fc3a584..0000000
--- a/browserrestart.et-EE.wxl
+++ /dev/null
@@ -1,5 +0,0 @@
-<WixLocalization Culture="et-EE" xmlns="http://wixtoolset.org/schemas/v4/wxl">
-    <String Id="restartChrome" Overridable="yes" Value="Paigaldamise jätkamiseks peab veebilehitseja Google Chrome olema suletud. Veebilehitseja sulgemiseks vajuta Ignoreeri (Ignore) või sulge brauser ja vajuta Proovi uuesti (Retry). Paigaldamise katkestamiseks vajuta Katkesta (Abort)." />
-    <String Id="restartEdge" Overridable="yes" Value="Paigaldamise jätkamiseks peab veebilehitseja Microsoft Edge olema suletud. Veebilehitseja sulgemiseks vajuta Ignoreeri (Ignore) või sulge brauser ja vajuta Proovi uuesti (Retry). Paigaldamise katkestamiseks vajuta Katkesta (Abort)." />
-    <String Id="restartFirefox" Overridable="yes" Value="Paigaldamise jätkamiseks peab veebilehitseja Firefox olema suletud. Veebilehitseja sulgemiseks vajuta Ignoreeri (Ignore) või sulge brauser ja vajuta Proovi uuesti (Retry). Paigaldamise katkestamiseks vajuta Katkesta (Abort)." />
-</WixLocalization>
diff --git a/browserrestart.wxs b/browserrestart.wxs
deleted file mode 100644
index 9fae70f..0000000
--- a/browserrestart.wxs
+++ /dev/null
@@ -1,25 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <Package Name="Open-EID Browser Restart" Language="1033" Version="$(var.MSI_VERSION)"
-        UpgradeCode="471cf7f5-b418-4463-9a55-e3895c8519e0" Manufacturer="RIA" InstallerVersion="500">
-    <MajorUpgrade AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" DowngradeErrorMessage=
-        "A newer version of [ProductName] is already installed. If you are trying to downgrade, please uninstall the newer version first." />
-    <Property Id="RESTARTCHROME" Value="0" />
-    <Property Id="RESTARTEDGE" Value="0" />
-    <Property Id="RESTARTFIREFOX" Value="0" />
-    
-    <util:CloseApplication Id="CloseBrowsersChrome" CloseMessage="yes" Target="chrome.exe"
-        Description="!(loc.restartChrome)" PromptToContinue="yes" RebootPrompt="no" ElevatedCloseMessage="yes" Condition="RESTARTCHROME = 1" />
-    <util:CloseApplication Id="CloseBrowsersEdge" CloseMessage="yes" Target="msedge.exe"
-        Description="!(loc.restartEdge)" PromptToContinue="yes" RebootPrompt="no" ElevatedCloseMessage="yes" Condition="RESTARTEDGE = 1" />
-    <util:CloseApplication Id="CloseBrowsersFirefox" CloseMessage="yes" Target="firefox.exe"
-        Description="!(loc.restartFirefox)" PromptToContinue="yes" RebootPrompt="no" ElevatedCloseMessage="yes" Condition="RESTARTFIREFOX = 1" />
-    <InstallExecuteSequence>
-      <Custom Action="override Wix4CloseApplications_X64" After="WriteRegistryValues" />
-    </InstallExecuteSequence>
-    <Component Id="Content" Directory="TARGETDIR" Transitive="yes">
-      <RegistryValue Root="HKLM" Type="integer" Name="StartupBoostEnabled" Value="0"
-          Key="SOFTWARE\Policies\Microsoft\Edge" />
-    </Component>
-  </Package>
-</Wix>
diff --git a/build.ps1 b/build.ps1
index 1065e8b..3a710c7 100644
--- a/build.ps1
+++ b/build.ps1
@@ -28,14 +28,8 @@ Function Sign($filename) {
     signtool.exe sign /a /v /s MY /n "$sign" /fd SHA256 /du http://installer.id.ee `
         /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 "$filename"
 }
-& wix build -nologo -ext WixToolset.Util.wixext "$path\browserrestart.wxs" -d "MSI_VERSION=$msiversion" `
-    -loc "$path\browserrestart.en-US.wxl" -culture en-US -out browserrestart.en-US.msi
-& wix build -nologo -ext WixToolset.Util.wixext "$path\browserrestart.wxs" -d "MSI_VERSION=$msiversion" `
-    -loc "$path\browserrestart.et-EE.wxl" -culture et-EE -out browserrestart.et-EE.msi
 & wix build -nologo "$path\metainfo.wxs" -d "MSI_VERSION=$msiversion" -out metainfo.msi
 if($sign) {
-    Sign("browserrestart.en-US.msi")
-    Sign("browserrestart.et-EE.msi")
     Sign("metainfo.msi")
 }
 & wix build -nologo -ext WixToolset.BootstrapperApplications.wixext -ext WixToolset.Util.wixext "$path\bootstrapper.wxs" `
diff --git a/metainfo.wxs b/metainfo.wxs
index fd1e384..7bc2a63 100644
--- a/metainfo.wxs
+++ b/metainfo.wxs
@@ -9,8 +9,6 @@
     <Property Id="QDIGIDOC4INSTALL" Value="0" />
     <Property Id="AUTOUPDATE" Value="0" />
     <Property Id="ICONSDESKTOP" Value="0" />
-    <Property Id="STARTUPBOOSTENABLEDSET" Value="0" />
-    <Property Id="STARTUPBOOSTENABLEDVALUE" Value="0" />
 
     <Component Id="Content" Directory="TARGETDIR" Transitive="yes">
       <RegistryValue Root="HKMU" Key="SOFTWARE\[Manufacturer]\Open-EID"
@@ -26,13 +24,5 @@
       <RegistryValue Root="HKMU" Key="SOFTWARE\[Manufacturer]\Open-EID"
                      Name="IconsDesktop" Value="[ICONSDESKTOP]" Type="integer" />
     </Component>
-    <Component Id="SetEdgeStartupBoost" Directory="TARGETDIR" Transitive="yes" Permanent="yes"
-        Condition="(STARTUPBOOSTENABLEDSET = 1)">
-      <RegistryValue Root="HKLM" Type="integer" Name="StartupBoostEnabled" Value="[STARTUPBOOSTENABLEDVALUE]" Key="SOFTWARE\Policies\Microsoft\Edge" />
-    </Component>
-    <Component Id="RemoveEdgeStartupBoost" Directory="TARGETDIR" Transitive="yes" Guid="1bd81ad3-772c-4935-bffe-50d6cbf8727b"
-        Condition="(STARTUPBOOSTENABLEDSET = 0)">
-      <RemoveRegistryValue Root="HKLM" Key="SOFTWARE\Policies\Microsoft\Edge" Name="StartupBoostEnabled" />
-    </Component>
   </Package>
 </Wix>