aboutsummaryrefslogtreecommitdiff
path: root/src/api/burn/WixToolset.BootstrapperApplicationApi
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-12-29 18:01:20 -0800
committerRob Mensching <rob@firegiant.com>2024-12-30 06:45:49 -0800
commit523c66a62a619e6aa9f30070173ea33edfb5e328 (patch)
tree04fa3146250b7eeaa6864b0f71e37905a2d77be1 /src/api/burn/WixToolset.BootstrapperApplicationApi
parent6edc5d1e2a289eac50c6d59a29e195353bb023cb (diff)
downloadwix-523c66a62a619e6aa9f30070173ea33edfb5e328.tar.gz
wix-523c66a62a619e6aa9f30070173ea33edfb5e328.tar.bz2
wix-523c66a62a619e6aa9f30070173ea33edfb5e328.zip
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".
Diffstat (limited to 'src/api/burn/WixToolset.BootstrapperApplicationApi')
-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
7 files changed, 58 insertions, 38 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.