From 8dd2ee866dee2b25c67175c2ea88fa34e4568c5e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 29 Dec 2024 18:01:20 -0800
Subject: Rename "bundle id" concept to "bundle code"

The "bundle id" always had more in common with the PackageCode from the Windows
Installer. With the introduction of an actual Id attribute on the Bundle
element, there is potential for confusion, so there is finally real motivation
to rename "bundle id" to "bundle code".
---
 .../TestData/DependencyTests/BundleF/BundleF.wxs   | 24 +++++++++++-----------
 .../BundleF_AddOnA/BundleF_AddOnA.wxs              |  2 +-
 .../BundleF_AddOnB/BundleF_AddOnB.wxs              |  2 +-
 .../BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs  |  2 +-
 .../BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs  |  2 +-
 .../DependencyTests/BundleFv2/BundleFv2.wxs        |  2 +-
 .../TestData/DependencyTests/BundleJ/BundleJ.wxs   |  2 +-
 .../BundleJ_Patch/BundleJ_Patch.wxs                |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/test/burn/TestData/DependencyTests')

diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
index cfeda6c4..51d6c508 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
@@ -3,18 +3,18 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" />
-    <RelatedBundle Id="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" />
-    <RelatedBundle Id="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" />
-    <RelatedBundle Id="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
index 78c5493d..a808b124 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
     <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
 
     <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
index 5da954ea..24379a56 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{B774BF3B-3E89-4D42-9D29-AFAB27C5772D}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
     <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
 
     <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
index e23c9f88..6458fc08 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
+    <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
 
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
index b1f60b31..495798b5 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
+    <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
 
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
index 509047d6..5dfff3e8 100644
--- a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
index 5207be28..febf46ea 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
+    <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
index 3af7bbf2..889fdfbc 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
@@ -4,7 +4,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
+    <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
 
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
-- 
cgit v1.2.3-55-g6feb