Integrate into latest v4 (2019/02/15).

20 files changed, 179 insertions, 44 deletions

diff --git a/src/WixToolset.WixBA/BrowserProperties.cs b/src/WixToolset.WixBA/BrowserProperties.cs
index f40d4ed9..c8fb6177 100644
--- a/src/WixToolset.WixBA/BrowserProperties.cs
+++ b/src/WixToolset.WixBA/BrowserProperties.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.Windows;
     using System.Windows.Controls;
diff --git a/src/WixToolset.WixBA/Hresult.cs b/src/WixToolset.WixBA/Hresult.cs
index 68b4c5ea..a5e552ac 100644
--- a/src/WixToolset.WixBA/Hresult.cs
+++ b/src/WixToolset.WixBA/Hresult.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;
 
diff --git a/src/WixToolset.WixBA/InstallationViewModel.cs b/src/WixToolset.WixBA/InstallationViewModel.cs
index 6bec427a..35510db4 100644
--- a/src/WixToolset.WixBA/InstallationViewModel.cs
+++ b/src/WixToolset.WixBA/InstallationViewModel.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;
@@ -10,7 +10,7 @@ namespace WixToolset.UX
     using System.Windows;
     using System.Windows.Input;
     using IO = System.IO;
-    using WixToolset.Bootstrapper;
+    using WixToolset.BootstrapperCore;
 
     /// <summary>
     /// The states of detection.
@@ -606,10 +606,10 @@ namespace WixToolset.UX
             }
 
             // If we're not in Full UI mode, we need to alert the dispatcher to stop and close the window for passive.
