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
         [DllImport("mbanative.dll", ExactSpelling = true)]
         internal static extern int BalGetRelatedBundleVariableFromEngine(
             [MarshalAs(UnmanagedType.Interface)] IBootstrapperEngine pEngine,
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
             ref StrUtil.StrHandle psczOut
             );
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
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
+        int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
         {
-            DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
+            DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
             this.OnDetectForwardCompatibleBundle(args);
 
             fCancel = args.Cancel;
@@ -1566,9 +1566,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
         {
-            PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel);
+            PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
             this.OnPlanRelatedBundle(args);
 
             pRequestedState = args.State;
@@ -1576,9 +1576,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleId, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleCode, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
         {
-            PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleId, recommendedType, pRequestedType, fCancel);
+            PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleCode, recommendedType, pRequestedType, fCancel);
             this.OnPlanRelatedBundleType(args);
 
             pRequestedType = args.Type;
@@ -2060,9 +2060,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle)
+        int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle)
         {
-            PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle);
+            PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle);
             this.OnPlanForwardCompatibleBundle(args);
 
             fCancel = args.Cancel;
@@ -2122,9 +2122,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
         {
-            PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel);
+            PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
             this.OnPlanRestoreRelatedBundle(args);
 
             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
         }
 
         /// <inheritdoc/>
-        public string GetRelatedBundleVariable(string bundleId, string name)
+        public string GetRelatedBundleVariable(string bundleCode, string name)
         {
             StrUtil.StrHandle handle = new StrUtil.StrHandle();
             try
             {
-                int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleId, name, ref handle);
+                int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleCode, name, ref handle);
                 if (ret != NativeMethods.S_OK)
                 {
                     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
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public DetectForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
+        public DetectForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RelationType = relationType;
             this.BundleTag = bundleTag;
             this.PerMachine = perMachine;
@@ -339,7 +339,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the forward compatible bundle detected.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the relationship type of the forward compatible bundle.
@@ -807,10 +811,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation)
+        public PlanRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RecommendedState = recommendedState;
             this.State = state;
         }
@@ -818,7 +822,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the bundle to plan for.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the recommended requested state for the bundle.
@@ -841,10 +849,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanRelatedBundleTypeEventArgs(string bundleId, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
+        public PlanRelatedBundleTypeEventArgs(string bundleCode, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RecommendedType = recommendedType;
             this.Type = type;
         }
@@ -852,7 +860,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the bundle to plan for.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the recommended plan type for the bundle.
@@ -1327,10 +1339,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle)
+        public PlanForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RelationType = relationType;
             this.BundleTag = bundleTag;
             this.PerMachine = perMachine;
@@ -1342,7 +1354,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the forward compatible bundle detected.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the relationship type of the forward compatible bundle.
@@ -2624,10 +2640,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanRestoreRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation)
+        public PlanRestoreRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RecommendedState = recommendedState;
             this.State = state;
         }
@@ -2635,7 +2651,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the bundle to plan for.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// 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
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectForwardCompatibleBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -135,7 +135,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectRelatedBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -243,7 +243,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanRelatedBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -869,7 +869,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanForwardCompatibleBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -957,7 +957,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanRestoreRelatedBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -969,7 +969,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanRelatedBundleType(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelatedBundlePlanType recommendedType,
             [MarshalAs(UnmanagedType.U4)] ref RelatedBundlePlanType pRequestedType,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -1004,7 +1004,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectRelatedBundlePackage(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
             [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
         /// </summary>
         [PreserveSig]
         int GetRelatedBundleVariable(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
                                               IntPtr wzValue,
                                           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
         /// <summary>
         /// Gets persisted variables from a related bundle.
         /// </summary>
-        /// <param name="bundleId">The BundleId of the related bundle.</param>
+        /// <param name="bundleCode">The bundle code of the related bundle.</param>
         /// <param name="name">The name of the variable.</param>
-        string GetRelatedBundleVariable(string bundleId, string name);
+        string GetRelatedBundleVariable(string bundleCode, string name);
 
         /// <summary>
         /// Launches a preapproved executable elevated.  As long as the engine already elevated, there will be no UAC prompt.