Integrate into latest v4.

6 files changed, 78 insertions, 55 deletions

diff --git a/src/mbahost/host.vcxproj b/src/mbahost/host.vcxproj
deleted file mode 100644
index a4c3ea16..00000000
--- a/src/mbahost/host.vcxproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>mbahost</TargetName>
-    <ProjectModuleDefinitionFile>host.def</ProjectModuleDefinitionFile>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
-
-  <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc;$(BaseIntermediateOutputPath)\core</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>dutil.lib;balutil.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ClCompile Include="host.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="IBootstrapperApplicationFactory.h" />
-    <ClInclude Include="precomp.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="host.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="host.rc" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\core\core.csproj" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
-</Project>
diff --git a/src/mbahost/host.cpp b/src/mbahost/mbahost.cpp
index 694db357..d3737c06 100644
--- a/src/mbahost/host.cpp
+++ b/src/mbahost/mbahost.cpp
@@ -1,7 +1,7 @@
 // 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.
 
 #include "precomp.h"
-#include <BootstrapperCore.h> // includes the generated assembly name macros.
+#include <WixToolset.BootstrapperCore.h> // includes the generated assembly name macros.
 #include "BalBaseBootstrapperApplicationProc.h"
 
 static const DWORD NET452_RELEASE = 379893;
@@ -185,7 +185,7 @@ static HRESULT GetAppDomain(
     hr = GetAppBase(&sczAppBase);
     ExitOnFailure(hr, "Failed to get the host base path.");
 
-    hr = PathConcat(sczAppBase, L"BootstrapperCore.config", &sczConfigPath);
+    hr = PathConcat(sczAppBase, L"WixToolset.BootstrapperCore.config", &sczConfigPath);
     ExitOnFailure(hr, "Failed to get the full path to the application configuration file.");
 
     // Check that the supported framework is installed.
@@ -554,10 +554,10 @@ static HRESULT CreateManagedBootstrapperApplicationFactory(
 
     ::VariantInit(&vtBAFactory);
 
-    bstrAssemblyName = ::SysAllocString(MUX_ASSEMBLY_FULL_NAME);
+    bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME);
     ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory.");
 
-    bstrTypeName = ::SysAllocString(L"WixToolset.Bootstrapper.BootstrapperApplicationFactory");
+    bstrTypeName = ::SysAllocString(L"WixToolset.BootstrapperCore.BootstrapperApplicationFactory");
     ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory.");
 
     hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj);
diff --git a/src/mbahost/host.def b/src/mbahost/mbahost.def
index 4488df94..4488df94 100644
--- a/src/mbahost/host.def
+++ b/src/mbahost/mbahost.def
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj
new file mode 100644
index 00000000..d40333ab
--- /dev/null
+++ b/src/mbahost/mbahost.vcxproj
@@ -0,0 +1,64 @@
+<?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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <TargetName>mbahost</TargetName>
+    <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>shlwapi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="mbahost.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="mbahost.def" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props'))" />
+    <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>
diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config
new file mode 100644
index 00000000..41ba2f12
--- /dev/null
+++ b/src/mbahost/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/mbahost/precomp.cpp b/src/mbahost/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/mbahost/precomp.cpp
@@ -0,0 +1,3 @@
+// 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.
+
+#include "precomp.h"