updated installer to prevent install on wrong type of OS

Author: patriciy

CloudVeilInstaller/Bundle.wxs

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Bundle DisableRepair="yes" Name="CloudVeil for Windows" Version="2.4.3" Manufacturer="CloudVeil Technology, Inc." UpgradeCode="f034362e-0800-43d6-be30-721747f8a948" IconSourceFile="..\CloudVeilGUI\appicon.ico">
+  
+    <Variable Name="MsiPlatform" Type="string" Value="$(var.MsiPlatform)" Persisted="yes"/>
     <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
       <PayloadGroupRef Id="InstallerPayload" />
     </BootstrapperApplicationRef>
@@ -10,6 +12,7 @@
       <ExePackage Compressed="yes" PerMachine="yes" Cache="always" Id="InstallerCheckPackageCache_UnInstall" InstallCondition="0" DetectCondition="1" SourceFile="..\InstallerCheckPackageCache\bin\Release\InstallerCheckPackageCache.exe" />
       <MsiPackage DisplayInternalUI="no" ForcePerMachine="yes" Visible="no" Id="CloudVeilForWindows" Cache="yes" Compressed="yes" Vital="yes" Name="CloudVeil.msi" SourceFile="..\Installers\SetupProjects\Release\Setup $(var.MsiPlatform).msi" />
     </Chain>
+	
   </Bundle>
   <!-- The following snippet (and the rest of this file) are covered by the following licenses -->
   <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. -->
@@ -24,6 +27,7 @@
   <?define NetFx472WebLink = http://go.microsoft.com/fwlink/?LinkId=863262 ?>
   <?define NetFx472RedistLink = http://go.microsoft.com/fwlink/?LinkId=863265 ?>
   <?define NetFx472EulaLink = http://referencesource.microsoft.com/license.html ?>
+
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Secure="yes" />

CloudVeilInstallerUI/Bundle.wxs

@@ -174,7 +174,6 @@
     <None Include="BootstrapperCore.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Bundle.wxs" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

CloudVeilInstallerUI/CloudVeilInstallerUI.csproj

@@ -11,5 +11,6 @@ public class ApplyStatus
         public const int FAIL_NOACTION_REBOOT = -2147024546;
         public const int FAIL_PIPE_NO_DATA = -2147024664;
         public const int FAIL_GENERIC_ERROR = -2147023293;
+        public const uint FAIL_UNSUPPORTED_ARCH = 0x80070661;
     }
 }

CloudVeilInstallerUI/Models/ApplyStatus.cs

@@ -1,4 +1,5 @@
-using CloudVeilInstallerUI.Models;
+using CloudVeilInstallerUI.IPC;
+using CloudVeilInstallerUI.Models;
 using InstallerCheckPackageCache;
 using Microsoft.Deployment.WindowsInstaller;
 using Microsoft.Tools.WindowsInstallerXml.Bootstrapper;
@@ -10,6 +11,7 @@
 using System.IO;
 using System.Net;
 using System.Runtime.InteropServices;
+using System.Runtime.Remoting.Messaging;
 using System.Threading.Tasks;
 using System.Windows.Threading;
 using CVInstallType = CloudVeilInstallerUI.Models.InstallType;
@@ -478,6 +480,14 @@ private void DetectComplete(object sender, DetectCompleteEventArgs e)
                 return;
             }
 
+            var msiPlatform = ba.Engine.StringVariables["MsiPlatform"];
+
+            if (msiPlatform != null && msiPlatform.ToLower() != RuntimeInformation.OSArchitecture.ToString().ToLower())
+            {
+                TriggerFailed($"Failed to {installTypeVerb} CloudVeil for Windows because this type of Windows ({RuntimeInformation.OSArchitecture}) is not supported.");
+                return;
+            }
+            
             LaunchAction desiredPlan = ba.Command.Action;
 
             switch (ba.Command.Display)
@@ -727,7 +737,16 @@ private void ApplyComplete(object sender, ApplyCompleteEventArgs e)
                 string message = null;
                 bool needsRestart = false;
 
-                message = $"Failed to {installTypeVerb} CloudVeil for Windows with error code {(uint)e.Status:x}. Please restart your computer and try again. If the issue persists, please contact support.";
+                
+                uint ustatus = (uint)e.Status;
+                if (ustatus == ApplyStatus.FAIL_UNSUPPORTED_ARCH)
+                {
+                    message = $"Failed to {installTypeVerb} CloudVeil for Windows because this type of Windows ({RuntimeInformation.OSArchitecture}) is not supported.";                    
+                }
+                else 
+                {
+                    message = $"Failed to {installTypeVerb} CloudVeil for Windows with error code {(uint)e.Status:x}. Please restart your computer and try again. If the issue persists, please contact support.";
+                }
 
                 if ((installType == CVInstallType.Update || installType == CVInstallType.Uninstall) && failedPackageId == "CloudVeilForWindows")
                 {

CloudVeilInstallerUI/ViewModels/InstallerViewModel.cs

@@ -16,6 +16,7 @@
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" />
     <Launch Condition="Installed OR WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Message="This setup requires the .NET Framework version v4.6.1.  Please install the .NET Framework and run this setup again." />
     <Launch Condition="Installed OR (VersionNT &gt;= 603) OR (VersionNT64 &gt;= 603)" Message="Required OS is Win10 or higher" />
+    <Launch Condition="WIX_NATIVE_MACHINE=43690" Message="Required arm64 OS" />
     <Icon Id="_D1707FE3B808" SourceFile="..\..\CloudVeilGUI\appicon.ico" />
     <Binary Id="B.CustomInstallerActions" SourceFile="..\..\InstallerCustomActions\bin\$(var.Configuration)\InstallerCustomActions.CA.dll" />
     <!-- The directory tree of the installation package. -->

Installers/SetupProjects/Product-arm64.wxs

@@ -3,6 +3,7 @@
   <!-- ignore-file:..\..\CloudVeilGUI\bin\Release x64\Warden.exe -->
   <!-- ignore-file:..\..\CloudVeilGUI\bin\Release x64\Sentinel.exe -->
   <Package Name="CloudVeil For Windows" Language="1033" Version="2.4.3" Manufacturer="CloudVeil" UpgradeCode="{57058EEC-162C-4D48-993E-4AE6095F66CA}" Codepage="1252" InstallerVersion="405" ShortNames="no" ProductCode="*">
+     
     <SummaryInformation Description="CloudVeil For Windows Setup" Keywords="internet content filter" Manufacturer="CloudVeil" />
     <Media Id="1" Cabinet="product.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
     <Property Id="DiskPrompt" Value="CloudVeil For Windows Installation [1]" />
@@ -15,7 +16,8 @@
     <!-- The '.NET Framework' launch condition. -->
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" />
     <Launch Condition="Installed OR WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Message="This setup requires the .NET Framework version v4.6.1.  Please install the .NET Framework and run this setup again." />
-    <Launch Condition="Installed OR (VersionNT &gt;= 603) OR (VersionNT64 &gt;= 603)" Message="Required OS is Win10 or higher" />
+    <Launch Condition="Installed OR (VersionNT64 &gt;= 603)" Message="Required OS is Win10 or higher" />
+    <Launch Condition="VersionNT64" Message="Required x64 OS" />
     <Icon Id="_D1707FE3B808" SourceFile="..\..\CloudVeilGUI\appicon.ico" />
     <Binary Id="B.CustomInstallerActions" SourceFile="..\..\InstallerCustomActions\bin\x64\$(var.Configuration)\InstallerCustomActions.CA.dll" />
     <!-- The directory tree of the installation package. -->

Installers/SetupProjects/Product-x64.wxs

@@ -16,6 +16,7 @@
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" />
     <Launch Condition="Installed OR WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Message="This setup requires the .NET Framework version v4.6.1.  Please install the .NET Framework and run this setup again." />
     <Launch Condition="Installed OR (VersionNT &gt;= 603) OR (VersionNT64 &gt;= 603)" Message="Required OS is Win10 or higher" />
+    <Launch Condition="NOT VersionNT64" Message="Required x86 OS" />
     <Icon Id="_D1707FE3B808" SourceFile="..\..\CloudVeilGUI\appicon.ico" />
     <Binary Id="B.CustomInstallerActions" SourceFile="..\..\InstallerCustomActions\bin\x86\$(var.Configuration)\InstallerCustomActions.CA.dll" />
     <!-- The directory tree of the installation package. -->

Installers/SetupProjects/Product-x86.wxs

@@ -1,5 +1,8 @@
-Function Find-MsBuild([int] $MaxVersion = 2022)
-{
+Function Find-MsBuild([int] $MaxVersion = 2026)
+{   
+	$communityPath18 = "${Env:programfiles}\Microsoft Visual Studio\18\Community\Msbuild\Current\Bin\MSBuild.exe"
+    $devPath18 = "${Env:programfiles(x86)}\Microsoft Visual Studio\18\Enterprise\MSBuild\Current\Bin\MSBuild.exe"
+    $proPath18 = "${Env:programfiles(x86)}\Microsoft Visual Studio\18\Professional\MSBuild\Current\Bin\MSBuild.exe"
     $communityPath2022 = "${Env:programfiles}\Microsoft Visual Studio\2022\Community\Msbuild\Current\Bin\MSBuild.exe"
     $devPath2022 = "${Env:programfiles(x86)}\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe"
     $proPath2022 = "${Env:programfiles(x86)}\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe"
@@ -15,6 +18,10 @@ Function Find-MsBuild([int] $MaxVersion = 2022)
     $fallback2013Path = "${Env:ProgramFiles(x86)}\MSBuild\12.0\Bin\MSBuild.exe"
     $fallbackPath = "C:\Windows\Microsoft.NET\Framework\v4.0.30319"
 
+    If ((2026 -le $MaxVersion) -And (Test-Path $communityPath18)) { return $communityPath18 }
+    If ((2026 -le $MaxVersion) -And (Test-Path $devPath18)) { return $devPath18 }
+    If ((2026 -le $MaxVersion) -And (Test-Path $proPath18)) { return $proPath18 }
+	
     If ((2022 -le $MaxVersion) -And (Test-Path $communityPath2022)) { return $communityPath2022 }
     If ((2022 -le $MaxVersion) -And (Test-Path $devPath2022)) { return $devPath2022 }
     If ((2022 -le $MaxVersion) -And (Test-Path $proPath2022)) { return $proPath2022 }