Update WixBA to Mba.Core 4.0.26.

4 files changed, 19 insertions, 76 deletions

diff --git a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs b/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
deleted file mode 100644
index 687bd01a..00000000
--- a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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.
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using WixToolset.Mba.Core;
-using WixToolset.WixBA;
-
-
-[assembly: AssemblyTitle("WixToolset.WixBA")]
-[assembly: AssemblyDescription("WiX Bootstrapper Application")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-[assembly: Guid("0ffc4944-9295-40b7-adac-3a6864b5219b")]
-[assembly: CLSCompliantAttribute(true)]
-
-// Identifies the class that derives from IBootstrapperApplicationFactory and is the BAFactory class that gets
-// instantiated by the interop layer
-[assembly: BootstrapperApplicationFactory(typeof(WixBAFactory))]
diff --git a/src/WixToolset.WixBA/WixBAFactory.cs b/src/WixToolset.WixBA/WixBAFactory.cs
index bc7368d1..67fcc4b5 100644
--- a/src/WixToolset.WixBA/WixBAFactory.cs
+++ b/src/WixToolset.WixBA/WixBAFactory.cs
@@ -1,5 +1,8 @@
 // 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.
 
+// Identifies the class that derives from IBootstrapperApplicationFactory and is the BAFactory class that gets
+// instantiated by the interop layer
+[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(WixToolset.WixBA.WixBAFactory))]
 namespace WixToolset.WixBA
 {
     using WixToolset.Mba.Core;
diff --git a/src/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
index a19f4db4..f0fc32dd 100644
--- a/src/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <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')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{7C27518B-84AD-4679-8EF4-29DF552CF1AC}</ProjectGuid>
+    <TargetFramework>net45</TargetFramework>
     <AssemblyName>WixToolset.WixBA</AssemblyName>
-    <OutputType>Library</OutputType>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <DebugType>embedded</DebugType>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <AssemblyTitle>WixToolset.WixBA</AssemblyTitle>
+    <Description>WiX Bootstrapper Application</Description>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Hresult.cs" />
-    <Compile Include="Model.cs" />
-    <Compile Include="BrowserProperties.cs" />
-    <Compile Include="NewsItem.cs" />
-    <Compile Include="ProgressViewModel.cs" />
-    <Compile Include="RelayCommand.cs" />
-    <Compile Include="InstallationViewModel.cs" />
-    <Compile Include="WixBAFactory.cs" />
-    <Compile Include="WixDistribution.cs" />
     <Page Include="Styles.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -27,53 +23,24 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="PropertyNotifyBase.cs" />
-    <Compile Include="RootView.xaml.cs">
-      <DependentUpon>RootView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="RootViewModel.cs" />
-    <Compile Include="UpdateViewModel.cs" />
-    <Compile Include="WindowProperties.cs" />
-    <Compile Include="WixBA.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="WixBA.BootstrapperCore.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\logo-white-hollow.png" />
+    <Resource Include="Resources\logo-black-hollow.png" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
-    <Reference Include="WixToolset.Mba.Core">
-      <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\logo-white-hollow.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\logo-black-hollow.png" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <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'))" />
-    <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'))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/WixToolset.WixBA/packages.config b/src/WixToolset.WixBA/packages.config
deleted file mode 100644
index 6679d624..00000000
--- a/src/WixToolset.WixBA/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" />
-  <package id="WixToolset.Mba.Core" version="4.0.13" targetFramework="net45" />
-</packages>
\ No newline at end of file