Changeset 108104 in vbox for trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi

Timestamp:

Feb 6, 2025 4:59:10 PM (2 weeks ago)

Author:

vboxsync

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

167402

Message:

Windows host drivers + installer: Removed _PreW10 support, as this is not supported anymore.

File:

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

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

@@ -28 +28 @@
     <Directory Id="dir_VBoxUSBFilter" Name="filter">
 <?if $(env.VBOX_SIGNING_MODE) != "none" ?>
-    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-        <Component Id="cp_USBFilterDriverCat_PreW10" Guid="ef18fb4d-4530-40db-2957-de2dc90243ab" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)">
-            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
-            <File Id="file_VBoxUSBMon_PreW10.cat" ShortName="UsbMon1.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon-PreW10.cat" />
-        </Component>
-    <?endif?>
-        <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)">
+        <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Bitness="$(var.Property_Bitness)">
             <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
             <File Id="file_VBoxUSBMon_W10.cat" ShortName="UsbMon2.cat" Name="VBoxUSBMon.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxUSBMon.cat" />
@@ -47 +41 @@
     <Directory Id="dir_VBoxUSBDevice" Name="device">
 <?if $(env.VBOX_SIGNING_MODE) != "none" ?>
-    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-        <Component Id="cp_USBDeviceDriverCat_PreW10" Guid="43cc14cb-06e9-46c2-d507-20423150ccbd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)">
-            <File Id="file_VBoxUSB_PreW10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB-PreW10.cat" />
-        </Component>
-    <?endif?>
-        <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)">
+        <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Bitness="$(var.Property_Bitness)">
             <File Id="file_VBoxUSB_W10.cat" Name="VBoxUSB.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxUSB.cat" />
         </Component>