-            if (Bootstrapper.Display.Full != WixBA.Model.Command.Display)
+            if (Display.Full != WixBA.Model.Command.Display)
             {
                 // If its passive, send a message to the window to close.
-                if (Bootstrapper.Display.Passive == WixBA.Model.Command.Display)
+                if (Display.Passive == WixBA.Model.Command.Display)
                 {
                     WixBA.Model.Engine.Log(LogLevel.Verbose, "Automatically closing the window for non-interactive install");
                     WixBA.Dispatcher.BeginInvoke(new Action(WixBA.View.Close));
diff --git a/src/WixToolset.WixBA/Model.cs b/src/WixToolset.WixBA/Model.cs
index 9f03e95b..25415e0f 100644
--- a/src/WixToolset.WixBA/Model.cs
+++ b/src/WixToolset.WixBA/Model.cs
@@ -1,11 +1,11 @@
 // 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;
     using System.Net;
-    using WixToolset.Bootstrapper;
+    using WixToolset.BootstrapperCore;
 
     /// <summary>
     /// The model.
@@ -17,9 +17,9 @@ namespace WixToolset.UX
         private const string BurnBundleVersionVariable = "WixBundleVersion";
 
         /// <summary>
-        /// Creates a new model for the UX.
+        /// Creates a new model for the BA.
         /// </summary>
-        /// <param name="bootstrapper">Bootstrapper hosting the UX.</param>
+        /// <param name="bootstrapper">The BA.</param>
         public Model(BootstrapperApplication bootstrapper)
         {
             this.Bootstrapper = bootstrapper;
diff --git a/src/WixToolset.WixBA/NewsItem.cs b/src/WixToolset.WixBA/NewsItem.cs
index a8350104..f8bf7aed 100644
--- a/src/WixToolset.WixBA/NewsItem.cs
+++ b/src/WixToolset.WixBA/NewsItem.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;
 
diff --git a/src/WixToolset.WixBA/ProgressViewModel.cs b/src/WixToolset.WixBA/ProgressViewModel.cs
index 30aee5f1..bc0fecd0 100644
--- a/src/WixToolset.WixBA/ProgressViewModel.cs
+++ b/src/WixToolset.WixBA/ProgressViewModel.cs
@@ -5,9 +5,9 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
-using WixToolset.Bootstrapper;
+using WixToolset.BootstrapperCore;
 
-namespace WixToolset.UX
+namespace WixToolset.WixBA
 {
     public class ProgressViewModel : PropertyNotifyBase
     {
diff --git a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs b/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
index 58d88046..566bc9f2 100644
--- a/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
+++ b/src/WixToolset.WixBA/Properties/AssemblyInfo.cs
@@ -3,12 +3,12 @@
 using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using WixToolset.Bootstrapper;
-using WixToolset.UX;
+using WixToolset.BootstrapperCore;
+using WixToolset.WixBA;
 
 
-[assembly: AssemblyTitle("WixBA")]
-[assembly: AssemblyDescription("WiX User Experience")]
+[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 
@@ -17,6 +17,6 @@ using WixToolset.UX;
 [assembly: Guid("0ffc4944-9295-40b7-adac-3a6864b5219b")]
 [assembly: CLSCompliantAttribute(true)]
 
-// Identifies the class that derives from UserExperience and is the UX class that gets
+// Identifies the class that derives from BootstrapperApplication and is the BA class that gets
 // instantiated by the interop layer
 [assembly: BootstrapperApplication(typeof(WixBA))]
diff --git a/src/WixToolset.WixBA/PropertyNotifyBase.cs b/src/WixToolset.WixBA/PropertyNotifyBase.cs
index 03174306..f8264614 100644
--- a/src/WixToolset.WixBA/PropertyNotifyBase.cs
+++ b/src/WixToolset.WixBA/PropertyNotifyBase.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.ComponentModel;
diff --git a/src/WixToolset.WixBA/RelayCommand.cs b/src/WixToolset.WixBA/RelayCommand.cs
index ecc482da..d3ab2d7a 100644
--- a/src/WixToolset.WixBA/RelayCommand.cs
+++ b/src/WixToolset.WixBA/RelayCommand.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.Diagnostics;
diff --git a/src/WixToolset.WixBA/RootView.xaml b/src/WixToolset.WixBA/RootView.xaml
index bbf2f9f2..b7d535d1 100644
--- a/src/WixToolset.WixBA/RootView.xaml
+++ b/src/WixToolset.WixBA/RootView.xaml
@@ -1,10 +1,10 @@
 <?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. -->
 
-<Window x:Class="WixToolset.UX.RootView"
+<Window x:Class="WixToolset.WixBA.RootView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:ux="clr-namespace:WixToolset.UX"
+        xmlns:wixba="clr-namespace:WixToolset.WixBA"
         MinWidth="550"
         MinHeight="400"
         Width="750"
@@ -402,7 +402,7 @@
                     </Grid>
 
                     <WebBrowser DockPanel.Dock="Bottom"
-                                ux:BrowserProperties.HtmlDoc="{Binding UpdateChanges}" />
+                                wixba:BrowserProperties.HtmlDoc="{Binding UpdateChanges}" />
                 </DockPanel>
 
                 <TextBlock x:Name="DowngradeMessageTextBlk"
diff --git a/src/WixToolset.WixBA/RootView.xaml.cs b/src/WixToolset.WixBA/RootView.xaml.cs
index 1d4301f2..e1ee19db 100644
--- a/src/WixToolset.WixBA/RootView.xaml.cs
+++ b/src/WixToolset.WixBA/RootView.xaml.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.ComponentModel;
     using System.Windows;
diff --git a/src/WixToolset.WixBA/RootViewModel.cs b/src/WixToolset.WixBA/RootViewModel.cs
index 1de89adf..b90e5a4b 100644
--- a/src/WixToolset.WixBA/RootViewModel.cs
+++ b/src/WixToolset.WixBA/RootViewModel.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.Diagnostics;
@@ -8,7 +8,7 @@ namespace WixToolset.UX
     using System.Windows;
     using System.Windows.Input;
     using System.Windows.Threading;
-    using WixToolset.Bootstrapper;
+    using WixToolset.BootstrapperCore;
 
     /// <summary>
     /// The errors returned from the engine
diff --git a/src/WixToolset.WixBA/Styles.xaml b/src/WixToolset.WixBA/Styles.xaml
index 89ccd2ea..fa0afc4f 100644
--- a/src/WixToolset.WixBA/Styles.xaml
+++ b/src/WixToolset.WixBA/Styles.xaml
@@ -6,7 +6,7 @@
                     xmlns:System="clr-namespace:System;assembly=mscorlib"
                     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework"
-                    xmlns:ux="clr-namespace:WixToolset.UX">
+                    xmlns:wixba="clr-namespace:WixToolset.WixBA">
 
     <!-- Converters -->
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -173,7 +173,7 @@
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="Source" Value="{DynamicResource LogoOverLightBackground}" />
         <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=IsLightBackground, Source={x:Static ux:WindowProperties.Instance}}" Value="false">
+            <DataTrigger Binding="{Binding Path=IsLightBackground, Source={x:Static wixba:WindowProperties.Instance}}" Value="false">
                 <Setter Property="Source" Value="{DynamicResource LogoOverDarkBackground}" />
             </DataTrigger>
         </Style.Triggers>
diff --git a/src/WixToolset.WixBA/UpdateViewModel.cs b/src/WixToolset.WixBA/UpdateViewModel.cs
index 6b60112c..cb6c0ad9 100644
--- a/src/WixToolset.WixBA/UpdateViewModel.cs
+++ b/src/WixToolset.WixBA/UpdateViewModel.cs
@@ -1,11 +1,11 @@
 // 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.ComponentModel;
     using System.Windows.Input;
-    using WixToolset.Bootstrapper;
+    using WixToolset.BootstrapperCore;
 
     /// <summary>
     /// The states of the update view model.
@@ -151,7 +151,7 @@ namespace WixToolset.UX
             }
         }
 
-        private void DetectUpdateBegin(object sender, Bootstrapper.DetectUpdateBeginEventArgs e)
+        private void DetectUpdateBegin(object sender, DetectUpdateBeginEventArgs e)
         {
             // Don't check for updates if:
             //   the first check failed (no retry)
@@ -164,7 +164,7 @@ namespace WixToolset.UX
             }
         }
         
-        private void DetectUpdate(object sender, Bootstrapper.DetectUpdateEventArgs e)
+        private void DetectUpdate(object sender, DetectUpdateEventArgs e)
         {
             // The list of updates is sorted in descending version, so the first callback should be the largest update available.
             // This update should be either larger than ours (so we are out of date), the same as ours (so we are current)
@@ -186,7 +186,7 @@ namespace WixToolset.UX
             e.StopProcessingUpdates = true;
         }
 
-        private void DetectUpdateComplete(object sender, Bootstrapper.DetectUpdateCompleteEventArgs e)
+        private void DetectUpdateComplete(object sender, DetectUpdateCompleteEventArgs e)
         {
             // Failed to process an update, allow the existing bundle to still install.
             if ((UpdateState.Failed != this.State) && !Hresult.Succeeded(e.Status))
diff --git a/src/WixToolset.WixBA/WindowProperties.cs b/src/WixToolset.WixBA/WindowProperties.cs
index bead5cc1..6d1e273c 100644
--- a/src/WixToolset.WixBA/WindowProperties.cs
+++ b/src/WixToolset.WixBA/WindowProperties.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.Windows;
diff --git a/src/WixToolset.WixBA/WixBA.BootstrapperCore.config b/src/WixToolset.WixBA/WixBA.BootstrapperCore.config
index 8e1d4729..d8439232 100644
--- a/src/WixToolset.WixBA/WixBA.BootstrapperCore.config
+++ b/src/WixToolset.WixBA/WixBA.BootstrapperCore.config
@@ -3,14 +3,14 @@
 
 <configuration>
     <configSections>
-        <sectionGroup name="wix.bootstrapper" type="WixToolset.Bootstrapper.BootstrapperSectionGroup, BootstrapperCore">
-            <section name="host" type="WixToolset.Bootstrapper.HostSection, BootstrapperCore" />
+        <sectionGroup name="wix.bootstrapper" type="WixToolset.BootstrapperCore.BootstrapperSectionGroup, WixToolset.BootstrapperCore">
+            <section name="host" type="WixToolset.BootstrapperCore.HostSection, WixToolset.BootstrapperCore" />
         </sectionGroup>
     </configSections>
     <startup useLegacyV2RuntimeActivationPolicy="true">
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
     <wix.bootstrapper>
-        <host assemblyName="WixBA" />
+        <host assemblyName="WixToolset.WixBA" />
     </wix.bootstrapper>
 </configuration>
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/WixDistribution.cs b/src/WixToolset.WixBA/WixDistribution.cs
new file mode 100644
index 00000000..6b7ed4f0
--- /dev/null
+++ b/src/WixToolset.WixBA/WixDistribution.cs
@@ -0,0 +1,118 @@
+// 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.Diagnostics;
+using System.Reflection;
+using System.Resources;
+
+[assembly: AssemblyCompany(".NET Foundation")]
+[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")]
+[assembly: AssemblyProduct("WiX Toolset")]
+
+#if DEBUG
+    [assembly: AssemblyConfiguration("DEBUG")]
+#else
+    [assembly: AssemblyConfiguration("")]
+#endif
+[assembly: NeutralResourcesLanguage("en-US")]
+
+namespace WixToolset
+{
+    /// <summary>
+    /// Distribution specific strings.
+    /// </summary>
+    internal static class WixDistribution
+    {
+        /// <summary>
+        /// News URL for the distribution.
+        /// </summary>
+        public static string NewsUrl = "http://wixtoolset.org/news/";
+
+        /// <summary>
+        /// Short product name for the distribution.
+        /// </summary>
+        public static string ShortProduct = "WiX Toolset";
+
+        /// <summary>
+        /// Support URL for the distribution.
+        /// </summary>
+        public static string SupportUrl = "http://wixtoolset.org/";
+
+        /// <summary>
+        /// Telemetry URL format for the distribution.
+        /// </summary>
+        public static string TelemetryUrlFormat = "http://wixtoolset.org/telemetry/v{0}/?r={1}";
+
+        /// <summary>
+        /// VS Extensions Landing page Url for the distribution.
+        /// </summary>
+        public static string VSExtensionsLandingUrl = "http://wixtoolset.org/releases/";
+
+        public static string ReplacePlaceholders(string original, Assembly assembly)
+        {
+            if (null != assembly)
+            {
+                FileVersionInfo fileVersion = FileVersionInfo.GetVersionInfo(assembly.Location);
+
+                original = original.Replace("[FileComments]", fileVersion.Comments);
+                original = original.Replace("[FileCopyright]", fileVersion.LegalCopyright);
+                original = original.Replace("[FileProductName]", fileVersion.ProductName);
+                original = original.Replace("[FileVersion]", fileVersion.FileVersion);
+
+                if (original.Contains("[FileVersionMajorMinor]"))
+                {
+                    Version version = new Version(fileVersion.FileVersion);
+                    original = original.Replace("[FileVersionMajorMinor]", String.Concat(version.Major, ".", version.Minor));
+                }
+
+                AssemblyCompanyAttribute company;
+                if (WixDistribution.TryGetAttribute(assembly, out company))
+                {
+                    original = original.Replace("[AssemblyCompany]", company.Company);
+                }
+
+                AssemblyCopyrightAttribute copyright;
+                if (WixDistribution.TryGetAttribute(assembly, out copyright))
+                {
+                    original = original.Replace("[AssemblyCopyright]", copyright.Copyright);
+                }
+
+                AssemblyDescriptionAttribute description;
+                if (WixDistribution.TryGetAttribute(assembly, out description))
+                {
+                    original = original.Replace("[AssemblyDescription]", description.Description);
+                }
+
+                AssemblyProductAttribute product;
+                if (WixDistribution.TryGetAttribute(assembly, out product))
+                {
+                    original = original.Replace("[AssemblyProduct]", product.Product);
+                }
+
+                AssemblyTitleAttribute title;
+                if (WixDistribution.TryGetAttribute(assembly, out title))
+                {
+                    original = original.Replace("[AssemblyTitle]", title.Title);
+                }
+            }
+
+            original = original.Replace("[NewsUrl]", WixDistribution.NewsUrl);
+            original = original.Replace("[ShortProduct]", WixDistribution.ShortProduct);
+            original = original.Replace("[SupportUrl]", WixDistribution.SupportUrl);
+            return original;
+        }
+
+        private static bool TryGetAttribute<T>(Assembly assembly, out T attribute) where T : Attribute
+        {
+            attribute = null;
+
+            object[] customAttributes = assembly.GetCustomAttributes(typeof(T), false);
+            if (null != customAttributes && 0 < customAttributes.Length)
+            {
+                attribute = customAttributes[0] as T;
+            }
+
+            return null != attribute;
+        }
+    }
+}
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
diff --git a/src/WixToolset.WixBA/packages.config b/src/WixToolset.WixBA/packages.config
new file mode 100644
index 00000000..e1757432
--- /dev/null
+++ b/src/WixToolset.WixBA/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="net45" />
+</packages>
\ No newline at end of file