aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-05-05 15:56:17 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-05-11 19:11:19 -0500
commit77041048dbaebaa8f28233cb8e8d04540d599956 (patch)
tree019d35827f8cd2e7da84019ad136dcf5bbbd08f6
parentbfd0eeddbbdec0348f43e47c36dedf4a23e9a927 (diff)
downloadwix-77041048dbaebaa8f28233cb8e8d04540d599956.tar.gz
wix-77041048dbaebaa8f28233cb8e8d04540d599956.tar.bz2
wix-77041048dbaebaa8f28233cb8e8d04540d599956.zip
Update WixBA to Mba.Core 4.0.9.
-rw-r--r--src/WixToolset.WixBA/InstallationViewModel.cs1
-rw-r--r--src/WixToolset.WixBA/Model.cs1
-rw-r--r--src/WixToolset.WixBA/ProgressViewModel.cs1
-rw-r--r--src/WixToolset.WixBA/Properties/AssemblyInfo.cs2
-rw-r--r--src/WixToolset.WixBA/RootViewModel.cs2
-rw-r--r--src/WixToolset.WixBA/UpdateViewModel.cs1
-rw-r--r--src/WixToolset.WixBA/WixBA.BootstrapperCore.config4
-rw-r--r--src/WixToolset.WixBA/WixBA.cs1
-rw-r--r--src/WixToolset.WixBA/WixBAFactory.cs1
-rw-r--r--src/WixToolset.WixBA/WixToolset.WixBA.csproj5
-rw-r--r--src/WixToolset.WixBA/packages.config3
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
11 using System.Windows.Input; 11 using System.Windows.Input;
12 using IO = System.IO; 12 using IO = System.IO;
13 using WixToolset.BootstrapperCore; 13 using WixToolset.BootstrapperCore;
14 using WixToolset.Mba.Core;
14 15
15 /// <summary> 16 /// <summary>
16 /// The states of detection. 17 /// 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
6 using System.Collections.Generic; 6 using System.Collections.Generic;
7 using System.Net; 7 using System.Net;
8 using WixToolset.BootstrapperCore; 8 using WixToolset.BootstrapperCore;
9 using WixToolset.Mba.Core;
9 10
10 /// <summary> 11 /// <summary>
11 /// The model. 12 /// 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;
6using System.Diagnostics; 6using System.Diagnostics;
7using System.Text.RegularExpressions; 7using System.Text.RegularExpressions;
8using WixToolset.BootstrapperCore; 8using WixToolset.BootstrapperCore;
9using WixToolset.Mba.Core;
9 10
10namespace WixToolset.WixBA 11namespace WixToolset.WixBA
11{ 12{
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 @@
3using System; 3using System;
4using System.Reflection; 4using System.Reflection;
5using System.Runtime.InteropServices; 5using System.Runtime.InteropServices;
6using WixToolset.BootstrapperCore; 6using WixToolset.Mba.Core;
7using WixToolset.WixBA; 7using WixToolset.WixBA;
8 8
9 9
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 @@
3namespace WixToolset.WixBA 3namespace WixToolset.WixBA
4{ 4{
5 using System; 5 using System;
6 using System.Diagnostics;
7 using System.Reflection;
8 using System.Windows; 6 using System.Windows;
9 using System.Windows.Input; 7 using System.Windows.Input;
10 using System.Windows.Threading; 8 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
6 using System.ComponentModel; 6 using System.ComponentModel;
7 using System.Windows.Input; 7 using System.Windows.Input;
8 using WixToolset.BootstrapperCore; 8 using WixToolset.BootstrapperCore;
9 using WixToolset.Mba.Core;
9 10
10 /// <summary> 11 /// <summary>
11 /// The states of the update view model. 12 /// 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 @@
3 3
4<configuration> 4<configuration>
5 <configSections> 5 <configSections>
6 <sectionGroup name="wix.bootstrapper" type="WixToolset.BootstrapperCore.BootstrapperSectionGroup, WixToolset.BootstrapperCore"> 6 <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Core.BootstrapperSectionGroup, WixToolset.Mba.Core">
7 <section name="host" type="WixToolset.BootstrapperCore.HostSection, WixToolset.BootstrapperCore" /> 7 <section name="host" type="WixToolset.Mba.Core.HostSection, WixToolset.Mba.Core" />
8 </sectionGroup> 8 </sectionGroup>
9 </configSections> 9 </configSections>
10 <startup useLegacyV2RuntimeActivationPolicy="true"> 10 <startup useLegacyV2RuntimeActivationPolicy="true">
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
9 using System.Net; 9 using System.Net;
10 using System.Text; 10 using System.Text;
11 using WixToolset.BootstrapperCore; 11 using WixToolset.BootstrapperCore;
12 using WixToolset.Mba.Core;
12 13
13 using Threading = System.Windows.Threading; 14 using Threading = System.Windows.Threading;
14 using WinForms = System.Windows.Forms; 15 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 @@
3namespace WixToolset.WixBA 3namespace WixToolset.WixBA
4{ 4{
5 using WixToolset.BootstrapperCore; 5 using WixToolset.BootstrapperCore;
6 using WixToolset.Mba.Core;
6 7
7 public class WixBAFactory : BaseBootstrapperApplicationFactory 8 public class WixBAFactory : BaseBootstrapperApplicationFactory
8 { 9 {
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 @@
57 <Reference Include="System.Xaml" /> 57 <Reference Include="System.Xaml" />
58 <Reference Include="WindowsBase" /> 58 <Reference Include="WindowsBase" />
59 <Reference Include="WixToolset.BootstrapperCore"> 59 <Reference Include="WixToolset.BootstrapperCore">
60 <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll</HintPath> 60 <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
61 </Reference>
62 <Reference Include="WixToolset.Mba.Core">
63 <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.9\lib\net20\WixToolset.Mba.Core.dll</HintPath>
61 </Reference> 64 </Reference>
62 </ItemGroup> 65 </ItemGroup>
63 <ItemGroup> 66 <ItemGroup>
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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" />
4 <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="net45" /> 4 <package id="WixToolset.BootstrapperCore" version="4.0.8" targetFramework="net45" />
5 <package id="WixToolset.Mba.Core" version="4.0.9" targetFramework="net45" />
5</packages> \ No newline at end of file 6</packages> \ No newline at end of file