Installer/win: Finish Properties.wxi -> Defines.wxi renaming (for MSM case). bugref:8691

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@77329 cfe28804-0f27-0410-a406-dd0f0b0b656f

8 files changed, 9 insertions, 13 deletions

diff --git a/src/VBox/Installer/win/VBoxMergeApp.wxs b/src/VBox/Installer/win/VBoxMergeApp.wxs
index baa76fe3188..2880bb3d05a 100644
--- a/src/VBox/Installer/win/VBoxMergeApp.wxs
+++ b/src/VBox/Installer/win/VBoxMergeApp.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <!-- Note: GUIDs in WiX *must* be uppercase! -->
     <!-- Always include an upgrade ID or otherwise upgrade installation will not be possible. When doing
@@ -51,7 +51,6 @@
         <?include CommonProperties.wxi ?>
         <?include PublicProperties.wxi ?>
 
-
         <Property Id="local_VBOX_REGISTERFILEEXTENSIONS" Value="Empty" />
         <Configuration Name="argRegesterExtensions" Format="Text" DefaultValue="Not passed"/>
         <Substitution Table="CustomAction" Row="registerExtensions" Column="Target" Value="[=argRegesterExtensions]"/>
diff --git a/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs b/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
index 733a604b8c2..7e685b3ccfa 100644
--- a/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
+++ b/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <Module Id="msm_VBoxCOM32On64"
             Language="!(loc.LANG)"
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp.wxs b/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
index 3ee68b13d46..1220652cab3 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <Module Id="msm_VBoxNetworkAdp"
             Language="!(loc.LANG)"
@@ -33,7 +33,6 @@
                  Platform="$(var.Property_Platform)"
                  SummaryCodepage="1252"/>
 
-
         <?include CommonProperties.wxi ?>
         <?include PublicProperties.wxi ?>
 
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs b/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
index 1ef19ca019f..692f010e6ab 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <Module Id="msm_VBoxNetworkAdp6"
             Language="!(loc.LANG)"
@@ -33,7 +33,6 @@
                  Platform="$(var.Property_Platform)"
                  SummaryCodepage="1252"/>
 
-
         <?include CommonProperties.wxi ?>
         <?include PublicProperties.wxi ?>
 
diff --git a/src/VBox/Installer/win/VBoxMergeNetFlt.wxs b/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
index ae7f5d17f57..28dea79bca4 100644
--- a/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <Module Id="msm_VBoxNetworkFlt"
             Language="!(loc.LANG)"
@@ -33,7 +33,6 @@
                  Platform="$(var.Property_Platform)"
                  SummaryCodepage="1252"/>
 
-
         <?include CommonProperties.wxi ?>
         <?include PublicProperties.wxi ?>
 
diff --git a/src/VBox/Installer/win/VBoxMergeNetLwf.wxs b/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
index 335c0458983..f6cdc31bef3 100644
--- a/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <Module Id="msm_VBoxNetworkLwf"
             Language="!(loc.LANG)"
@@ -33,7 +33,6 @@
                  Platform="$(var.Property_Platform)"
                  SummaryCodepage="1252"/>
 
-
         <?include CommonProperties.wxi ?>
         <?include PublicProperties.wxi ?>
 
diff --git a/src/VBox/Installer/win/VBoxMergePython.wxs b/src/VBox/Installer/win/VBoxMergePython.wxs
index 2b02a654bb4..1a7531311a6 100644
--- a/src/VBox/Installer/win/VBoxMergePython.wxs
+++ b/src/VBox/Installer/win/VBoxMergePython.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <Module Id="msm_VBoxPython"
             Language="!(loc.LANG)"
diff --git a/src/VBox/Installer/win/VBoxMergeUSB.wxs b/src/VBox/Installer/win/VBoxMergeUSB.wxs
index df751662d93..16c6ba0020c 100644
--- a/src/VBox/Installer/win/VBoxMergeUSB.wxs
+++ b/src/VBox/Installer/win/VBoxMergeUSB.wxs
@@ -16,7 +16,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
-    <?include Properties.wxi ?>
+    <?include Defines.wxi ?>
 
     <Module Id="msm_VBoxUSB"
             Language="!(loc.LANG)"
@@ -33,6 +33,7 @@
                  Platform="$(var.Property_Platform)"
                  SummaryCodepage="1252"/>
 
+        <?include CommonProperties.wxi ?>
         <?include PublicProperties.wxi ?>
 
         <!-- Here comes the file/directory list -->