Changeset 104453 in vbox for trunk/src/VBox/Installer/win/VBoxMergeAppSeq.wxi

Timestamp:

Apr 29, 2024 8:09:47 AM (9 months ago)

Author:

vboxsync

Message:

Windows host installer: Upgraded to WIX v4 (4.0.5). This is a massive change that accumulates the transition from WIX v3 -> v4 where the WIX XML scheme as well as the build system has changed. See comments for details. bugref:10644

File:

• trunk/src/VBox/Installer/win/VBoxMergeAppSeq.wxi (modified) (2 diffs)

trunk/src/VBox/Installer/win/VBoxMergeAppSeq.wxi

@@ -1 @@
-<?xml version="1.0"?>
-<!--
+<!--
     VirtualBox Windows Installation Script (WiX)
 -->
@@ -25 +24 @@
 -->
 
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
-         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
 <?if $(env.VBOX_WITH_CRT_PACKING) = "no" ?>
-    <Custom Action="ca_IsMSCRTInstalled" After="AppSearch">1</Custom>
+    <Custom Action="ca_IsMSCRTInstalled" After="AppSearch"/>
 <?endif?>
     <!-- Required for lauch conditions. See @bugref{10616} -->
-    <Custom Action="ca_CheckTargetDirPre" After="AppSearch"/>
+    <Custom Action="ca_CheckTargetDirPre" After="AppSearch" />
     <!-- Check if the installation directory still fits our security requirements after we finalized installation.
          See @bugref{10616} -->
-    <Custom Action="ca_CheckTargetDirPost" After="InstallFinalize"><![CDATA[NOT REMOVE]]></Custom>
+    <Custom Action="ca_CheckTargetDirPost" After="InstallFinalize" Condition="NOT REMOVE"/>
 
-    <Custom Action="ca_IsWindows10" After="FileCost">1</Custom>
+    <Custom Action="ca_IsWindows10" After="FileCost"/>
 
 </Include>