WIXFEAT:3815 - Update mbahost test for BootstrapperApplicationFactoryAttribute.

5 files changed, 37 insertions, 6 deletions

diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
index 1dfd0d4d..d74d90c5 100644
--- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
+++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
@@ -13,6 +13,12 @@ namespace Native
     public ref class TestManagedBootstrapperApplication : BootstrapperApplication
     {
     public:
+        TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::Engine^ engine, WixToolset::BootstrapperCore::Command command)
+            : BootstrapperApplication(engine, command)
+        {
+
+        }
+
         virtual void Run() override
         {
         }
@@ -23,8 +29,6 @@ namespace Native
             this->Engine->Log(LogLevel::Standard, message);
         }
     };
-
-    [assembly:BootstrapperApplication(TestManagedBootstrapperApplication::typeid)];
 }
 }
 }
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h
new file mode 100644
index 00000000..9d44075b
--- /dev/null
+++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h
@@ -0,0 +1,25 @@
+#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 TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory
+    {
+    protected:
+        virtual IBootstrapperApplication^ Create(Engine^ engine, Command% command) override
+        {
+            return gcnew TestManagedBootstrapperApplication(engine, command);
+        }
+    };
+
+    [assembly:BootstrapperApplicationFactory(TestManagedBootstrapperApplicationFactory::typeid)];
+}
+}
+}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
index 557aaff0..a95a1606 100644
--- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
+++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
@@ -2,7 +2,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. -->
 <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\WixToolset.BootstrapperCore.4.0.4\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\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">
@@ -42,6 +42,7 @@
     <ClInclude Include="EngineForTest.h" />
     <ClInclude Include="precomp.h" />
     <ClInclude Include="TestManagedBootstrapperApplication.h" />
+    <ClInclude Include="TestManagedBootstrapperApplicationFactory.h" />
   </ItemGroup>
 
   <ItemGroup>
@@ -65,7 +66,7 @@
       <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>
+      <HintPath>..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\lib\net20\WixToolset.BootstrapperCore.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -82,7 +83,7 @@
       <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.BootstrapperCore.4.0.4\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\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'))" />
diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config
index c3b6551c..d534f781 100644
--- a/src/test/WixToolsetTest.MbaHost/packages.config
+++ b/src/test/WixToolsetTest.MbaHost/packages.config
@@ -9,6 +9,6 @@
   <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.BootstrapperCore" version="4.0.4" 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.h b/src/test/WixToolsetTest.MbaHost/precomp.h
index aa4b6ddc..7c451c03 100644
--- a/src/test/WixToolsetTest.MbaHost/precomp.h
+++ b/src/test/WixToolsetTest.MbaHost/precomp.h
@@ -13,3 +13,4 @@
 
 #include "EngineForTest.h"
 #include "TestManagedBootstrapperApplication.h"
+#include "TestManagedBootstrapperApplicationFactory.h"