aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-05-05 19:35:09 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-05-11 19:11:19 -0500
commit0db19b269e9b94a674e370629934e82545374777 (patch)
treebd0d52cb218f7ae0220dc17b3bf5fecf1e35fbb7
parent3afcdb255803a747447d2770b56019d5d144d443 (diff)
downloadwix-0db19b269e9b94a674e370629934e82545374777.tar.gz
wix-0db19b269e9b94a674e370629934e82545374777.tar.bz2
wix-0db19b269e9b94a674e370629934e82545374777.zip
Update WixBA to Mba.Core 4.0.44.
-rw-r--r--src/WixToolset.WixBA/ProgressViewModel.cs18
-rw-r--r--src/WixToolset.WixBA/WixToolset.WixBA.csproj2
2 files changed, 19 insertions, 1 deletions
diff --git a/src/WixToolset.WixBA/ProgressViewModel.cs b/src/WixToolset.WixBA/ProgressViewModel.cs
index 081688ac..e4fb7ab2 100644
--- a/src/WixToolset.WixBA/ProgressViewModel.cs
+++ b/src/WixToolset.WixBA/ProgressViewModel.cs
@@ -33,6 +33,8 @@ namespace WixToolset.WixBA
33 WixBA.Model.Bootstrapper.ExecutePackageBegin += this.ExecutePackageBegin; 33 WixBA.Model.Bootstrapper.ExecutePackageBegin += this.ExecutePackageBegin;
34 WixBA.Model.Bootstrapper.ExecutePackageComplete += this.ExecutePackageComplete; 34 WixBA.Model.Bootstrapper.ExecutePackageComplete += this.ExecutePackageComplete;
35 WixBA.Model.Bootstrapper.ExecuteProgress += this.ApplyExecuteProgress; 35 WixBA.Model.Bootstrapper.ExecuteProgress += this.ApplyExecuteProgress;
36 WixBA.Model.Bootstrapper.PauseAutomaticUpdatesBegin += this.PauseAutomaticUpdatesBegin;
37 WixBA.Model.Bootstrapper.SystemRestorePointBegin += this.SystemRestorePointBegin;
36 WixBA.Model.Bootstrapper.PlanBegin += this.PlanBegin; 38 WixBA.Model.Bootstrapper.PlanBegin += this.PlanBegin;
37 WixBA.Model.Bootstrapper.PlanPackageComplete += this.PlanPackageComplete; 39 WixBA.Model.Bootstrapper.PlanPackageComplete += this.PlanPackageComplete;
38 WixBA.Model.Bootstrapper.ApplyBegin += this.ApplyBegin; 40 WixBA.Model.Bootstrapper.ApplyBegin += this.ApplyBegin;
@@ -143,6 +145,22 @@ namespace WixToolset.WixBA
143 } 145 }
144 } 146 }
145 147
148 private void PauseAutomaticUpdatesBegin(object sender, PauseAutomaticUpdatesBeginEventArgs e)
149 {
150 lock (this)
151 {
152 this.Message = "Pausing Windows automatic updates";
153 }
154 }
155
156 private void SystemRestorePointBegin(object sender, SystemRestorePointBeginEventArgs e)
157 {
158 lock (this)
159 {
160 this.Message = "Creating system restore point";
161 }
162 }
163
146 private void ApplyBegin(object sender, ApplyBeginEventArgs e) 164 private void ApplyBegin(object sender, ApplyBeginEventArgs e)
147 { 165 {
148 this.progressPhases = e.PhaseCount; 166 this.progressPhases = e.PhaseCount;
diff --git a/src/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
index 16225233..03838bb1 100644
--- a/src/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -41,6 +41,6 @@
41 </ItemGroup> 41 </ItemGroup>
42 <ItemGroup> 42 <ItemGroup>
43 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> 43 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
44 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.40" /> 44 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.44" />
45 </ItemGroup> 45 </ItemGroup>
46</Project> \ No newline at end of file 46</Project> \ No newline at end of file