From 24379873f589cff33965f1104041f61c0c4503e0 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 22 Dec 2019 10:31:33 +1100
Subject: Move the responsibility of wrapping the binary interfaces from
 mbahost to the new mbanative dll of WixToolset.Mba.Core.

---
 src/balutil/balutil.vcxproj                       | 6 ++++--
 src/balutil/inc/IBootstrapperApplicationFactory.h | 5 ++---
 src/balutil/packages.config                       | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/balutil')

diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 42aa909e..9d7dc0a5 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.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.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props')" />
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
@@ -70,7 +70,9 @@
     <ClInclude Include="inc\balretry.h" />
     <ClInclude Include="inc\balutil.h" />
     <ClInclude Include="inc\IBAFunctions.h" />
+    <ClInclude Include="inc\IBootstrapperApplication.h" />
     <ClInclude Include="inc\IBootstrapperApplicationFactory.h" />
+    <ClInclude Include="inc\IBootstrapperEngine.h" />
     <ClInclude Include="precomp.h" />
   </ItemGroup>
 
@@ -88,7 +90,7 @@
     <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.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.8\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props'))" />
     <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\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>
diff --git a/src/balutil/inc/IBootstrapperApplicationFactory.h b/src/balutil/inc/IBootstrapperApplicationFactory.h
index e29c23bc..fd603e50 100644
--- a/src/balutil/inc/IBootstrapperApplicationFactory.h
+++ b/src/balutil/inc/IBootstrapperApplicationFactory.h
@@ -7,8 +7,7 @@
 DECLARE_INTERFACE_IID_(IBootstrapperApplicationFactory, IUnknown, "2965A12F-AC7B-43A0-85DF-E4B2168478A4")
 {
     STDMETHOD(Create)(
-        __in IBootstrapperEngine* pEngine,
-        __in const BOOTSTRAPPER_COMMAND *pCommand,
-        __out IBootstrapperApplication **ppApplication
+        __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
+        __inout BOOTSTRAPPER_CREATE_RESULTS *pResults
         );
 };
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 769c5a6e..d747d6a9 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.8" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.10" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb