Remove obsolete browser restart notification (#92)

IB-8097 Signed-off-by: Raul Metsma <[email protected]>
open-eid · Jul 14, 2024 · 9cba739 · 9cba739
1 parent 3a86a77
commit 9cba739
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 71 deletions.
diff --git 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
diff --git a/browserrestart.et-EE.wxl b/browserrestart.et-EE.wxl
diff --git a/browserrestart.wxs b/browserrestart.wxs
diff --git 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
@@ -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>