Update WixBA to Mba.Core 4.0.58.

1 files changed, 33 insertions, 0 deletions

diff --git a/src/WixToolset.WixBA/ProgressViewModel.cs b/src/WixToolset.WixBA/ProgressViewModel.cs
index 17af5cfe..6f7bb028 100644
--- a/src/WixToolset.WixBA/ProgressViewModel.cs
+++ b/src/WixToolset.WixBA/ProgressViewModel.cs
@@ -40,6 +40,9 @@ namespace WixToolset.WixBA
             WixBA.Model.Bootstrapper.ApplyBegin += this.ApplyBegin;
             WixBA.Model.Bootstrapper.Progress += this.ApplyProgress;
             WixBA.Model.Bootstrapper.CacheAcquireProgress += this.CacheAcquireProgress;
+            WixBA.Model.Bootstrapper.CacheContainerOrPayloadVerifyProgress += CacheContainerOrPayloadVerifyProgress;
+            WixBA.Model.Bootstrapper.CachePayloadExtractProgress += CachePayloadExtractProgress;
+            WixBA.Model.Bootstrapper.CacheVerifyProgress += CacheVerifyProgress;
             WixBA.Model.Bootstrapper.CacheComplete += this.CacheComplete;
         }
 
@@ -184,6 +187,36 @@ namespace WixToolset.WixBA
             }
         }
 
+        private void CacheContainerOrPayloadVerifyProgress(object sender, CacheContainerOrPayloadVerifyProgressEventArgs e)
+        {
+            lock (this)
+            {
+                this.cacheProgress = e.OverallPercentage;
+                this.Progress = (this.cacheProgress + this.executeProgress) / this.progressPhases;
+                e.Cancel = this.root.Canceled;
+            }
+        }
+
+        private void CachePayloadExtractProgress(object sender, CachePayloadExtractProgressEventArgs e)
+        {
+            lock (this)
+            {
+                this.cacheProgress = e.OverallPercentage;
+                this.Progress = (this.cacheProgress + this.executeProgress) / this.progressPhases;
+                e.Cancel = this.root.Canceled;
+            }
+        }
+
+        private void CacheVerifyProgress(object sender, CacheVerifyProgressEventArgs e)
+        {
+            lock (this)
+            {
+                this.cacheProgress = e.OverallPercentage;
+                this.Progress = (this.cacheProgress + this.executeProgress) / this.progressPhases;
+                e.Cancel = this.root.Canceled;
+            }
+        }
+
         private void CacheComplete(object sender, CacheCompleteEventArgs e)
         {
             lock (this)