aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs2
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs20
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs4
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs50
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs14
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs2
-rw-r--r--src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs4
-rw-r--r--src/api/burn/balutil/BalBootstrapperEngine.cpp8
-rw-r--r--src/api/burn/balutil/balutil.cpp10
-rw-r--r--src/api/burn/balutil/inc/BootstrapperApplicationBase.h14
-rw-r--r--src/api/burn/balutil/inc/IBootstrapperApplication.h14
-rw-r--r--src/api/burn/balutil/inc/IBootstrapperEngine.h2
-rw-r--r--src/api/burn/balutil/inc/balutil.h4
-rw-r--r--src/api/burn/balutil/msg.cpp78
-rw-r--r--src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp4
-rw-r--r--src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h2
-rw-r--r--src/api/burn/inc/BootstrapperApplicationTypes.h14
-rw-r--r--src/api/burn/inc/BootstrapperEngineTypes.h2
-rw-r--r--src/api/burn/inc/BootstrapperExtensionEngineTypes.h2
-rw-r--r--src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs17
-rw-r--r--src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs17
-rw-r--r--src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs19
-rw-r--r--src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs17
-rw-r--r--src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs21
24 files changed, 205 insertions, 136 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
index 25257554..b4497d07 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
@@ -38,7 +38,7 @@ namespace WixToolset.BootstrapperApplicationApi
38 [DllImport("mbanative.dll", ExactSpelling = true)] 38 [DllImport("mbanative.dll", ExactSpelling = true)]
39 internal static extern int BalGetRelatedBundleVariableFromEngine( 39 internal static extern int BalGetRelatedBundleVariableFromEngine(
40 [MarshalAs(UnmanagedType.Interface)] IBootstrapperEngine pEngine, 40 [MarshalAs(UnmanagedType.Interface)] IBootstrapperEngine pEngine,
41 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 41 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
42 [MarshalAs(UnmanagedType.LPWStr)] string wzVariable, 42 [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
43 ref StrUtil.StrHandle psczOut 43 ref StrUtil.StrHandle psczOut
44 ); 44 );
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
index f9fca748..515a68b4 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
@@ -1449,9 +1449,9 @@ namespace WixToolset.BootstrapperApplicationApi
1449 return args.HResult; 1449 return args.HResult;
1450 } 1450 }
1451 1451
1452 int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel) 1452 int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
1453 { 1453 {
1454 DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel); 1454 DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
1455 this.OnDetectForwardCompatibleBundle(args); 1455 this.OnDetectForwardCompatibleBundle(args);
1456 1456
1457 fCancel = args.Cancel; 1457 fCancel = args.Cancel;
@@ -1566,9 +1566,9 @@ namespace WixToolset.BootstrapperApplicationApi
1566 return args.HResult; 1566 return args.HResult;
1567 } 1567 }
1568 1568
1569 int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel) 1569 int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
1570 { 1570 {
1571 PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel); 1571 PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
1572 this.OnPlanRelatedBundle(args); 1572 this.OnPlanRelatedBundle(args);
1573 1573
1574 pRequestedState = args.State; 1574 pRequestedState = args.State;
@@ -1576,9 +1576,9 @@ namespace WixToolset.BootstrapperApplicationApi
1576 return args.HResult; 1576 return args.HResult;
1577 } 1577 }
1578 1578
1579 int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleId, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel) 1579 int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleCode, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
1580 { 1580 {
1581 PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleId, recommendedType, pRequestedType, fCancel); 1581 PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleCode, recommendedType, pRequestedType, fCancel);
1582 this.OnPlanRelatedBundleType(args); 1582 this.OnPlanRelatedBundleType(args);
1583 1583
1584 pRequestedType = args.Type; 1584 pRequestedType = args.Type;
@@ -2060,9 +2060,9 @@ namespace WixToolset.BootstrapperApplicationApi
2060 return args.HResult; 2060 return args.HResult;
2061 } 2061 }
2062 2062
2063 int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle) 2063 int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle)
2064 { 2064 {
2065 PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle); 2065 PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle);
2066 this.OnPlanForwardCompatibleBundle(args); 2066 this.OnPlanForwardCompatibleBundle(args);
2067 2067
2068 fCancel = args.Cancel; 2068 fCancel = args.Cancel;
@@ -2122,9 +2122,9 @@ namespace WixToolset.BootstrapperApplicationApi
2122 return args.HResult; 2122 return args.HResult;
2123 } 2123 }
2124 2124
2125 int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel) 2125 int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
2126 { 2126 {
2127 PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel); 2127 PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
2128 this.OnPlanRestoreRelatedBundle(args); 2128 this.OnPlanRestoreRelatedBundle(args);
2129 2129
2130 pRequestedState = args.State; 2130 pRequestedState = args.State;
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
index 487858e0..44d77359 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
@@ -209,12 +209,12 @@ namespace WixToolset.BootstrapperApplicationApi
209 } 209 }
210 210
211 /// <inheritdoc/> 211 /// <inheritdoc/>
212 public string GetRelatedBundleVariable(string bundleId, string name) 212 public string GetRelatedBundleVariable(string bundleCode, string name)
213 { 213 {
214 StrUtil.StrHandle handle = new StrUtil.StrHandle(); 214 StrUtil.StrHandle handle = new StrUtil.StrHandle();
215 try 215 try
216 { 216 {
217 int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleId, name, ref handle); 217 int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleCode, name, ref handle);
218 if (ret != NativeMethods.S_OK) 218 if (ret != NativeMethods.S_OK)
219 { 219 {
220 throw new Win32Exception(ret); 220 throw new Win32Exception(ret);
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
index e1649d43..4df07e57 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
@@ -325,10 +325,10 @@ namespace WixToolset.BootstrapperApplicationApi
325 /// This class is for events raised by the engine. 325 /// This class is for events raised by the engine.
326 /// It is not intended to be instantiated by user code. 326 /// It is not intended to be instantiated by user code.
327 /// </summary> 327 /// </summary>
328 public DetectForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation) 328 public DetectForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
329 : base(cancelRecommendation) 329 : base(cancelRecommendation)
330 { 330 {
331 this.BundleId = bundleId; 331 this.BundleCode = bundleCode;
332 this.RelationType = relationType; 332 this.RelationType = relationType;
333 this.BundleTag = bundleTag; 333 this.BundleTag = bundleTag;
334 this.PerMachine = perMachine; 334 this.PerMachine = perMachine;
@@ -339,7 +339,11 @@ namespace WixToolset.BootstrapperApplicationApi
339 /// <summary> 339 /// <summary>
340 /// Gets the identity of the forward compatible bundle detected. 340 /// Gets the identity of the forward compatible bundle detected.
341 /// </summary> 341 /// </summary>
342 public string BundleId { get; private set; } 342 public string BundleCode { get; private set; }
343
344 /// <inheritdoc cref="BundleCode" />
345 [Obsolete("Use BundleCode instead.")]
346 public string BundleId => this.BundleCode;
343 347
344 /// <summary> 348 /// <summary>
345 /// Gets the relationship type of the forward compatible bundle. 349 /// Gets the relationship type of the forward compatible bundle.
@@ -807,10 +811,10 @@ namespace WixToolset.BootstrapperApplicationApi
807 /// This class is for events raised by the engine. 811 /// This class is for events raised by the engine.
808 /// It is not intended to be instantiated by user code. 812 /// It is not intended to be instantiated by user code.
809 /// </summary> 813 /// </summary>
810 public PlanRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation) 814 public PlanRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
811 : base(cancelRecommendation) 815 : base(cancelRecommendation)
812 { 816 {
813 this.BundleId = bundleId; 817 this.BundleCode = bundleCode;
814 this.RecommendedState = recommendedState; 818 this.RecommendedState = recommendedState;
815 this.State = state; 819 this.State = state;
816 } 820 }
@@ -818,7 +822,11 @@ namespace WixToolset.BootstrapperApplicationApi
818 /// <summary> 822 /// <summary>
819 /// Gets the identity of the bundle to plan for. 823 /// Gets the identity of the bundle to plan for.
820 /// </summary> 824 /// </summary>
821 public string BundleId { get; private set; } 825 public string BundleCode { get; private set; }
826
827 /// <inheritdoc cref="BundleCode" />
828 [Obsolete("Use BundleCode instead.")]
829 public string BundleId => this.BundleCode;
822 830
823 /// <summary> 831 /// <summary>
824 /// Gets the recommended requested state for the bundle. 832 /// Gets the recommended requested state for the bundle.
@@ -841,10 +849,10 @@ namespace WixToolset.BootstrapperApplicationApi
841 /// This class is for events raised by the engine. 849 /// This class is for events raised by the engine.
842 /// It is not intended to be instantiated by user code. 850 /// It is not intended to be instantiated by user code.
843 /// </summary> 851 /// </summary>
844 public PlanRelatedBundleTypeEventArgs(string bundleId, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation) 852 public PlanRelatedBundleTypeEventArgs(string bundleCode, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
845 : base(cancelRecommendation) 853 : base(cancelRecommendation)
846 { 854 {
847 this.BundleId = bundleId; 855 this.BundleCode = bundleCode;
848 this.RecommendedType = recommendedType; 856 this.RecommendedType = recommendedType;
849 this.Type = type; 857 this.Type = type;
850 } 858 }
@@ -852,7 +860,11 @@ namespace WixToolset.BootstrapperApplicationApi
852 /// <summary> 860 /// <summary>
853 /// Gets the identity of the bundle to plan for. 861 /// Gets the identity of the bundle to plan for.
854 /// </summary> 862 /// </summary>
855 public string BundleId { get; private set; } 863 public string BundleCode { get; private set; }
864
865 /// <inheritdoc cref="BundleCode" />
866 [Obsolete("Use BundleCode instead.")]
867 public string BundleId => this.BundleCode;
856 868
857 /// <summary> 869 /// <summary>
858 /// Gets the recommended plan type for the bundle. 870 /// Gets the recommended plan type for the bundle.
@@ -1327,10 +1339,10 @@ namespace WixToolset.BootstrapperApplicationApi
1327 /// This class is for events raised by the engine. 1339 /// This class is for events raised by the engine.
1328 /// It is not intended to be instantiated by user code. 1340 /// It is not intended to be instantiated by user code.
1329 /// </summary> 1341 /// </summary>
1330 public PlanForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle) 1342 public PlanForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle)
1331 : base(cancelRecommendation) 1343 : base(cancelRecommendation)
1332 { 1344 {
1333 this.BundleId = bundleId; 1345 this.BundleCode = bundleCode;
1334 this.RelationType = relationType; 1346 this.RelationType = relationType;
1335 this.BundleTag = bundleTag; 1347 this.BundleTag = bundleTag;
1336 this.PerMachine = perMachine; 1348 this.PerMachine = perMachine;
@@ -1342,7 +1354,11 @@ namespace WixToolset.BootstrapperApplicationApi
1342 /// <summary> 1354 /// <summary>
1343 /// Gets the identity of the forward compatible bundle detected. 1355 /// Gets the identity of the forward compatible bundle detected.
1344 /// </summary> 1356 /// </summary>
1345 public string BundleId { get; private set; } 1357 public string BundleCode { get; private set; }
1358
1359 /// <inheritdoc cref="BundleCode" />
1360 [Obsolete("Use BundleCode instead.")]
1361 public string BundleId => this.BundleCode;
1346 1362
1347 /// <summary> 1363 /// <summary>
1348 /// Gets the relationship type of the forward compatible bundle. 1364 /// Gets the relationship type of the forward compatible bundle.
@@ -2624,10 +2640,10 @@ namespace WixToolset.BootstrapperApplicationApi
2624 /// This class is for events raised by the engine. 2640 /// This class is for events raised by the engine.
2625 /// It is not intended to be instantiated by user code. 2641 /// It is not intended to be instantiated by user code.
2626 /// </summary> 2642 /// </summary>
2627 public PlanRestoreRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation) 2643 public PlanRestoreRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
2628 : base(cancelRecommendation) 2644 : base(cancelRecommendation)
2629 { 2645 {
2630 this.BundleId = bundleId; 2646 this.BundleCode = bundleCode;
2631 this.RecommendedState = recommendedState; 2647 this.RecommendedState = recommendedState;
2632 this.State = state; 2648 this.State = state;
2633 } 2649 }
@@ -2635,7 +2651,11 @@ namespace WixToolset.BootstrapperApplicationApi
2635 /// <summary> 2651 /// <summary>
2636 /// Gets the identity of the bundle to plan for. 2652 /// Gets the identity of the bundle to plan for.
2637 /// </summary> 2653 /// </summary>
2638 public string BundleId { get; private set; } 2654 public string BundleCode { get; private set; }
2655
2656 /// <inheritdoc cref="BundleCode" />
2657 [Obsolete("Use BundleCode instead.")]
2658 public string BundleId => this.BundleCode;
2639 2659
2640 /// <summary> 2660 /// <summary>
2641 /// Gets the recommended requested state for the bundle. 2661 /// Gets the recommended requested state for the bundle.
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
index ad7f8dd7..c2b43c15 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
@@ -80,7 +80,7 @@ namespace WixToolset.BootstrapperApplicationApi
80 [PreserveSig] 80 [PreserveSig]
81 [return: MarshalAs(UnmanagedType.I4)] 81 [return: MarshalAs(UnmanagedType.I4)]
82 int OnDetectForwardCompatibleBundle( 82 int OnDetectForwardCompatibleBundle(
83 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 83 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
84 [MarshalAs(UnmanagedType.U4)] RelationType relationType, 84 [MarshalAs(UnmanagedType.U4)] RelationType relationType,
85 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag, 85 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
86 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine, 86 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -135,7 +135,7 @@ namespace WixToolset.BootstrapperApplicationApi
135 [PreserveSig] 135 [PreserveSig]
136 [return: MarshalAs(UnmanagedType.I4)] 136 [return: MarshalAs(UnmanagedType.I4)]
137 int OnDetectRelatedBundle( 137 int OnDetectRelatedBundle(
138 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 138 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
139 [MarshalAs(UnmanagedType.U4)] RelationType relationType, 139 [MarshalAs(UnmanagedType.U4)] RelationType relationType,
140 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag, 140 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
141 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine, 141 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -243,7 +243,7 @@ namespace WixToolset.BootstrapperApplicationApi
243 [PreserveSig] 243 [PreserveSig]
244 [return: MarshalAs(UnmanagedType.I4)] 244 [return: MarshalAs(UnmanagedType.I4)]
245 int OnPlanRelatedBundle( 245 int OnPlanRelatedBundle(
246 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 246 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
247 [MarshalAs(UnmanagedType.U4)] RequestState recommendedState, 247 [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
248 [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState, 248 [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
249 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel 249 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -869,7 +869,7 @@ namespace WixToolset.BootstrapperApplicationApi
869 [PreserveSig] 869 [PreserveSig]
870 [return: MarshalAs(UnmanagedType.I4)] 870 [return: MarshalAs(UnmanagedType.I4)]
871 int OnPlanForwardCompatibleBundle( 871 int OnPlanForwardCompatibleBundle(
872 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 872 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
873 [MarshalAs(UnmanagedType.U4)] RelationType relationType, 873 [MarshalAs(UnmanagedType.U4)] RelationType relationType,
874 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag, 874 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
875 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine, 875 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -957,7 +957,7 @@ namespace WixToolset.BootstrapperApplicationApi
957 [PreserveSig] 957 [PreserveSig]
958 [return: MarshalAs(UnmanagedType.I4)] 958 [return: MarshalAs(UnmanagedType.I4)]
959 int OnPlanRestoreRelatedBundle( 959 int OnPlanRestoreRelatedBundle(
960 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 960 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
961 [MarshalAs(UnmanagedType.U4)] RequestState recommendedState, 961 [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
962 [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState, 962 [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
963 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel 963 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -969,7 +969,7 @@ namespace WixToolset.BootstrapperApplicationApi
969 [PreserveSig] 969 [PreserveSig]
970 [return: MarshalAs(UnmanagedType.I4)] 970 [return: MarshalAs(UnmanagedType.I4)]
971 int OnPlanRelatedBundleType( 971 int OnPlanRelatedBundleType(
972 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 972 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
973 [MarshalAs(UnmanagedType.U4)] RelatedBundlePlanType recommendedType, 973 [MarshalAs(UnmanagedType.U4)] RelatedBundlePlanType recommendedType,
974 [MarshalAs(UnmanagedType.U4)] ref RelatedBundlePlanType pRequestedType, 974 [MarshalAs(UnmanagedType.U4)] ref RelatedBundlePlanType pRequestedType,
975 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel 975 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -1004,7 +1004,7 @@ namespace WixToolset.BootstrapperApplicationApi
1004 [return: MarshalAs(UnmanagedType.I4)] 1004 [return: MarshalAs(UnmanagedType.I4)]
1005 int OnDetectRelatedBundlePackage( 1005 int OnDetectRelatedBundlePackage(
1006 [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, 1006 [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
1007 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 1007 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
1008 [MarshalAs(UnmanagedType.U4)] RelationType relationType, 1008 [MarshalAs(UnmanagedType.U4)] RelationType relationType,
1009 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine, 1009 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
1010 [MarshalAs(UnmanagedType.LPWStr)] string wzVersion, 1010 [MarshalAs(UnmanagedType.LPWStr)] string wzVersion,
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
index 1e91cd31..c7b0c003 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
@@ -236,7 +236,7 @@ namespace WixToolset.BootstrapperApplicationApi
236 /// </summary> 236 /// </summary>
237 [PreserveSig] 237 [PreserveSig]
238 int GetRelatedBundleVariable( 238 int GetRelatedBundleVariable(
239 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId, 239 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
240 [MarshalAs(UnmanagedType.LPWStr)] string wzVariable, 240 [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
241 IntPtr wzValue, 241 IntPtr wzValue,
242 ref IntPtr pcchValue 242 ref IntPtr pcchValue
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
index 8e6a293b..bd78409b 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
@@ -107,9 +107,9 @@ namespace WixToolset.BootstrapperApplicationApi
107 /// <summary> 107 /// <summary>
108 /// Gets persisted variables from a related bundle. 108 /// Gets persisted variables from a related bundle.
109 /// </summary> 109 /// </summary>
110 /// <param name="bundleId">The BundleId of the related bundle.</param> 110 /// <param name="bundleCode">The bundle code of the related bundle.</param>
111 /// <param name="name">The name of the variable.</param> 111 /// <param name="name">The name of the variable.</param>
112 string GetRelatedBundleVariable(string bundleId, string name); 112 string GetRelatedBundleVariable(string bundleCode, string name);
113 113
114 /// <summary> 114 /// <summary>
115 /// Launches a preapproved executable elevated. As long as the engine already elevated, there will be no UAC prompt. 115 /// Launches a preapproved executable elevated. As long as the engine already elevated, there will be no UAC prompt.
diff --git a/src/api/burn/balutil/BalBootstrapperEngine.cpp b/src/api/burn/balutil/BalBootstrapperEngine.cpp
index 28608cb9..61e7e31b 100644
--- a/src/api/burn/balutil/BalBootstrapperEngine.cpp
+++ b/src/api/burn/balutil/BalBootstrapperEngine.cpp
@@ -319,7 +319,7 @@ public: // IBootstrapperEngine
319 } 319 }
320 320
321 virtual STDMETHODIMP GetRelatedBundleVariable( 321 virtual STDMETHODIMP GetRelatedBundleVariable(
322 __in_z LPCWSTR wzBundleId, 322 __in_z LPCWSTR wzBundleCode,
323 __in_z LPCWSTR wzVariable, 323 __in_z LPCWSTR wzVariable,
324 __out_ecount_opt(*pcchValue) LPWSTR wzValue, 324 __out_ecount_opt(*pcchValue) LPWSTR wzValue,
325 __inout SIZE_T* pcchValue 325 __inout SIZE_T* pcchValue
@@ -338,7 +338,7 @@ public: // IBootstrapperEngine
338 338
339 // Init send structs. 339 // Init send structs.
340 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 340 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
341 args.wzBundleId = wzBundleId; 341 args.wzBundleCode = wzBundleCode;
342 args.wzVariable = wzVariable; 342 args.wzVariable = wzVariable;
343 343
344 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 344 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -349,8 +349,8 @@ public: // IBootstrapperEngine
349 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); 349 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
350 ExitOnFailure(hr, "Failed to write API version of GetRelatedBundleVariable args."); 350 ExitOnFailure(hr, "Failed to write API version of GetRelatedBundleVariable args.");
351 351
352 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 352 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
353 ExitOnFailure(hr, "Failed to write bundle id of GetRelatedBundleVariable args."); 353 ExitOnFailure(hr, "Failed to write bundle code of GetRelatedBundleVariable args.");
354 354
355 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzVariable); 355 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzVariable);
356 ExitOnFailure(hr, "Failed to write variable name of GetRelatedBundleVariable args."); 356 ExitOnFailure(hr, "Failed to write variable name of GetRelatedBundleVariable args.");
diff --git a/src/api/burn/balutil/balutil.cpp b/src/api/burn/balutil/balutil.cpp
index 716f82d3..3cca38a4 100644
--- a/src/api/burn/balutil/balutil.cpp
+++ b/src/api/burn/balutil/balutil.cpp
@@ -551,7 +551,7 @@ LExit:
551} 551}
552 552
553DAPI_(HRESULT) BalGetRelatedBundleVariable( 553DAPI_(HRESULT) BalGetRelatedBundleVariable(
554 __in_z LPCWSTR wzBundleId, 554 __in_z LPCWSTR wzBundleCode,
555 __in_z LPCWSTR wzVariable, 555 __in_z LPCWSTR wzVariable,
556 __inout LPWSTR* psczValue 556 __inout LPWSTR* psczValue
557) 557)
@@ -564,7 +564,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariable(
564 ExitOnRootFailure(hr, "BalInitialize() must be called first."); 564 ExitOnRootFailure(hr, "BalInitialize() must be called first.");
565 } 565 }
566 566
567 hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleId, wzVariable, psczValue); 567 hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleCode, wzVariable, psczValue);
568 568
569LExit: 569LExit:
570 return hr; 570 return hr;
@@ -572,7 +572,7 @@ LExit:
572 572
573DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine( 573DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
574 __in IBootstrapperEngine* pEngine, 574 __in IBootstrapperEngine* pEngine,
575 __in_z LPCWSTR wzBundleId, 575 __in_z LPCWSTR wzBundleCode,
576 __in_z LPCWSTR wzVariable, 576 __in_z LPCWSTR wzVariable,
577 __inout LPWSTR* psczValue 577 __inout LPWSTR* psczValue
578) 578)
@@ -586,7 +586,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
586 ExitOnFailure(hr, "Failed to determine length of value."); 586 ExitOnFailure(hr, "Failed to determine length of value.");
587 } 587 }
588 588
589 hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch); 589 hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch);
590 if (E_MOREDATA == hr) 590 if (E_MOREDATA == hr)
591 { 591 {
592 ++cch; 592 ++cch;
@@ -594,7 +594,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
594 hr = StrAllocSecure(psczValue, cch); 594 hr = StrAllocSecure(psczValue, cch);
595 ExitOnFailure(hr, "Failed to allocate value."); 595 ExitOnFailure(hr, "Failed to allocate value.");
596 596
597 hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch); 597 hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch);
598 } 598 }
599 599
600LExit: 600LExit:
diff --git a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
index a3a3643f..80bfd361 100644
--- a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
+++ b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
@@ -129,7 +129,7 @@ public: // IBootstrapperApplication
129 } 129 }
130 130
131 virtual STDMETHODIMP OnDetectForwardCompatibleBundle( 131 virtual STDMETHODIMP OnDetectForwardCompatibleBundle(
132 __in_z LPCWSTR /*wzBundleId*/, 132 __in_z LPCWSTR /*wzBundleCode*/,
133 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/, 133 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
134 __in_z LPCWSTR /*wzBundleTag*/, 134 __in_z LPCWSTR /*wzBundleTag*/,
135 __in BOOL /*fPerMachine*/, 135 __in BOOL /*fPerMachine*/,
@@ -179,7 +179,7 @@ public: // IBootstrapperApplication
179 } 179 }
180 180
181 virtual STDMETHODIMP OnDetectRelatedBundle( 181 virtual STDMETHODIMP OnDetectRelatedBundle(
182 __in_z LPCWSTR /*wzBundleId*/, 182 __in_z LPCWSTR /*wzBundleCode*/,
183 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/, 183 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
184 __in_z LPCWSTR /*wzBundleTag*/, 184 __in_z LPCWSTR /*wzBundleTag*/,
185 __in BOOL /*fPerMachine*/, 185 __in BOOL /*fPerMachine*/,
@@ -276,7 +276,7 @@ public: // IBootstrapperApplication
276 } 276 }
277 277
278 virtual STDMETHODIMP OnPlanRelatedBundle( 278 virtual STDMETHODIMP OnPlanRelatedBundle(
279 __in_z LPCWSTR /*wzBundleId*/, 279 __in_z LPCWSTR /*wzBundleCode*/,
280 __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/, 280 __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
281 __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/, 281 __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
282 __inout BOOL* pfCancel 282 __inout BOOL* pfCancel
@@ -995,7 +995,7 @@ public: // IBootstrapperApplication
995 } 995 }
996 996
997 virtual STDMETHODIMP OnPlanForwardCompatibleBundle( 997 virtual STDMETHODIMP OnPlanForwardCompatibleBundle(
998 __in_z LPCWSTR /*wzBundleId*/, 998 __in_z LPCWSTR /*wzBundleCode*/,
999 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/, 999 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
1000 __in_z LPCWSTR /*wzBundleTag*/, 1000 __in_z LPCWSTR /*wzBundleTag*/,
1001 __in BOOL /*fPerMachine*/, 1001 __in BOOL /*fPerMachine*/,
@@ -1074,7 +1074,7 @@ public: // IBootstrapperApplication
1074 } 1074 }
1075 1075
1076 virtual STDMETHODIMP OnPlanRestoreRelatedBundle( 1076 virtual STDMETHODIMP OnPlanRestoreRelatedBundle(
1077 __in_z LPCWSTR /*wzBundleId*/, 1077 __in_z LPCWSTR /*wzBundleCode*/,
1078 __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/, 1078 __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
1079 __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/, 1079 __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
1080 __inout BOOL* pfCancel 1080 __inout BOOL* pfCancel
@@ -1085,7 +1085,7 @@ public: // IBootstrapperApplication
1085 } 1085 }
1086 1086
1087 virtual STDMETHODIMP OnPlanRelatedBundleType( 1087 virtual STDMETHODIMP OnPlanRelatedBundleType(
1088 __in_z LPCWSTR /*wzBundleId*/, 1088 __in_z LPCWSTR /*wzBundleCode*/,
1089 __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE /*recommendedType*/, 1089 __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE /*recommendedType*/,
1090 __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* /*pRequestedType*/, 1090 __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* /*pRequestedType*/,
1091 __inout BOOL* pfCancel 1091 __inout BOOL* pfCancel
@@ -1115,7 +1115,7 @@ public: // IBootstrapperApplication
1115 1115
1116 virtual STDMETHODIMP OnDetectRelatedBundlePackage( 1116 virtual STDMETHODIMP OnDetectRelatedBundlePackage(
1117 __in_z LPCWSTR /*wzPackageId*/, 1117 __in_z LPCWSTR /*wzPackageId*/,
1118 __in_z LPCWSTR /*wzBundleId*/, 1118 __in_z LPCWSTR /*wzBundleCode*/,
1119 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/, 1119 __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
1120 __in BOOL /*fPerMachine*/, 1120 __in BOOL /*fPerMachine*/,
1121 __in_z LPCWSTR /*wzVersion*/, 1121 __in_z LPCWSTR /*wzVersion*/,
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index a08f6863..a3b24bc3 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -56,7 +56,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
56 56
57 // OnDetectForwardCompatibleBundle - called when the engine detects a forward compatible bundle. 57 // OnDetectForwardCompatibleBundle - called when the engine detects a forward compatible bundle.
58 STDMETHOD(OnDetectForwardCompatibleBundle)( 58 STDMETHOD(OnDetectForwardCompatibleBundle)(
59 __in_z LPCWSTR wzBundleId, 59 __in_z LPCWSTR wzBundleCode,
60 __in BOOTSTRAPPER_RELATION_TYPE relationType, 60 __in BOOTSTRAPPER_RELATION_TYPE relationType,
61 __in_z LPCWSTR wzBundleTag, 61 __in_z LPCWSTR wzBundleTag,
62 __in BOOL fPerMachine, 62 __in BOOL fPerMachine,
@@ -95,7 +95,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
95 95
96 // OnDetectRelatedBundle - called when the engine detects a related bundle. 96 // OnDetectRelatedBundle - called when the engine detects a related bundle.
97 STDMETHOD(OnDetectRelatedBundle)( 97 STDMETHOD(OnDetectRelatedBundle)(
98 __in_z LPCWSTR wzBundleId, 98 __in_z LPCWSTR wzBundleCode,
99 __in BOOTSTRAPPER_RELATION_TYPE relationType, 99 __in BOOTSTRAPPER_RELATION_TYPE relationType,
100 __in_z LPCWSTR wzBundleTag, 100 __in_z LPCWSTR wzBundleTag,
101 __in BOOL fPerMachine, 101 __in BOOL fPerMachine,
@@ -170,7 +170,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
170 170
171 // OnPlanRelatedBundle - called when the engine begins planning a related bundle. 171 // OnPlanRelatedBundle - called when the engine begins planning a related bundle.
172 STDMETHOD(OnPlanRelatedBundle)( 172 STDMETHOD(OnPlanRelatedBundle)(
173 __in_z LPCWSTR wzBundleId, 173 __in_z LPCWSTR wzBundleCode,
174 __in BOOTSTRAPPER_REQUEST_STATE recommendedState, 174 __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
175 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState, 175 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
176 __inout BOOL* pfCancel 176 __inout BOOL* pfCancel
@@ -649,7 +649,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
649 ) = 0; 649 ) = 0;
650 650
651 STDMETHOD(OnPlanForwardCompatibleBundle)( 651 STDMETHOD(OnPlanForwardCompatibleBundle)(
652 __in_z LPCWSTR wzBundleId, 652 __in_z LPCWSTR wzBundleCode,
653 __in BOOTSTRAPPER_RELATION_TYPE relationType, 653 __in BOOTSTRAPPER_RELATION_TYPE relationType,
654 __in_z LPCWSTR wzBundleTag, 654 __in_z LPCWSTR wzBundleTag,
655 __in BOOL fPerMachine, 655 __in BOOL fPerMachine,
@@ -703,7 +703,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
703 703
704 // OnPlanRestoreRelatedBundle - called when the engine begins planning an upgrade related bundle for restoring in case of failure. 704 // OnPlanRestoreRelatedBundle - called when the engine begins planning an upgrade related bundle for restoring in case of failure.
705 STDMETHOD(OnPlanRestoreRelatedBundle)( 705 STDMETHOD(OnPlanRestoreRelatedBundle)(
706 __in_z LPCWSTR wzBundleId, 706 __in_z LPCWSTR wzBundleCode,
707 __in BOOTSTRAPPER_REQUEST_STATE recommendedState, 707 __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
708 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState, 708 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
709 __inout BOOL* pfCancel 709 __inout BOOL* pfCancel
@@ -711,7 +711,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
711 711
712 // OnPlanRelatedBundleType - called when the engine begins planning the related bundle relation type. 712 // OnPlanRelatedBundleType - called when the engine begins planning the related bundle relation type.
713 STDMETHOD(OnPlanRelatedBundleType)( 713 STDMETHOD(OnPlanRelatedBundleType)(
714 __in_z LPCWSTR wzBundleId, 714 __in_z LPCWSTR wzBundleCode,
715 __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType, 715 __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType,
716 __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType, 716 __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType,
717 __inout BOOL* pfCancel 717 __inout BOOL* pfCancel
@@ -736,7 +736,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
736 // OnDetectRelatedBundlePackage - called when the engine detects a related bundle for a BundlePackage. 736 // OnDetectRelatedBundlePackage - called when the engine detects a related bundle for a BundlePackage.
737 STDMETHOD(OnDetectRelatedBundlePackage)( 737 STDMETHOD(OnDetectRelatedBundlePackage)(
738 __in_z LPCWSTR wzPackageId, 738 __in_z LPCWSTR wzPackageId,
739 __in_z LPCWSTR wzBundleId, 739 __in_z LPCWSTR wzBundleCode,
740 __in BOOTSTRAPPER_RELATION_TYPE relationType, 740 __in BOOTSTRAPPER_RELATION_TYPE relationType,
741 __in BOOL fPerMachine, 741 __in BOOL fPerMachine,
742 __in_z LPCWSTR wzVersion, 742 __in_z LPCWSTR wzVersion,
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h
index 02094aa5..57fc9be9 100644
--- a/src/api/burn/balutil/inc/IBootstrapperEngine.h
+++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h
@@ -142,7 +142,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
142 ) = 0; 142 ) = 0;
143 143
144 STDMETHOD(GetRelatedBundleVariable)( 144 STDMETHOD(GetRelatedBundleVariable)(
145 __in_z LPCWSTR wzBundleId, 145 __in_z LPCWSTR wzBundleCode,
146 __in_z LPCWSTR wzVariable, 146 __in_z LPCWSTR wzVariable,
147 __out_ecount_opt(*pcchValue) LPWSTR wzValue, 147 __out_ecount_opt(*pcchValue) LPWSTR wzValue,
148 __inout SIZE_T* pcchValue 148 __inout SIZE_T* pcchValue
diff --git a/src/api/burn/balutil/inc/balutil.h b/src/api/burn/balutil/inc/balutil.h
index 03575883..4c8550ee 100644
--- a/src/api/burn/balutil/inc/balutil.h
+++ b/src/api/burn/balutil/inc/balutil.h
@@ -141,7 +141,7 @@ BalGetRelatedBundleVariable - gets a string from a shared variable in the engine
141Note: Use StrFree() to release psczValue. 141Note: Use StrFree() to release psczValue.
142********************************************************************/ 142********************************************************************/
143DAPI_(HRESULT) BalGetRelatedBundleVariable( 143DAPI_(HRESULT) BalGetRelatedBundleVariable(
144 __in_z LPCWSTR wzBundleId, 144 __in_z LPCWSTR wzBundleCode,
145 __in_z LPCWSTR wzVariable, 145 __in_z LPCWSTR wzVariable,
146 __inout LPWSTR* psczValue 146 __inout LPWSTR* psczValue
147); 147);
@@ -153,7 +153,7 @@ BalGetRelatedBundleVariableFromEngine - gets a string from a shared variable in
153********************************************************************/ 153********************************************************************/
154DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine( 154DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
155 __in IBootstrapperEngine* pEngine, 155 __in IBootstrapperEngine* pEngine,
156 __in_z LPCWSTR wzBundleId, 156 __in_z LPCWSTR wzBundleCode,
157 __in_z LPCWSTR wzVariable, 157 __in_z LPCWSTR wzVariable,
158 __inout LPWSTR* psczValue 158 __inout LPWSTR* psczValue
159); 159);
diff --git a/src/api/burn/balutil/msg.cpp b/src/api/burn/balutil/msg.cpp
index 690108a5..b728cc83 100644
--- a/src/api/burn/balutil/msg.cpp
+++ b/src/api/burn/balutil/msg.cpp
@@ -1768,7 +1768,7 @@ static HRESULT OnDetectForwardCompatibleBundle(
1768 HRESULT hr = S_OK; 1768 HRESULT hr = S_OK;
1769 BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS args = { }; 1769 BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS args = { };
1770 BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS results = { }; 1770 BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS results = { };
1771 LPWSTR sczBundleId = NULL; 1771 LPWSTR sczBundleCode = NULL;
1772 LPWSTR sczBundleTag = NULL; 1772 LPWSTR sczBundleTag = NULL;
1773 LPWSTR sczVersion = NULL; 1773 LPWSTR sczVersion = NULL;
1774 1774
@@ -1776,10 +1776,10 @@ static HRESULT OnDetectForwardCompatibleBundle(
1776 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion); 1776 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
1777 ExitOnFailure(hr, "Failed to read API version of OnDetectForwardCompatibleBundle args."); 1777 ExitOnFailure(hr, "Failed to read API version of OnDetectForwardCompatibleBundle args.");
1778 1778
1779 hr = BuffReaderReadString(pReaderArgs, &sczBundleId); 1779 hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
1780 ExitOnFailure(hr, "Failed to read bundle id of OnDetectForwardCompatibleBundle args."); 1780 ExitOnFailure(hr, "Failed to read bundle code of OnDetectForwardCompatibleBundle args.");
1781 1781
1782 args.wzBundleId = sczBundleId; 1782 args.wzBundleCode = sczBundleCode;
1783 1783
1784 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType)); 1784 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
1785 ExitOnFailure(hr, "Failed to read relation type of OnDetectForwardCompatibleBundle args."); 1785 ExitOnFailure(hr, "Failed to read relation type of OnDetectForwardCompatibleBundle args.");
@@ -1809,7 +1809,7 @@ static HRESULT OnDetectForwardCompatibleBundle(
1809 1809
1810 if (E_NOTIMPL == hr) 1810 if (E_NOTIMPL == hr)
1811 { 1811 {
1812 hr = pApplication->OnDetectForwardCompatibleBundle(args.wzBundleId, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel); 1812 hr = pApplication->OnDetectForwardCompatibleBundle(args.wzBundleCode, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel);
1813 } 1813 }
1814 1814
1815 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE, &args, &results, &hr); 1815 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE, &args, &results, &hr);
@@ -1825,7 +1825,7 @@ static HRESULT OnDetectForwardCompatibleBundle(
1825LExit: 1825LExit:
1826 ReleaseStr(sczVersion); 1826 ReleaseStr(sczVersion);
1827 ReleaseStr(sczBundleTag); 1827 ReleaseStr(sczBundleTag);
1828 ReleaseStr(sczBundleId); 1828 ReleaseStr(sczBundleCode);
1829 return hr; 1829 return hr;
1830} 1830}
1831 1831
@@ -1999,7 +1999,7 @@ static HRESULT OnDetectRelatedBundle(
1999 HRESULT hr = S_OK; 1999 HRESULT hr = S_OK;
2000 BA_ONDETECTRELATEDBUNDLE_ARGS args = { }; 2000 BA_ONDETECTRELATEDBUNDLE_ARGS args = { };
2001 BA_ONDETECTRELATEDBUNDLE_RESULTS results = { }; 2001 BA_ONDETECTRELATEDBUNDLE_RESULTS results = { };
2002 LPWSTR sczBundleId = NULL; 2002 LPWSTR sczBundleCode = NULL;
2003 LPWSTR sczBundleTag = NULL; 2003 LPWSTR sczBundleTag = NULL;
2004 LPWSTR sczVersion = NULL; 2004 LPWSTR sczVersion = NULL;
2005 2005
@@ -2007,10 +2007,10 @@ static HRESULT OnDetectRelatedBundle(
2007 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion); 2007 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
2008 ExitOnFailure(hr, "Failed to read API version of OnDetectRelatedBundle args."); 2008 ExitOnFailure(hr, "Failed to read API version of OnDetectRelatedBundle args.");
2009 2009
2010 hr = BuffReaderReadString(pReaderArgs, &sczBundleId); 2010 hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
2011 ExitOnFailure(hr, "Failed to read bundle id of OnDetectRelatedBundle args."); 2011 ExitOnFailure(hr, "Failed to read bundle code of OnDetectRelatedBundle args.");
2012 2012
2013 args.wzBundleId = sczBundleId; 2013 args.wzBundleCode = sczBundleCode;
2014 2014
2015 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType)); 2015 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
2016 ExitOnFailure(hr, "Failed to read relation type of OnDetectRelatedBundle args."); 2016 ExitOnFailure(hr, "Failed to read relation type of OnDetectRelatedBundle args.");
@@ -2040,7 +2040,7 @@ static HRESULT OnDetectRelatedBundle(
2040 2040
2041 if (E_NOTIMPL == hr) 2041 if (E_NOTIMPL == hr)
2042 { 2042 {
2043 hr = pApplication->OnDetectRelatedBundle(args.wzBundleId, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel); 2043 hr = pApplication->OnDetectRelatedBundle(args.wzBundleCode, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel);
2044 } 2044 }
2045 2045
2046 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE, &args, &results, &hr); 2046 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE, &args, &results, &hr);
@@ -2056,7 +2056,7 @@ static HRESULT OnDetectRelatedBundle(
2056LExit: 2056LExit:
2057 ReleaseStr(sczVersion); 2057 ReleaseStr(sczVersion);
2058 ReleaseStr(sczBundleTag); 2058 ReleaseStr(sczBundleTag);
2059 ReleaseStr(sczBundleId); 2059 ReleaseStr(sczBundleCode);
2060 return hr; 2060 return hr;
2061} 2061}
2062 2062
@@ -2071,7 +2071,7 @@ static HRESULT OnDetectRelatedBundlePackage(
2071 BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS args = { }; 2071 BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS args = { };
2072 BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS results = { }; 2072 BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS results = { };
2073 LPWSTR sczPackageId = NULL; 2073 LPWSTR sczPackageId = NULL;
2074 LPWSTR sczBundleId = NULL; 2074 LPWSTR sczBundleCode = NULL;
2075 LPWSTR sczVersion = NULL; 2075 LPWSTR sczVersion = NULL;
2076 2076
2077 // Read args. 2077 // Read args.
@@ -2083,10 +2083,10 @@ static HRESULT OnDetectRelatedBundlePackage(
2083 2083
2084 args.wzPackageId = sczPackageId; 2084 args.wzPackageId = sczPackageId;
2085 2085
2086 hr = BuffReaderReadString(pReaderArgs, &sczBundleId); 2086 hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
2087 ExitOnFailure(hr, "Failed to read bundle id of OnDetectRelatedBundlePackage args."); 2087 ExitOnFailure(hr, "Failed to read bundle code of OnDetectRelatedBundlePackage args.");
2088 2088
2089 args.wzBundleId = sczBundleId; 2089 args.wzBundleCode = sczBundleCode;
2090 2090
2091 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType)); 2091 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
2092 ExitOnFailure(hr, "Failed to read relation type of OnDetectRelatedBundlePackage args."); 2092 ExitOnFailure(hr, "Failed to read relation type of OnDetectRelatedBundlePackage args.");
@@ -2108,7 +2108,7 @@ static HRESULT OnDetectRelatedBundlePackage(
2108 2108
2109 if (E_NOTIMPL == hr) 2109 if (E_NOTIMPL == hr)
2110 { 2110 {
2111 hr = pApplication->OnDetectRelatedBundlePackage(args.wzPackageId, args.wzBundleId, args.relationType, args.fPerMachine, args.wzVersion, &results.fCancel); 2111 hr = pApplication->OnDetectRelatedBundlePackage(args.wzPackageId, args.wzBundleCode, args.relationType, args.fPerMachine, args.wzVersion, &results.fCancel);
2112 } 2112 }
2113 2113
2114 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, &args, &results, &hr); 2114 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, &args, &results, &hr);
@@ -2123,7 +2123,7 @@ static HRESULT OnDetectRelatedBundlePackage(
2123 2123
2124LExit: 2124LExit:
2125 ReleaseStr(sczVersion); 2125 ReleaseStr(sczVersion);
2126 ReleaseStr(sczBundleId); 2126 ReleaseStr(sczBundleCode);
2127 ReleaseStr(sczPackageId); 2127 ReleaseStr(sczPackageId);
2128 return hr; 2128 return hr;
2129} 2129}
@@ -3650,7 +3650,7 @@ static HRESULT OnPlanForwardCompatibleBundle(
3650 HRESULT hr = S_OK; 3650 HRESULT hr = S_OK;
3651 BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS args = { }; 3651 BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS args = { };
3652 BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS results = { }; 3652 BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS results = { };
3653 LPWSTR sczBundleId = NULL; 3653 LPWSTR sczBundleCode = NULL;
3654 LPWSTR sczBundleTag = NULL; 3654 LPWSTR sczBundleTag = NULL;
3655 LPWSTR sczVersion = NULL; 3655 LPWSTR sczVersion = NULL;
3656 3656
@@ -3658,10 +3658,10 @@ static HRESULT OnPlanForwardCompatibleBundle(
3658 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion); 3658 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
3659 ExitOnFailure(hr, "Failed to read API version of OnPlanForwardCompatibleBundle args."); 3659 ExitOnFailure(hr, "Failed to read API version of OnPlanForwardCompatibleBundle args.");
3660 3660
3661 hr = BuffReaderReadString(pReaderArgs, &sczBundleId); 3661 hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
3662 ExitOnFailure(hr, "Failed to read bundle id of OnPlanForwardCompatibleBundle args."); 3662 ExitOnFailure(hr, "Failed to read bundle code of OnPlanForwardCompatibleBundle args.");
3663 3663
3664 args.wzBundleId = sczBundleId; 3664 args.wzBundleCode = sczBundleCode;
3665 3665
3666 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType)); 3666 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
3667 ExitOnFailure(hr, "Failed to read relation type of OnPlanForwardCompatibleBundle args."); 3667 ExitOnFailure(hr, "Failed to read relation type of OnPlanForwardCompatibleBundle args.");
@@ -3694,7 +3694,7 @@ static HRESULT OnPlanForwardCompatibleBundle(
3694 3694
3695 if (E_NOTIMPL == hr) 3695 if (E_NOTIMPL == hr)
3696 { 3696 {
3697 hr = pApplication->OnPlanForwardCompatibleBundle(args.wzBundleId, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fRecommendedIgnoreBundle, &results.fCancel, &results.fIgnoreBundle); 3697 hr = pApplication->OnPlanForwardCompatibleBundle(args.wzBundleCode, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fRecommendedIgnoreBundle, &results.fCancel, &results.fIgnoreBundle);
3698 } 3698 }
3699 3699
3700 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, &args, &results, &hr); 3700 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, &args, &results, &hr);
@@ -3713,7 +3713,7 @@ static HRESULT OnPlanForwardCompatibleBundle(
3713LExit: 3713LExit:
3714 ReleaseStr(sczVersion); 3714 ReleaseStr(sczVersion);
3715 ReleaseStr(sczBundleTag); 3715 ReleaseStr(sczBundleTag);
3716 ReleaseStr(sczBundleId); 3716 ReleaseStr(sczBundleCode);
3717 return hr; 3717 return hr;
3718} 3718}
3719 3719
@@ -4049,16 +4049,16 @@ static HRESULT OnPlanRelatedBundle(
4049 HRESULT hr = S_OK; 4049 HRESULT hr = S_OK;
4050 BA_ONPLANRELATEDBUNDLE_ARGS args = { }; 4050 BA_ONPLANRELATEDBUNDLE_ARGS args = { };
4051 BA_ONPLANRELATEDBUNDLE_RESULTS results = { }; 4051 BA_ONPLANRELATEDBUNDLE_RESULTS results = { };
4052 LPWSTR sczBundleId = NULL; 4052 LPWSTR sczBundleCode = NULL;
4053 4053
4054 // Read args. 4054 // Read args.
4055 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion); 4055 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
4056 ExitOnFailure(hr, "Failed to read API version of OnPlanRelatedBundle args."); 4056 ExitOnFailure(hr, "Failed to read API version of OnPlanRelatedBundle args.");
4057 4057
4058 hr = BuffReaderReadString(pReaderArgs, &sczBundleId); 4058 hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
4059 ExitOnFailure(hr, "Failed to read package id of OnPlanRelatedBundle args."); 4059 ExitOnFailure(hr, "Failed to read package id of OnPlanRelatedBundle args.");
4060 4060
4061 args.wzBundleId = sczBundleId; 4061 args.wzBundleCode = sczBundleCode;
4062 4062
4063 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedState)); 4063 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedState));
4064 ExitOnFailure(hr, "Failed to read recommended state of OnPlanRelatedBundle args."); 4064 ExitOnFailure(hr, "Failed to read recommended state of OnPlanRelatedBundle args.");
@@ -4075,7 +4075,7 @@ static HRESULT OnPlanRelatedBundle(
4075 4075
4076 if (E_NOTIMPL == hr) 4076 if (E_NOTIMPL == hr)
4077 { 4077 {
4078 hr = pApplication->OnPlanRelatedBundle(args.wzBundleId, args.recommendedState, &results.requestedState, &results.fCancel); 4078 hr = pApplication->OnPlanRelatedBundle(args.wzBundleCode, args.recommendedState, &results.requestedState, &results.fCancel);
4079 } 4079 }
4080 4080
4081 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE, &args, &results, &hr); 4081 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE, &args, &results, &hr);
@@ -4092,7 +4092,7 @@ static HRESULT OnPlanRelatedBundle(
4092 ExitOnFailure(hr, "Failed to write requested state of OnPlanRelatedBundle struct."); 4092 ExitOnFailure(hr, "Failed to write requested state of OnPlanRelatedBundle struct.");
4093 4093
4094LExit: 4094LExit:
4095 ReleaseStr(sczBundleId); 4095 ReleaseStr(sczBundleCode);
4096 return hr; 4096 return hr;
4097} 4097}
4098 4098
@@ -4106,16 +4106,16 @@ static HRESULT OnPlanRelatedBundleType(
4106 HRESULT hr = S_OK; 4106 HRESULT hr = S_OK;
4107 BA_ONPLANRELATEDBUNDLETYPE_ARGS args = { }; 4107 BA_ONPLANRELATEDBUNDLETYPE_ARGS args = { };
4108 BA_ONPLANRELATEDBUNDLETYPE_RESULTS results = { }; 4108 BA_ONPLANRELATEDBUNDLETYPE_RESULTS results = { };
4109 LPWSTR sczBundleId = NULL; 4109 LPWSTR sczBundleCode = NULL;
4110 4110
4111 // Read args. 4111 // Read args.
4112 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion); 4112 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
4113 ExitOnFailure(hr, "Failed to read API version of OnPlanRelatedBundleType args."); 4113 ExitOnFailure(hr, "Failed to read API version of OnPlanRelatedBundleType args.");
4114 4114
4115 hr = BuffReaderReadString(pReaderArgs, &sczBundleId); 4115 hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
4116 ExitOnFailure(hr, "Failed to read package id of OnPlanRelatedBundleType args."); 4116 ExitOnFailure(hr, "Failed to read package id of OnPlanRelatedBundleType args.");
4117 4117
4118 args.wzBundleId = sczBundleId; 4118 args.wzBundleCode = sczBundleCode;
4119 4119
4120 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedType)); 4120 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedType));
4121 ExitOnFailure(hr, "Failed to read recommended type of OnPlanRelatedBundleType args."); 4121 ExitOnFailure(hr, "Failed to read recommended type of OnPlanRelatedBundleType args.");
@@ -4132,7 +4132,7 @@ static HRESULT OnPlanRelatedBundleType(
4132 4132
4133 if (E_NOTIMPL == hr) 4133 if (E_NOTIMPL == hr)
4134 { 4134 {
4135 hr = pApplication->OnPlanRelatedBundleType(args.wzBundleId, args.recommendedType, &results.requestedType, &results.fCancel); 4135 hr = pApplication->OnPlanRelatedBundleType(args.wzBundleCode, args.recommendedType, &results.requestedType, &results.fCancel);
4136 } 4136 }
4137 4137
4138 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLETYPE, &args, &results, &hr); 4138 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLETYPE, &args, &results, &hr);
@@ -4149,7 +4149,7 @@ static HRESULT OnPlanRelatedBundleType(
4149 ExitOnFailure(hr, "Failed to write requested type of OnPlanRelatedBundleType struct."); 4149 ExitOnFailure(hr, "Failed to write requested type of OnPlanRelatedBundleType struct.");
4150 4150
4151LExit: 4151LExit:
4152 ReleaseStr(sczBundleId); 4152 ReleaseStr(sczBundleCode);
4153 return hr; 4153 return hr;
4154} 4154}
4155 4155
@@ -4163,16 +4163,16 @@ static HRESULT OnPlanRestoreRelatedBundle(
4163 HRESULT hr = S_OK; 4163 HRESULT hr = S_OK;
4164 BA_ONPLANRESTORERELATEDBUNDLE_ARGS args = { }; 4164 BA_ONPLANRESTORERELATEDBUNDLE_ARGS args = { };
4165 BA_ONPLANRESTORERELATEDBUNDLE_RESULTS results = { }; 4165 BA_ONPLANRESTORERELATEDBUNDLE_RESULTS results = { };
4166 LPWSTR sczBundleId = NULL; 4166 LPWSTR sczBundleCode = NULL;
4167 4167
4168 // Read args. 4168 // Read args.
4169 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion); 4169 hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
4170 ExitOnFailure(hr, "Failed to read API version of OnPlanRestoreRelatedBundle args."); 4170 ExitOnFailure(hr, "Failed to read API version of OnPlanRestoreRelatedBundle args.");
4171 4171
4172 hr = BuffReaderReadString(pReaderArgs, &sczBundleId); 4172 hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
4173 ExitOnFailure(hr, "Failed to read package id of OnPlanRestoreRelatedBundle args."); 4173 ExitOnFailure(hr, "Failed to read package id of OnPlanRestoreRelatedBundle args.");
4174 4174
4175 args.wzBundleId = sczBundleId; 4175 args.wzBundleCode = sczBundleCode;
4176 4176
4177 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedState)); 4177 hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedState));
4178 ExitOnFailure(hr, "Failed to read recommended state of OnPlanRestoreRelatedBundle args."); 4178 ExitOnFailure(hr, "Failed to read recommended state of OnPlanRestoreRelatedBundle args.");
@@ -4189,7 +4189,7 @@ static HRESULT OnPlanRestoreRelatedBundle(
4189 4189
4190 if (E_NOTIMPL == hr) 4190 if (E_NOTIMPL == hr)
4191 { 4191 {
4192 hr = pApplication->OnPlanRestoreRelatedBundle(args.wzBundleId, args.recommendedState, &results.requestedState, &results.fCancel); 4192 hr = pApplication->OnPlanRestoreRelatedBundle(args.wzBundleCode, args.recommendedState, &results.requestedState, &results.fCancel);
4193 } 4193 }
4194 4194
4195 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRESTORERELATEDBUNDLE, &args, &results, &hr); 4195 pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRESTORERELATEDBUNDLE, &args, &results, &hr);
@@ -4206,7 +4206,7 @@ static HRESULT OnPlanRestoreRelatedBundle(
4206 ExitOnFailure(hr, "Failed to write requested state of OnPlanRestoreRelatedBundle struct."); 4206 ExitOnFailure(hr, "Failed to write requested state of OnPlanRestoreRelatedBundle struct.");
4207 4207
4208LExit: 4208LExit:
4209 ReleaseStr(sczBundleId); 4209 ReleaseStr(sczBundleCode);
4210 return hr; 4210 return hr;
4211} 4211}
4212 4212
diff --git a/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp b/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp
index a5e40c8e..f9e1802a 100644
--- a/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp
+++ b/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp
@@ -307,7 +307,7 @@ public: // IBootstrapperExtensionEngine
307 } 307 }
308 308
309 virtual STDMETHODIMP GetRelatedBundleVariable( 309 virtual STDMETHODIMP GetRelatedBundleVariable(
310 __in_z LPCWSTR wzBundleId, 310 __in_z LPCWSTR wzBundleCode,
311 __in_z LPCWSTR wzVariable, 311 __in_z LPCWSTR wzVariable,
312 __out_ecount_opt(*pcchValue) LPWSTR wzValue, 312 __out_ecount_opt(*pcchValue) LPWSTR wzValue,
313 __inout SIZE_T* pcchValue 313 __inout SIZE_T* pcchValue
@@ -320,7 +320,7 @@ public: // IBootstrapperExtensionEngine
320 ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required"); 320 ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required");
321 321
322 args.cbSize = sizeof(args); 322 args.cbSize = sizeof(args);
323 args.wzBundleId = wzBundleId; 323 args.wzBundleCode = wzBundleCode;
324 args.wzVariable = wzVariable; 324 args.wzVariable = wzVariable;
325 325
326 results.cbSize = sizeof(results); 326 results.cbSize = sizeof(results);
diff --git a/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
index a78868f2..31fe9ef8 100644
--- a/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
@@ -67,7 +67,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperExtensionEngine, IUnknown, "9D027A39-F6B6-42
67 ) = 0; 67 ) = 0;
68 68
69 STDMETHOD(GetRelatedBundleVariable)( 69 STDMETHOD(GetRelatedBundleVariable)(
70 __in_z LPCWSTR wzBundleId, 70 __in_z LPCWSTR wzBundleCode,
71 __in_z LPCWSTR wzVariable, 71 __in_z LPCWSTR wzVariable,
72 __out_ecount_opt(*pcchValue) LPWSTR wzValue, 72 __out_ecount_opt(*pcchValue) LPWSTR wzValue,
73 __inout SIZE_T * pcchValue 73 __inout SIZE_T * pcchValue
diff --git a/src/api/burn/inc/BootstrapperApplicationTypes.h b/src/api/burn/inc/BootstrapperApplicationTypes.h
index c7eaa3d3..2ece1b7b 100644
--- a/src/api/burn/inc/BootstrapperApplicationTypes.h
+++ b/src/api/burn/inc/BootstrapperApplicationTypes.h
@@ -790,7 +790,7 @@ struct BA_ONDETECTCOMPLETE_RESULTS
790struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS 790struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS
791{ 791{
792 DWORD dwApiVersion; 792 DWORD dwApiVersion;
793 LPCWSTR wzBundleId; 793 LPCWSTR wzBundleCode;
794 BOOTSTRAPPER_RELATION_TYPE relationType; 794 BOOTSTRAPPER_RELATION_TYPE relationType;
795 LPCWSTR wzBundleTag; 795 LPCWSTR wzBundleTag;
796 BOOL fPerMachine; 796 BOOL fPerMachine;
@@ -847,7 +847,7 @@ struct BA_ONDETECTPACKAGECOMPLETE_RESULTS
847struct BA_ONDETECTRELATEDBUNDLE_ARGS 847struct BA_ONDETECTRELATEDBUNDLE_ARGS
848{ 848{
849 DWORD dwApiVersion; 849 DWORD dwApiVersion;
850 LPCWSTR wzBundleId; 850 LPCWSTR wzBundleCode;
851 BOOTSTRAPPER_RELATION_TYPE relationType; 851 BOOTSTRAPPER_RELATION_TYPE relationType;
852 LPCWSTR wzBundleTag; 852 LPCWSTR wzBundleTag;
853 BOOL fPerMachine; 853 BOOL fPerMachine;
@@ -865,7 +865,7 @@ struct BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS
865{ 865{
866 DWORD dwApiVersion; 866 DWORD dwApiVersion;
867 LPCWSTR wzPackageId; 867 LPCWSTR wzPackageId;
868 LPCWSTR wzBundleId; 868 LPCWSTR wzBundleCode;
869 BOOTSTRAPPER_RELATION_TYPE relationType; 869 BOOTSTRAPPER_RELATION_TYPE relationType;
870 BOOL fPerMachine; 870 BOOL fPerMachine;
871 LPCWSTR wzVersion; 871 LPCWSTR wzVersion;
@@ -1226,7 +1226,7 @@ struct BA_ONPLANCOMPLETE_RESULTS
1226struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS 1226struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS
1227{ 1227{
1228 DWORD dwApiVersion; 1228 DWORD dwApiVersion;
1229 LPCWSTR wzBundleId; 1229 LPCWSTR wzBundleCode;
1230 BOOTSTRAPPER_RELATION_TYPE relationType; 1230 BOOTSTRAPPER_RELATION_TYPE relationType;
1231 LPCWSTR wzBundleTag; 1231 LPCWSTR wzBundleTag;
1232 BOOL fPerMachine; 1232 BOOL fPerMachine;
@@ -1339,7 +1339,7 @@ struct BA_ONPLANPACKAGECOMPLETE_RESULTS
1339struct BA_ONPLANRELATEDBUNDLE_ARGS 1339struct BA_ONPLANRELATEDBUNDLE_ARGS
1340{ 1340{
1341 DWORD dwApiVersion; 1341 DWORD dwApiVersion;
1342 LPCWSTR wzBundleId; 1342 LPCWSTR wzBundleCode;
1343 BOOTSTRAPPER_REQUEST_STATE recommendedState; 1343 BOOTSTRAPPER_REQUEST_STATE recommendedState;
1344}; 1344};
1345 1345
@@ -1353,7 +1353,7 @@ struct BA_ONPLANRELATEDBUNDLE_RESULTS
1353struct BA_ONPLANRELATEDBUNDLETYPE_ARGS 1353struct BA_ONPLANRELATEDBUNDLETYPE_ARGS
1354{ 1354{
1355 DWORD dwApiVersion; 1355 DWORD dwApiVersion;
1356 LPCWSTR wzBundleId; 1356 LPCWSTR wzBundleCode;
1357 BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType; 1357 BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType;
1358}; 1358};
1359 1359
@@ -1367,7 +1367,7 @@ struct BA_ONPLANRELATEDBUNDLETYPE_RESULTS
1367struct BA_ONPLANRESTORERELATEDBUNDLE_ARGS 1367struct BA_ONPLANRESTORERELATEDBUNDLE_ARGS
1368{ 1368{
1369 DWORD dwApiVersion; 1369 DWORD dwApiVersion;
1370 LPCWSTR wzBundleId; 1370 LPCWSTR wzBundleCode;
1371 BOOTSTRAPPER_REQUEST_STATE recommendedState; 1371 BOOTSTRAPPER_REQUEST_STATE recommendedState;
1372}; 1372};
1373 1373
diff --git a/src/api/burn/inc/BootstrapperEngineTypes.h b/src/api/burn/inc/BootstrapperEngineTypes.h
index e2634383..f89238c0 100644
--- a/src/api/burn/inc/BootstrapperEngineTypes.h
+++ b/src/api/burn/inc/BootstrapperEngineTypes.h
@@ -436,7 +436,7 @@ typedef struct _BAENGINE_SETVARIABLEVERSION_RESULTS
436typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS 436typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS
437{ 437{
438 DWORD dwApiVersion; 438 DWORD dwApiVersion;
439 LPCWSTR wzBundleId; 439 LPCWSTR wzBundleCode;
440 LPCWSTR wzVariable; 440 LPCWSTR wzVariable;
441} BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS; 441} BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS;
442 442
diff --git a/src/api/burn/inc/BootstrapperExtensionEngineTypes.h b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
index 24c304c6..66dabe88 100644
--- a/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
+++ b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
@@ -176,7 +176,7 @@ typedef struct _BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLEVERSION_RESULTS
176typedef struct _BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS 176typedef struct _BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS
177{ 177{
178 DWORD cbSize; 178 DWORD cbSize;
179 LPCWSTR wzBundleId; 179 LPCWSTR wzBundleCode;
180 LPCWSTR wzVariable; 180 LPCWSTR wzVariable;
181} BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS; 181} BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS;
182 182
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs
index 8d930580..2313e0a8 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11 new[] 11 new[]
12 { 12 {
13 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number), 13 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number),
14 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.BundleId), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.BundleCode), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.EngineVersion), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.EngineVersion), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.Version), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.Version), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.InstallCommand), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.InstallCommand), IntermediateFieldType.String),
@@ -29,7 +29,9 @@ namespace WixToolset.Data.Symbols
29 public enum WixBundleBundlePackageSymbolFields 29 public enum WixBundleBundlePackageSymbolFields
30 { 30 {
31 Attributes, 31 Attributes,
32 BundleId, 32 BundleCode,
33 [Obsolete("Use BundleCode instead.")]
34 BundleId = BundleCode,
33 EngineVersion, 35 EngineVersion,
34 Version, 36 Version,
35 InstallCommand, 37 InstallCommand,
@@ -62,10 +64,17 @@ namespace WixToolset.Data.Symbols
62 set => this.Set((int)WixBundleBundlePackageSymbolFields.Attributes, (int)value); 64 set => this.Set((int)WixBundleBundlePackageSymbolFields.Attributes, (int)value);
63 } 65 }
64 66
67 public string BundleCode
68 {
69 get => (string)this.Fields[(int)WixBundleBundlePackageSymbolFields.BundleCode];
70 set => this.Set((int)WixBundleBundlePackageSymbolFields.BundleCode, value);
71 }
72
73 [Obsolete("Use BundleCode instead.")]
65 public string BundleId 74 public string BundleId
66 { 75 {
67 get => (string)this.Fields[(int)WixBundleBundlePackageSymbolFields.BundleId]; 76 get => (string)this.Fields[(int)WixBundleBundlePackageSymbolFields.BundleCode];
68 set => this.Set((int)WixBundleBundlePackageSymbolFields.BundleId, value); 77 set => this.Set((int)WixBundleBundlePackageSymbolFields.BundleCode, value);
69 } 78 }
70 79
71 public string EngineVersion 80 public string EngineVersion
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
index 9f205ce6..8c969e77 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11 new[] 11 new[]
12 { 12 {
13 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number), 13 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number),
14 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.BundleId), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.BundleCode), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.EngineVersion), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.EngineVersion), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.ManifestNamespace), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.ManifestNamespace), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.ProtocolVersion), IntermediateFieldType.Number), 17 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.ProtocolVersion), IntermediateFieldType.Number),
@@ -30,7 +30,9 @@ namespace WixToolset.Data.Symbols
30 public enum WixBundleHarvestedBundlePackageSymbolFields 30 public enum WixBundleHarvestedBundlePackageSymbolFields
31 { 31 {
32 Attributes, 32 Attributes,
33 BundleId, 33 BundleCode,
34 [Obsolete("Use BundleCode instead.")]
35 BundleId = BundleCode,
34 EngineVersion, 36 EngineVersion,
35 ManifestNamespace, 37 ManifestNamespace,
36 ProtocolVersion, 38 ProtocolVersion,
@@ -65,10 +67,17 @@ namespace WixToolset.Data.Symbols
65 set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.Attributes, (int)value); 67 set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.Attributes, (int)value);
66 } 68 }
67 69
70 public string BundleCode
71 {
72 get => this.Fields[(int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode].AsString();
73 set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode, value);
74 }
75
76 [Obsolete("Use BundleCode instead.")]
68 public string BundleId 77 public string BundleId
69 { 78 {
70 get => this.Fields[(int)WixBundleHarvestedBundlePackageSymbolFields.BundleId].AsString(); 79 get => this.Fields[(int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode].AsString();
71 set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.BundleId, value); 80 set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode, value);
72 } 81 }
73 82
74 public string EngineVersion 83 public string EngineVersion
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs
index 31f4f713..c4586601 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
11 new[] 11 new[]
12 { 12 {
13 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef), IntermediateFieldType.String), 13 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef), IntermediateFieldType.String),
14 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.BundleId), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.BundleCode), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.Action), IntermediateFieldType.Number), 15 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.Action), IntermediateFieldType.Number),
16 }, 16 },
17 typeof(WixBundlePackageRelatedBundleSymbol)); 17 typeof(WixBundlePackageRelatedBundleSymbol));
@@ -20,10 +20,14 @@ namespace WixToolset.Data
20 20
21namespace WixToolset.Data.Symbols 21namespace WixToolset.Data.Symbols
22{ 22{
23 using System;
24
23 public enum WixBundlePackageRelatedBundleSymbolFields 25 public enum WixBundlePackageRelatedBundleSymbolFields
24 { 26 {
25 PackagePayloadRef, 27 PackagePayloadRef,
26 BundleId, 28 BundleCode,
29 [Obsolete("Use BundleCode instead.")]
30 BundleId = BundleCode,
27 Action, 31 Action,
28 } 32 }
29 33
@@ -45,10 +49,17 @@ namespace WixToolset.Data.Symbols
45 set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef, value); 49 set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef, value);
46 } 50 }
47 51
52 public string BundleCode
53 {
54 get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.BundleCode];
55 set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.BundleCode, value);
56 }
57
58 [Obsolete("Use BundleCode instead.")]
48 public string BundleId 59 public string BundleId
49 { 60 {
50 get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.BundleId]; 61 get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.BundleCode];
51 set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.BundleId, value); 62 set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.BundleCode, value);
52 } 63 }
53 64
54 public RelatedBundleActionType Action 65 public RelatedBundleActionType Action
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
index ffeb5f3b..f16cdbb8 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
@@ -30,7 +30,7 @@ namespace WixToolset.Data
30 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Tag), IntermediateFieldType.String), 30 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Tag), IntermediateFieldType.String),
31 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Platform), IntermediateFieldType.String), 31 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Platform), IntermediateFieldType.String),
32 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ParentName), IntermediateFieldType.String), 32 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ParentName), IntermediateFieldType.String),
33 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.BundleId), IntermediateFieldType.String), 33 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.BundleCode), IntermediateFieldType.String),
34 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ProviderKey), IntermediateFieldType.String), 34 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ProviderKey), IntermediateFieldType.String),
35 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.InProgressName), IntermediateFieldType.String), 35 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.InProgressName), IntermediateFieldType.String),
36 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.DisableModify), IntermediateFieldType.String), 36 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.DisableModify), IntermediateFieldType.String),
@@ -65,7 +65,9 @@ namespace WixToolset.Data.Symbols
65 Tag, 65 Tag,
66 Platform, 66 Platform,
67 ParentName, 67 ParentName,
68 BundleId, 68 BundleCode,
69 [Obsolete("Use BundleCode instead.")]
70 BundleId = BundleCode,
69 ProviderKey, 71 ProviderKey,
70 InProgressName, 72 InProgressName,
71 DisableModify, 73 DisableModify,
@@ -218,10 +220,17 @@ namespace WixToolset.Data.Symbols
218 set => this.Set((int)WixBundleSymbolFields.ParentName, value); 220 set => this.Set((int)WixBundleSymbolFields.ParentName, value);
219 } 221 }
220 222
223 public string BundleCode
224 {
225 get => (string)this.Fields[(int)WixBundleSymbolFields.BundleCode];
226 set => this.Set((int)WixBundleSymbolFields.BundleCode, value);
227 }
228
229 [Obsolete("Use BundleCode instead.")]
221 public string BundleId 230 public string BundleId
222 { 231 {
223 get => (string)this.Fields[(int)WixBundleSymbolFields.BundleId]; 232 get => (string)this.Fields[(int)WixBundleSymbolFields.BundleCode];
224 set => this.Set((int)WixBundleSymbolFields.BundleId, value); 233 set => this.Set((int)WixBundleSymbolFields.BundleCode, value);
225 } 234 }
226 235
227 public string ProviderKey 236 public string ProviderKey
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs
index dc544e29..02db0da4 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
10 SymbolDefinitionType.WixRelatedBundle, 10 SymbolDefinitionType.WixRelatedBundle,
11 new[] 11 new[]
12 { 12 {
13 new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.BundleId), IntermediateFieldType.String), 13 new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.BundleCode), IntermediateFieldType.String),
14 new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.Action), IntermediateFieldType.Number), 14 new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.Action), IntermediateFieldType.Number),
15 }, 15 },
16 typeof(WixRelatedBundleSymbol)); 16 typeof(WixRelatedBundleSymbol));
@@ -19,9 +19,13 @@ namespace WixToolset.Data
19 19
20namespace WixToolset.Data.Symbols 20namespace WixToolset.Data.Symbols
21{ 21{
22 using System;
23
22 public enum WixRelatedBundleSymbolFields 24 public enum WixRelatedBundleSymbolFields
23 { 25 {
24 BundleId, 26 BundleCode,
27 [Obsolete("Use BundleCode instead.")]
28 BundleId = BundleCode,
25 Action, 29 Action,
26 } 30 }
27 31
@@ -45,10 +49,17 @@ namespace WixToolset.Data.Symbols
45 49
46 public IntermediateField this[WixRelatedBundleSymbolFields index] => this.Fields[(int)index]; 50 public IntermediateField this[WixRelatedBundleSymbolFields index] => this.Fields[(int)index];
47 51
52 public string BundleCode
53 {
54 get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleCode];
55 set => this.Set((int)WixRelatedBundleSymbolFields.BundleCode, value);
56 }
57
58 [Obsolete("Use BundleCode instead.")]
48 public string BundleId 59 public string BundleId
49 { 60 {
50 get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleId]; 61 get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleCode];
51 set => this.Set((int)WixRelatedBundleSymbolFields.BundleId, value); 62 set => this.Set((int)WixRelatedBundleSymbolFields.BundleCode, value);
52 } 63 }
53 64
54 public RelatedBundleActionType Action 65 public RelatedBundleActionType Action
@@ -57,4 +68,4 @@ namespace WixToolset.Data.Symbols
57 set => this.Set((int)WixRelatedBundleSymbolFields.Action, (int)value); 68 set => this.Set((int)WixRelatedBundleSymbolFields.Action, (int)value);
58 } 69 }
59 } 70 }
60} \ No newline at end of file 71}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-21 19:23:39 +0000