Changeset 104453 in vbox for trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs

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/VBoxMergeNetAdp.wxs (modified) (4 diffs)

trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs

@@ -1 @@
-<?xml version="1.0"?>
-<!--
+<!--
     VirtualBox Windows Installation Script (WiX)
 -->
@@ -25 +24 @@
 -->
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
     <?include Defines.wxi ?>
 
-    <Module Id="msm_VBoxNetworkAdp"
-            Language="!(loc.LANG)"
-            Version="$(var.Property_Version)">
-
-        <Package Id="248b9371-ab62-48ee-8f23-270fb319bb46"
-                 Keywords="Installer, Setup"
-                 Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) NetAdp installation package"
-                 Comments="$(env.VBOX_PRODUCT) NetAdp installation package"
-                 Manufacturer="$(env.VBOX_VENDOR)"
-                 InstallerVersion="200"
-                 AdminImage="yes"
-                 InstallPrivileges="elevated"
-                 Platform="$(var.Property_Platform)"
-                 SummaryCodepage="1252"/>
+    <Module Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" Version="$(var.Property_Version)" Guid="248b9371-ab62-48ee-8f23-270fb319bb46" InstallerVersion="200">
+    
+        <SummaryInformation Keywords="Installer, Setup" 
+                            Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) NetAdp installation package" 
+                            Manufacturer="$(env.VBOX_VENDOR)" />
 
         <?include CommonProperties.wxi ?>
@@ -50 +39 @@
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
         <Property Id="localMSMNetworkType" Value="Empty" />
-        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
-        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]"/>
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed" />
+        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]" />
         <CustomAction Id="setNetworkTypeADP" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
         <CustomAction Id="correctNetworkTypeADP" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
-<?endif ?>
+<?endif?>
 
         <!-- Here comes the file/directory list -->
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
-
-                <?include VBoxMergeNetAdp.wxi ?>
-
-            </Directory> <!-- msm_VBoxNetworkAdpFolder -->
-        </Directory> <!-- TARGETDIR -->
+         <!-- TARGETDIR -->
 
         <!-- Custom actions -->
@@ -71 +54 @@
         <InstallExecuteSequence>
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-            <Custom Action="setNetworkTypeADP" After="CostInitialize"/>
-            <Custom Action="correctNetworkTypeADP" After="setNetworkTypeADP">
-                <![CDATA[(VersionNT < 600)]]>
-            </Custom>
-<?endif ?>
+            <Custom Action="setNetworkTypeADP" After="CostInitialize" />
+            <Custom Action="correctNetworkTypeADP" After="setNetworkTypeADP" Condition="(VersionNT &lt; 600)" />
+<?endif?>
             <?include VBoxMergeNetAdpSeq.wxi ?>
         </InstallExecuteSequence>
 
-    </Module>
+    
+            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
+
+                <?include VBoxMergeNetAdp.wxi ?>
+
+            </Directory> <!-- msm_VBoxNetworkAdpFolder -->
+        </Module>
 </Wix>