2 files changed, 19 insertions, 7 deletions

diff --git a/src/WixToolset.WixBA/WixBA.cs b/src/WixToolset.WixBA/WixBA.cs
index fb69a346..e0444f06 100644
--- a/src/WixToolset.WixBA/WixBA.cs
+++ b/src/WixToolset.WixBA/WixBA.cs
@@ -1,6 +1,6 @@
 // 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.
 
-namespace WixToolset.UX
+namespace WixToolset.WixBA
 {
     using System;
     using System.Collections.Generic;
@@ -12,7 +12,7 @@ namespace WixToolset.UX
     using Threading = System.Windows.Threading;
     using WinForms = System.Windows.Forms;
 
-    using WixToolset.Bootstrapper;
+    using WixToolset.BootstrapperCore;
 
     /// <summary>
     /// The WiX toolset user experience.
@@ -142,7 +142,7 @@ namespace WixToolset.UX
         }
 
         /// <summary>
-        /// Thread entry point for WiX Toolset UX.
+        /// Thread entry point for WiX Toolset Bootstrapper Application.
         /// </summary>
         protected override void Run()
         {
diff --git a/src/WixToolset.WixBA/WixBA.csproj b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
index 6858b172..4ce98a03 100644
--- a/src/WixToolset.WixBA/WixBA.csproj
+++ b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -3,9 +3,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <ProjectGuid>{7C27518B-84AD-4679-8EF4-29DF552CF1AC}</ProjectGuid>
-    <AssemblyName>WixBA</AssemblyName>
+    <AssemblyName>WixToolset.WixBA</AssemblyName>
     <OutputType>Library</OutputType>
-    <RootNamespace>WixToolset.UX</RootNamespace>
+    <RootNamespace>WixToolset.WixBA</RootNamespace>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Hresult.cs" />
@@ -15,6 +16,7 @@
     <Compile Include="ProgressViewModel.cs" />
     <Compile Include="RelayCommand.cs" />
     <Compile Include="InstallationViewModel.cs" />
+    <Compile Include="WixDistribution.cs" />
     <Page Include="Styles.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -36,6 +38,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
@@ -52,7 +55,9 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
-    <ProjectReference Include="..\..\ext\BalExtension\mba\core\core.csproj" />
+    <Reference Include="WixToolset.BootstrapperCore">
+      <HintPath>..\..\packages\WixToolset.BootstrapperCore.4.0.3\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\logo-white-hollow.png" />
@@ -60,5 +65,12 @@
   <ItemGroup>
     <Resource Include="Resources\logo-black-hollow.png" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+  <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'))" />
+  </Target>
 </Project>
\ No newline at end of file