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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162962

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/VBoxMergeNetAdp6CA.wxi (modified) (2 diffs)

trunk/src/VBox/Installer/win/VBoxMergeNetAdp6CA.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">
 
-    <CustomAction Id="ca_CreateHostOnlyInterfaceNDIS6" BinaryKey="VBoxInstallHelper"  DllEntry="Ndis6CreateHostOnlyInterface" Execute="deferred" Return="check" Impersonate="no"/>
-    <CustomAction Id="ca_CreateHostOnlyInterfaceNDIS6Args" Property="ca_CreateHostOnlyInterfaceNDIS6" Value="[msm_VBoxNetworkAdp6Folder]" Execute="immediate"/>
+    <CustomAction Id="ca_CreateHostOnlyInterfaceNDIS6" DllEntry="Ndis6CreateHostOnlyInterface" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
+    <CustomAction Id="ca_CreateHostOnlyInterfaceNDIS6Args" Property="ca_CreateHostOnlyInterfaceNDIS6" Value="[msm_VBoxNetworkAdp6Folder]" Execute="immediate" />
 
-    <CustomAction Id="ca_RemoveHostOnlyInterfacesNDIS6" BinaryKey="VBoxInstallHelper"  DllEntry="RemoveHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
-    <CustomAction Id="ca_StopHostOnlyInterfacesNDIS6" BinaryKey="VBoxInstallHelper"  DllEntry="StopHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
+    <CustomAction Id="ca_RemoveHostOnlyInterfacesNDIS6" DllEntry="RemoveHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
+    <CustomAction Id="ca_StopHostOnlyInterfacesNDIS6" DllEntry="StopHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
 
-    <CustomAction Id="ca_UpdateHostOnlyInterfacesNDIS6" BinaryKey="VBoxInstallHelper"  DllEntry="Ndis6UpdateHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
-    <CustomAction Id="ca_UpdateHostOnlyInterfacesNDIS6Args" Property="ca_UpdateHostOnlyInterfacesNDIS6" Value="[msm_VBoxNetworkAdp6Folder]" Execute="immediate"/>
+    <CustomAction Id="ca_UpdateHostOnlyInterfacesNDIS6" DllEntry="Ndis6UpdateHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
+    <CustomAction Id="ca_UpdateHostOnlyInterfacesNDIS6Args" Property="ca_UpdateHostOnlyInterfacesNDIS6" Value="[msm_VBoxNetworkAdp6Folder]" Execute="immediate" />
 
-    <CustomAction Id="ca_UninstallNetAdp6" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetAdp" Execute="deferred" Return="check" Impersonate="no"/>
-    <CustomAction Id="ca_UninstallNetAdp6Args" Property="ca_UninstallNetAdp6" Value="[msm_VBoxNetworkAdp6Folder]" Execute="immediate"/>
+    <CustomAction Id="ca_UninstallNetAdp6" DllEntry="UninstallNetAdp" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
+    <CustomAction Id="ca_UninstallNetAdp6Args" Property="ca_UninstallNetAdp6" Value="[msm_VBoxNetworkAdp6Folder]" Execute="immediate" />
 
 </Include>