From 1d2cd6662044a3a0ff88fe5f3b3b90aa105e3dd8 Mon Sep 17 00:00:00 2001
From: Sebastian Streich <strseb@users.noreply.github.com>
Date: Mon, 2 Sep 2024 13:55:30 +0200
Subject: [PATCH] VPN-6448 try to scheudle a reboot on w10 (2.24 only) (#9809)

* try to scheudle a reboot on w10

* DUH windows versions are not making sense anymore

* Add proper reboot checks
---
 windows/installer/MozillaVPN.wxs | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/windows/installer/MozillaVPN.wxs b/windows/installer/MozillaVPN.wxs
index f53e69a0f4..ffab89e199 100644
--- a/windows/installer/MozillaVPN.wxs
+++ b/windows/installer/MozillaVPN.wxs
@@ -47,6 +47,18 @@
     <Property Id="DISABLEROLLBACK" Value="yes" />
     <Property Id="MSIDISABLERMRESTART" Value="1" />
     <Property Id="MSIRMSHUTDOWN" Value="1" />
+    
+    <Property Id="WINDOWS_BUILD_NUMBER">
+      <!-- Search for the Windows build number in the registry, given wix NT_VERSION 
+           is unchanged between w10 and w11 ~_~
+       -->
+      <RegistrySearch Id="SearchWindowsBuildNumber"
+                      Root="HKLM"
+                      Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion"
+                      Name="CurrentBuild"
+                      Type="raw"
+                      />
+    </Property>
 
     <!--
       Upgrading
@@ -167,8 +179,17 @@
     <CustomAction Id="LaunchVPNFirstExecution" Impersonate="yes" FileKey="MozillaVPNExecutable" ExeCommand="" Return="asyncNoWait" />
     <CustomAction Id="LaunchVPNAfterUpdate" Impersonate="yes" FileKey="MozillaVPNExecutable" ExeCommand="ui --updated" Return="asyncNoWait" />
     <InstallExecuteSequence>
-       <Custom Action="LaunchVPNFirstExecution" After="InstallFinalize">NOT WIX_UPGRADE_DETECTED</Custom>
-       <Custom Action="LaunchVPNAfterUpdate" After="InstallFinalize">WIX_UPGRADE_DETECTED</Custom>
+      <!-- This will schedule a reboot only if the OS is Windows 10 -->
+      <ScheduleReboot After="InstallFinalize">
+        <![CDATA[WINDOWS_BUILD_NUMBER < 22000]]>
+      </ScheduleReboot>
+      <Custom Action="LaunchVPNFirstExecution" After="InstallFinalize">
+        <![CDATA[NOT WIX_UPGRADE_DETECTED AND (WINDOWS_BUILD_NUMBER >= 22000 )]]> 
+      </Custom>
+      <Custom Action="LaunchVPNAfterUpdate" After="InstallFinalize">
+        <![CDATA[WIX_UPGRADE_DETECTED AND (WINDOWS_BUILD_NUMBER >= 22000)]]> 
+        
+      </Custom>
     </InstallExecuteSequence>
 
     <!--