From 77041048dbaebaa8f28233cb8e8d04540d599956 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 5 May 2021 15:56:17 -0500 Subject: Update WixBA to Mba.Core 4.0.9. --- src/WixToolset.WixBA/InstallationViewModel.cs | 1 + src/WixToolset.WixBA/Model.cs | 1 + src/WixToolset.WixBA/ProgressViewModel.cs | 1 + src/WixToolset.WixBA/Properties/AssemblyInfo.cs | 2 +- src/WixToolset.WixBA/RootViewModel.cs | 2 -- src/WixToolset.WixBA/UpdateViewModel.cs | 1 + src/WixToolset.WixBA/WixBA.BootstrapperCore.config | 4 ++-- src/WixToolset.WixBA/WixBA.cs | 1 + src/WixToolset.WixBA/WixBAFactory.cs | 1 + src/WixToolset.WixBA/WixToolset.WixBA.csproj | 5 ++++- src/WixToolset.WixBA/packages.config | 3 ++- 11 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/WixToolset.WixBA/InstallationViewModel.cs b/src/WixToolset.WixBA/InstallationViewModel.cs index 33b14810..b83f7012 100644 --- a/src/WixToolset.WixBA/InstallationViewModel.cs +++ b/src/WixToolset.WixBA/InstallationViewModel.cs @@ -11,6 +11,7 @@ namespace WixToolset.WixBA using System.Windows.Input; using IO = System.IO; using WixToolset.BootstrapperCore; + using WixToolset.Mba.Core; /// /// The states of detection. diff --git a/src/WixToolset.WixBA/Model.cs b/src/WixToolset.WixBA/Model.cs index fda8eab2..55a0f84d 100644 --- a/src/WixToolset.WixBA/Model.cs +++ b/src/WixToolset.WixBA/Model.cs @@ -6,6 +6,7 @@ namespace WixToolset.WixBA using System.Collections.Generic; using System.Net; using WixToolset.BootstrapperCore; + using WixToolset.Mba.Core; /// /// The model. diff --git a/src/WixToolset.WixBA/ProgressViewModel.cs b/src/WixToolset.WixBA/ProgressViewModel.cs index bc0fecd0..a2320498 100644 --- a/src/WixToolset.WixBA/ProgressViewModel.cs +++ b/src/WixToolset.WixBA/ProgressViewModel.cs @@ -6,6 +6,7 @@ using System.ComponentModel; using System.Diagnostics; using System.Text.RegularExpressions; using WixToolset.BootstrapperCore; +using WixToolset.Mba.Core; namespace WixToolset.WixBA { diff --git a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs b/src/WixToolset.WixBA/Properties/AssemblyInfo.cs index 9c40cc07..687bd01a 100644 --- a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs +++ b/src/WixToolset.WixBA/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; -using WixToolset.BootstrapperCore; +using WixToolset.Mba.Core; using WixToolset.WixBA; diff --git a/src/WixToolset.WixBA/RootViewModel.cs b/src/WixToolset.WixBA/RootViewModel.cs index b90e5a4b..4ca20bf5 100644 --- a/src/WixToolset.WixBA/RootViewModel.cs +++ b/src/WixToolset.WixBA/RootViewModel.cs @@ -3,8 +3,6 @@ namespace WixToolset.WixBA { using System; - using System.Diagnostics; - using System.Reflection; using System.Windows; using System.Windows.Input; using System.Windows.Threading; diff --git a/src/WixToolset.WixBA/UpdateViewModel.cs b/src/WixToolset.WixBA/UpdateViewModel.cs index cb6c0ad9..4a97afec 100644 --- a/src/WixToolset.WixBA/UpdateViewModel.cs +++ b/src/WixToolset.WixBA/UpdateViewModel.cs @@ -6,6 +6,7 @@ namespace WixToolset.WixBA using System.ComponentModel; using System.Windows.Input; using WixToolset.BootstrapperCore; + using WixToolset.Mba.Core; /// /// The states of the update view model. diff --git a/src/WixToolset.WixBA/WixBA.BootstrapperCore.config b/src/WixToolset.WixBA/WixBA.BootstrapperCore.config index d8439232..21dc2efd 100644 --- a/src/WixToolset.WixBA/WixBA.BootstrapperCore.config +++ b/src/WixToolset.WixBA/WixBA.BootstrapperCore.config @@ -3,8 +3,8 @@ - -
+ +
diff --git a/src/WixToolset.WixBA/WixBA.cs b/src/WixToolset.WixBA/WixBA.cs index b82a86ae..509b70f7 100644 --- a/src/WixToolset.WixBA/WixBA.cs +++ b/src/WixToolset.WixBA/WixBA.cs @@ -9,6 +9,7 @@ namespace WixToolset.WixBA using System.Net; using System.Text; using WixToolset.BootstrapperCore; + using WixToolset.Mba.Core; using Threading = System.Windows.Threading; using WinForms = System.Windows.Forms; diff --git a/src/WixToolset.WixBA/WixBAFactory.cs b/src/WixToolset.WixBA/WixBAFactory.cs index 0c219f17..fa18d357 100644 --- a/src/WixToolset.WixBA/WixBAFactory.cs +++ b/src/WixToolset.WixBA/WixBAFactory.cs @@ -3,6 +3,7 @@ namespace WixToolset.WixBA { using WixToolset.BootstrapperCore; + using WixToolset.Mba.Core; public class WixBAFactory : BaseBootstrapperApplicationFactory { diff --git a/src/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/WixToolset.WixBA/WixToolset.WixBA.csproj index 881996e4..4cdaa002 100644 --- a/src/WixToolset.WixBA/WixToolset.WixBA.csproj +++ b/src/WixToolset.WixBA/WixToolset.WixBA.csproj @@ -57,7 +57,10 @@ - ..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll + ..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll + + + ..\..\packages\WixToolset.Mba.Core.4.0.9\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.WixBA/packages.config b/src/WixToolset.WixBA/packages.config index 24cbf46f..1dd9b27c 100644 --- a/src/WixToolset.WixBA/packages.config +++ b/src/WixToolset.WixBA/packages.config @@ -1,5 +1,6 @@  - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb