11 files changed, 361 insertions, 6 deletions

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 0e00132b..a90fec2c 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -11,6 +11,10 @@
   <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
     <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(CLRSupport)'=='true' ">
+    <DisableSpecificCompilerWarnings>4564;4691</DisableSpecificCompilerWarnings>
+  </PropertyGroup>
 
   <ItemDefinitionGroup>
     <ClCompile>
@@ -95,10 +99,4 @@
       <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
-    <Link>
-      <KeyFile>$(LinkKeyFile)</KeyFile>
-      <DelaySign>$(LinkDelaySign)</DelaySign>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>
diff --git a/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml b/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml
new file mode 100644
index 00000000..7c4169b1
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml
diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp b/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp
new file mode 100644
index 00000000..b2567a7b
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp
@@ -0,0 +1,45 @@
+// 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"
+
+static HRESULT BAEngineLog(
+    __in BOOTSTRAPPER_ENGINE_CONTEXT* pContext,
+    __in BAENGINE_LOG_ARGS* pArgs,
+    __in BAENGINE_LOG_RESULTS* /*pResults*/
+)
+{
+    HRESULT hr = S_OK;
+
+    pContext->pfnLog(pArgs->wzMessage);
+
+    return hr;
+}
+
+HRESULT WINAPI EngineForTestProc(
+    __in BOOTSTRAPPER_ENGINE_MESSAGE message,
+    __in const LPVOID pvArgs,
+    __inout LPVOID pvResults,
+    __in_opt LPVOID pvContext
+)
+{
+    HRESULT hr = S_OK;
+    BOOTSTRAPPER_ENGINE_CONTEXT* pContext = reinterpret_cast<BOOTSTRAPPER_ENGINE_CONTEXT*>(pvContext);
+
+    if (!pContext || !pvArgs || !pvResults)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+
+    switch (message)
+    {
+    case BOOTSTRAPPER_ENGINE_MESSAGE_LOG:
+        hr = BAEngineLog(pContext, reinterpret_cast<BAENGINE_LOG_ARGS*>(pvArgs), reinterpret_cast<BAENGINE_LOG_RESULTS*>(pvResults));
+        break;
+    default:
+        hr = E_NOTIMPL;
+        break;
+    }
+
+LExit:
+    return hr;
+}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.h b/src/test/WixToolsetTest.MbaHost/EngineForTest.h
new file mode 100644
index 00000000..6058e67c
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/EngineForTest.h
@@ -0,0 +1,63 @@
+#pragma once
+// 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.
+
+HRESULT WINAPI EngineForTestProc(
+    __in BOOTSTRAPPER_ENGINE_MESSAGE message,
+    __in const LPVOID pvArgs,
+    __inout LPVOID pvResults,
+    __in_opt LPVOID pvContext
+);
+
+typedef void(WINAPI *PFN_TEST_LOG_PROC)(
+    __in LPCWSTR sczMessage
+    );
+
+struct BOOTSTRAPPER_ENGINE_CONTEXT
+{
+    PFN_TEST_LOG_PROC pfnLog;
+};
+
+namespace WixToolsetTest
+{
+namespace MbaHost
+{
+namespace Native
+{
+    using namespace System;
+    using namespace System::Collections::Generic;
+    using namespace System::Runtime::InteropServices;
+
+    public ref class EngineForTest
+    {
+    private:
+        delegate void LogDelegate(LPCWSTR);
+        LogDelegate^ _logDelegate;
+        List<String^>^ _messages;
+
+        void Log(LPCWSTR sczMessage)
+        {
+            String^ message = gcnew String(sczMessage);
+            System::Diagnostics::Debug::WriteLine(message);
+            _messages->Add(message);
+        }
+    public:
+        EngineForTest()
+        {
+            _logDelegate = gcnew LogDelegate(this, &EngineForTest::Log);
+            _messages = gcnew List<String^>();
+        }
+
+        List<String^>^ GetLogMessages()
+        {
+            return _messages;
+        }
+
+        PFN_TEST_LOG_PROC GetTestLogProc()
+        {
+            IntPtr functionPointer = Marshal::GetFunctionPointerForDelegate(_logDelegate);
+            return static_cast<PFN_TEST_LOG_PROC>(functionPointer.ToPointer());
+        }
+    };
+}
+}
+}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp b/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp
new file mode 100644
index 00000000..9328aacf
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp
@@ -0,0 +1,70 @@
+// 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"
+
+namespace WixToolsetTest
+{
+namespace MbaHost
+{
+namespace Native
+{
+    using namespace System;
+    using namespace Xunit;
+
+    public ref class MbaHostFixture
+    {
+    public:
+        [Fact]
+        void CanLoadManagedBootstrapperApplication()
+        {
+            HMODULE hBAModule = NULL;
+            PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL;
+            HRESULT hr = S_OK;
+
+            EngineForTest^ engine = gcnew EngineForTest();
+            BOOTSTRAPPER_ENGINE_CONTEXT engineContext = { };
+            engineContext.pfnLog = engine->GetTestLogProc();
+
+            LogInitialize(::GetModuleHandleW(NULL));
+
+            hr = LogOpen(NULL, L"MbaHostUnitTest", NULL, L"txt", FALSE, FALSE, NULL);
+            Assert::Equal(S_OK, hr);
+
+            BOOTSTRAPPER_COMMAND command = { };
+            BOOTSTRAPPER_CREATE_ARGS args = { };
+            BOOTSTRAPPER_CREATE_RESULTS results = { };
+
+            args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS);
+            args.pCommand = &command;
+            args.pfnBootstrapperEngineProc = EngineForTestProc;
+            args.pvBootstrapperEngineProcContext = &engineContext;
+            args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1);
+
+            results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS);
+
+            hBAModule = ::LoadLibraryExW(L"mbahost.dll", NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+            Assert::NotEqual(NULL, (int)hBAModule);
+
+            pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(hBAModule, "BootstrapperApplicationCreate");
+            Assert::NotEqual(NULL, (int)pfnCreate);
+
+            hr = pfnCreate(&args, &results);
+            Assert::Equal(S_OK, hr);
+
+            BA_ONSHUTDOWN_ARGS shutdownArgs = { };
+            BA_ONSHUTDOWN_RESULTS shutdownResults = { };
+            shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS);
+            shutdownResults.action = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER;
+            shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS);
+            hr = results.pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, results.pvBootstrapperApplicationProcContext);
+            Assert::Equal(S_OK, hr);
+
+            List<String^>^ logMessages = engine->GetLogMessages();
+            Assert::Equal(2, logMessages->Count);
+            Assert::Equal("Loading managed bootstrapper application.", logMessages[0]);
+            Assert::Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
+        }
+    };
+}
+}
+}
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
new file mode 100644
index 00000000..1dfd0d4d
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
@@ -0,0 +1,30 @@
+#pragma once
+// 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 WixToolsetTest
+{
+namespace MbaHost
+{
+namespace Native
+{
+    using namespace System;
+    using namespace WixToolset::BootstrapperCore;
+
+    public ref class TestManagedBootstrapperApplication : BootstrapperApplication
+    {
+    public:
+        virtual void Run() override
+        {
+        }
+
+        virtual void OnShutdown(ShutdownEventArgs^ e) override
+        {
+            String^ message = "Shutdown," + e->Action.ToString() + "," + e->HResult.ToString();
+            this->Engine->Log(LogLevel::Standard, message);
+        }
+    };
+
+    [assembly:BootstrapperApplication(TestManagedBootstrapperApplication::typeid)];
+}
+}
+}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config b/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config
new file mode 100644
index 00000000..b4c67a82
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config
@@ -0,0 +1,26 @@
+<?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. -->
+
+
+<configuration>
+    <configSections>
+        <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" />
+        <supportedRuntime version="v2.0.50727" />
+    </startup>
+    <wix.bootstrapper>
+        <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. -->
+        <!--
+        <supportedFramework version="v4\Client" />
+        <supportedFramework version="v3.5" />
+        <supportedFramework version="v3.0" />
+        -->
+
+        <!-- Example only. Replace the host/@assemblyName attribute with assembly that implements BootstrapperApplication. -->
+        <host assemblyName="WixToolsetTest.MbaHost" />
+    </wix.bootstrapper>
+</configuration>
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
new file mode 100644
index 00000000..557aaff0
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
@@ -0,0 +1,91 @@
+<?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.3\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
+  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\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">
+    <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
+    <ProjectGuid>{8C131CB9-7B1C-4B06-A328-E69CE9EDC763}</ProjectGuid>
+    <RootNamespace>WixToolsetTest.MbaHost</RootNamespace>
+    <Keyword>ManagedCProj</Keyword>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="EngineForTest.cpp" />
+    <ClCompile Include="MbaHostFixture.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="EngineForTest.h" />
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="TestManagedBootstrapperApplication.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+    <Content Include="BootstrapperApplicationData.xml" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="WixToolset.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="xunit.abstractions">
+      <HintPath>..\..\..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.assert">
+      <HintPath>..\..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.core">
+      <HintPath>..\..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.execution.desktop">
+      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="WixToolset.BootstrapperCore">
+      <HintPath>..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\mbahost\mbahost.vcxproj">
+      <Project>{12c87c77-3547-44f8-8134-29bc915cb19d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.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\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props'))" />
+  </Target>
+  <Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
+</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config
new file mode 100644
index 00000000..c3b6551c
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/packages.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xunit" version="2.4.0" targetFramework="net461" />
+  <package id="xunit.abstractions" version="2.0.2" targetFramework="net461" />
+  <package id="xunit.analyzers" version="0.10.0" targetFramework="net461" />
+  <package id="xunit.assert" version="2.4.0" targetFramework="net461" />
+  <package id="xunit.core" version="2.4.0" targetFramework="net461" />
+  <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net461" />
+  <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net461" />
+  <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net461" />
+  <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="net461" />
+  <package id="WixToolset.DUtil" version="4.0.16" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/precomp.cpp b/src/test/WixToolsetTest.MbaHost/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/test/WixToolsetTest.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"
diff --git a/src/test/WixToolsetTest.MbaHost/precomp.h b/src/test/WixToolsetTest.MbaHost/precomp.h
new file mode 100644
index 00000000..aa4b6ddc
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/precomp.h
@@ -0,0 +1,15 @@
+#pragma once
+// 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 <windows.h>
+#include <msiquery.h>
+
+#include "dutil.h"
+#include "logutil.h"
+
+#include "BootstrapperEngine.h"
+#include "BootstrapperApplication.h"
+
+#include "EngineForTest.h"
+#include "TestManagedBootstrapperApplication.h"