Update WixBA to Mba.Core 4.0.13.
Sean Hall committed
May 5, 2021 at 17:54 UTC
0d21d619788c146dc32fced5350ac955bacd7c17
10 files changed
+7
-15
src/WixToolset.WixBA/InstallationViewModel.cs
-1
@@ -10,7 +10,6 @@ namespace WixToolset.WixBA
10
using System.Windows;
11
using System.Windows.Input;
12
using IO = System.IO;
13
- using WixToolset.BootstrapperCore;
13
using WixToolset.Mba.Core;
14
15
/// <summary>
src/WixToolset.WixBA/Model.cs
-1
@@ -5,7 +5,6 @@ namespace WixToolset.WixBA
5
using System;
6
using System.Collections.Generic;
7
using System.Net;
8
- using WixToolset.BootstrapperCore;
8
using WixToolset.Mba.Core;
9
10
/// <summary>
src/WixToolset.WixBA/ProgressViewModel.cs
-1
@@ -5,7 +5,6 @@ using System.Collections.Generic;
5
using System.ComponentModel;
6
using System.Diagnostics;
7
using System.Text.RegularExpressions;
8
-using WixToolset.BootstrapperCore;
8
using WixToolset.Mba.Core;
9
10
namespace WixToolset.WixBA
src/WixToolset.WixBA/RootViewModel.cs
+1
-1
@@ -6,7 +6,7 @@ namespace WixToolset.WixBA
6
using System.Windows;
7
using System.Windows.Input;
8
using System.Windows.Threading;
9
- using WixToolset.BootstrapperCore;
9
+ using WixToolset.Mba.Core;
10
11
/// <summary>
12
/// The errors returned from the engine
src/WixToolset.WixBA/UpdateViewModel.cs
-1
@@ -5,7 +5,6 @@ namespace WixToolset.WixBA
5
using System;
6
using System.ComponentModel;
7
using System.Windows.Input;
8
- using WixToolset.BootstrapperCore;
8
using WixToolset.Mba.Core;
9
10
/// <summary>
src/WixToolset.WixBA/WixBA.BootstrapperCore.config
+2
-2
@@ -3,8 +3,8 @@
3
4
<configuration>
5
<configSections>
6
- <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Core.BootstrapperSectionGroup, WixToolset.Mba.Core">
7
- <section name="host" type="WixToolset.Mba.Core.HostSection, WixToolset.Mba.Core" />
6
+ <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Host.BootstrapperSectionGroup, WixToolset.Mba.Host">
7
+ <section name="host" type="WixToolset.Mba.Host.HostSection, WixToolset.Mba.Host" />
8
</sectionGroup>
9
</configSections>
10
<startup useLegacyV2RuntimeActivationPolicy="true">
src/WixToolset.WixBA/WixBA.cs
-1
@@ -8,7 +8,6 @@ namespace WixToolset.WixBA
8
using System.IO;
9
using System.Net;
10
using System.Text;
11
- using WixToolset.BootstrapperCore;
11
using WixToolset.Mba.Core;
12
13
using Threading = System.Windows.Threading;
src/WixToolset.WixBA/WixBAFactory.cs
-1
@@ -2,7 +2,6 @@
2
3
namespace WixToolset.WixBA
4
{
5
- using WixToolset.BootstrapperCore;
5
using WixToolset.Mba.Core;
6
7
public class WixBAFactory : BaseBootstrapperApplicationFactory
src/WixToolset.WixBA/WixToolset.WixBA.csproj
+3
-4
@@ -1,6 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
4
+ <Import Project="..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" />
5
<PropertyGroup>
6
<ProjectGuid>{7C27518B-84AD-4679-8EF4-29DF552CF1AC}</ProjectGuid>
7
<AssemblyName>WixToolset.WixBA</AssemblyName>
@@ -56,11 +57,8 @@
57
<Reference Include="System.Xml" />
58
<Reference Include="System.Xaml" />
59
<Reference Include="WindowsBase" />
59
- <Reference Include="WixToolset.BootstrapperCore">
60
- <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
61
- </Reference>
60
<Reference Include="WixToolset.Mba.Core">
63
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.9\lib\net20\WixToolset.Mba.Core.dll</HintPath>
61
+ <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll</HintPath>
62
</Reference>
63
</ItemGroup>
64
<ItemGroup>
@@ -76,5 +74,6 @@
74
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
75
</PropertyGroup>
76
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
77
+ <Error Condition="!Exists('..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props'))" />
78
</Target>
79
</Project>
\ No newline at end of file
src/WixToolset.WixBA/packages.config
+1
-2
@@ -1,6 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore" version="4.0.8" targetFramework="net45" />
5
- <package id="WixToolset.Mba.Core" version="4.0.9" targetFramework="net45" />
4
+ <package id="WixToolset.Mba.Core" version="4.0.13" targetFramework="net45" />
5
</packages>
\ No newline at end of file