aboutsummaryrefslogtreecommitdiff
path: root/src/api/burn/WixToolset.Mba.Core
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-12-30 15:32:57 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-12-30 18:40:49 -0600
commit8dfadd0c9068965af138949b630ef8496b4f7bbb (patch)
tree58bc40d5306d80a39712470aab0d5bf325eb3a45 /src/api/burn/WixToolset.Mba.Core
parent84a1b0f8ffe40a26916b1dfb3e1b59b6b0c31ad4 (diff)
downloadwix-8dfadd0c9068965af138949b630ef8496b4f7bbb.tar.gz
wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.tar.bz2
wix-8dfadd0c9068965af138949b630ef8496b4f7bbb.zip
Don't report related operation in OnDetectRelatedBundle.
#5796
Diffstat (limited to 'src/api/burn/WixToolset.Mba.Core')
-rw-r--r--src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs4
-rw-r--r--src/api/burn/WixToolset.Mba.Core/EventArgs.cs8
-rw-r--r--src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs15
3 files changed, 3 insertions, 24 deletions
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
index b1fcaea4..34b63a50 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -1345,9 +1345,9 @@ namespace WixToolset.Mba.Core
1345 return args.HResult; 1345 return args.HResult;
1346 } 1346 }
1347 1347
1348 int IBootstrapperApplication.OnDetectRelatedBundle(string wzProductCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, RelatedOperation operation, bool fMissingFromCache, ref bool fCancel) 1348 int IBootstrapperApplication.OnDetectRelatedBundle(string wzProductCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
1349 { 1349 {
1350 DetectRelatedBundleEventArgs args = new DetectRelatedBundleEventArgs(wzProductCode, relationType, wzBundleTag, fPerMachine, wzVersion, operation, fMissingFromCache, fCancel); 1350 DetectRelatedBundleEventArgs args = new DetectRelatedBundleEventArgs(wzProductCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
1351 this.OnDetectRelatedBundle(args); 1351 this.OnDetectRelatedBundle(args);
1352 1352
1353 fCancel = args.Cancel; 1353 fCancel = args.Cancel;
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
index 65169b25..93831be6 100644
--- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
@@ -434,7 +434,7 @@ namespace WixToolset.Mba.Core
434 public class DetectRelatedBundleEventArgs : CancellableHResultEventArgs 434 public class DetectRelatedBundleEventArgs : CancellableHResultEventArgs
435 { 435 {
436 /// <summary /> 436 /// <summary />
437 public DetectRelatedBundleEventArgs(string productCode, RelationType relationType, string bundleTag, bool perMachine, string version, RelatedOperation operation, bool missingFromCache, bool cancelRecommendation) 437 public DetectRelatedBundleEventArgs(string productCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
438 : base(cancelRecommendation) 438 : base(cancelRecommendation)
439 { 439 {
440 this.ProductCode = productCode; 440 this.ProductCode = productCode;
@@ -442,7 +442,6 @@ namespace WixToolset.Mba.Core
442 this.BundleTag = bundleTag; 442 this.BundleTag = bundleTag;
443 this.PerMachine = perMachine; 443 this.PerMachine = perMachine;
444 this.Version = version; 444 this.Version = version;
445 this.Operation = operation;
446 this.MissingFromCache = missingFromCache; 445 this.MissingFromCache = missingFromCache;
447 } 446 }
448 447
@@ -472,11 +471,6 @@ namespace WixToolset.Mba.Core
472 public string Version { get; private set; } 471 public string Version { get; private set; }
473 472
474 /// <summary> 473 /// <summary>
475 /// Gets the operation that will be taken on the detected bundle.
476 /// </summary>
477 public RelatedOperation Operation { get; private set; }
478
479 /// <summary>
480 /// Whether the related bundle is missing from the package cache. 474 /// Whether the related bundle is missing from the package cache.
481 /// </summary> 475 /// </summary>
482 public bool MissingFromCache { get; set; } 476 public bool MissingFromCache { get; set; }
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
index 3df54bde..babd523a 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -156,15 +156,6 @@ namespace WixToolset.Mba.Core
156 /// <summary> 156 /// <summary>
157 /// See <see cref="IDefaultBootstrapperApplication.DetectRelatedBundle"/>. 157 /// See <see cref="IDefaultBootstrapperApplication.DetectRelatedBundle"/>.
158 /// </summary> 158 /// </summary>
159 /// <param name="wzBundleId"></param>
160 /// <param name="relationType"></param>
161 /// <param name="wzBundleTag"></param>
162 /// <param name="fPerMachine"></param>
163 /// <param name="wzVersion"></param>
164 /// <param name="operation"></param>
165 /// <param name="fMissingFromCache"></param>
166 /// <param name="fCancel"></param>
167 /// <returns></returns>
168 [PreserveSig] 159 [PreserveSig]
169 [return: MarshalAs(UnmanagedType.I4)] 160 [return: MarshalAs(UnmanagedType.I4)]
170 int OnDetectRelatedBundle( 161 int OnDetectRelatedBundle(
@@ -173,7 +164,6 @@ namespace WixToolset.Mba.Core
173 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag, 164 [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
174 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine, 165 [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
175 [MarshalAs(UnmanagedType.LPWStr)] string wzVersion, 166 [MarshalAs(UnmanagedType.LPWStr)] string wzVersion,
176 [MarshalAs(UnmanagedType.U4)] RelatedOperation operation,
177 [MarshalAs(UnmanagedType.Bool)] bool fMissingFromCache, 167 [MarshalAs(UnmanagedType.Bool)] bool fMissingFromCache,
178 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel 168 [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
179 ); 169 );
@@ -289,11 +279,6 @@ namespace WixToolset.Mba.Core
289 /// <summary> 279 /// <summary>
290 /// See <see cref="IDefaultBootstrapperApplication.PlanRelatedBundle"/>. 280 /// See <see cref="IDefaultBootstrapperApplication.PlanRelatedBundle"/>.
291 /// </summary> 281 /// </summary>
292 /// <param name="wzBundleId"></param>
293 /// <param name="recommendedState"></param>
294 /// <param name="pRequestedState"></param>
295 /// <param name="fCancel"></param>
296 /// <returns></returns>
297 [PreserveSig] 282 [PreserveSig]
298 [return: MarshalAs(UnmanagedType.I4)] 283 [return: MarshalAs(UnmanagedType.I4)]
299 int OnPlanRelatedBundle( 284 int OnPlanRelatedBundle(