From 83e4e5d759903e70a9bbf75d4d084bfda49e5877 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 30 Mar 2020 18:51:48 +1000
Subject: Upgrade to latest BootstrapperCore.

---
 src/WixToolset.Mba.Core/BootstrapperApplicationData.cs     |  2 +-
 src/WixToolset.Mba.Core/BootstrapperCommand.cs             | 10 +++++++++-
 src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs |  6 +++++-
 src/WixToolset.Mba.Core/IBootstrapperCommand.cs            | 10 ++++++++++
 src/balutil/balutil.vcxproj                                |  4 ++--
 src/balutil/packages.config                                |  2 +-
 src/balutil/precomp.h                                      |  5 +++--
 src/mbanative/mbanative.vcxproj                            |  4 ++--
 src/mbanative/packages.config                              |  2 +-
 src/mbanative/precomp.h                                    | 10 +++++-----
 10 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/WixToolset.Mba.Core/BootstrapperApplicationData.cs b/src/WixToolset.Mba.Core/BootstrapperApplicationData.cs
index d6d590ba..05672f1b 100644
--- a/src/WixToolset.Mba.Core/BootstrapperApplicationData.cs
+++ b/src/WixToolset.Mba.Core/BootstrapperApplicationData.cs
@@ -9,7 +9,7 @@ namespace WixToolset.Mba.Core
     public class BootstrapperApplicationData : IBootstrapperApplicationData
     {
         public const string DefaultFileName = "BootstrapperApplicationData.xml";
-        public const string XMLNamespace = "http://wixtoolset.org/schemas/v4/2010/BootstrapperApplicationData";
+        public const string XMLNamespace = "http://wixtoolset.org/schemas/v4/BootstrapperApplicationData";
 
         public static readonly DirectoryInfo DefaultFolder;
         public static readonly FileInfo DefaultFile;
diff --git a/src/WixToolset.Mba.Core/BootstrapperCommand.cs b/src/WixToolset.Mba.Core/BootstrapperCommand.cs
index 6854e9ae..42d19bf9 100644
--- a/src/WixToolset.Mba.Core/BootstrapperCommand.cs
+++ b/src/WixToolset.Mba.Core/BootstrapperCommand.cs
@@ -20,7 +20,9 @@ namespace WixToolset.Mba.Core
             IntPtr splashScreen,
             RelationType relation,
             bool passthrough,
-            string layoutDirectory)
+            string layoutDirectory,
+            string bootstrapperWorkingFolder,
+            string bootstrapperApplicationDataPath)
         {
             this.Action = action;
             this.Display = display;
@@ -32,6 +34,8 @@ namespace WixToolset.Mba.Core
             this.Relation = relation;
             this.Passthrough = passthrough;
             this.LayoutDirectory = layoutDirectory;
+            this.BootstrapperWorkingFolder = bootstrapperWorkingFolder;
+            this.BootstrapperApplicationDataPath = bootstrapperApplicationDataPath;
         }
 
         public LaunchAction Action { get; }
@@ -54,6 +58,10 @@ namespace WixToolset.Mba.Core
 
         public string LayoutDirectory { get; }
 
+        public string BootstrapperWorkingFolder { get; }
+
+        public string BootstrapperApplicationDataPath { get; }
+
         /// <summary>
         /// Gets the command line arguments as a string array.
         /// </summary>
diff --git a/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
index 700f0888..d3087717 100644
--- a/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
+++ b/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
@@ -34,6 +34,8 @@ namespace WixToolset.Mba.Core
         [MarshalAs(UnmanagedType.I4)] private readonly RelationType relation;
         [MarshalAs(UnmanagedType.Bool)] private readonly bool passthrough;
         [MarshalAs(UnmanagedType.LPWStr)] private readonly string wzLayoutDirectory;
+        [MarshalAs(UnmanagedType.LPWStr)] private readonly string wzBootstrapperWorkingFolder;
+        [MarshalAs(UnmanagedType.LPWStr)] private readonly string wzBootstrapperApplicationDataPath;
 
         public IBootstrapperCommand GetBootstrapperCommand()
         {
@@ -47,7 +49,9 @@ namespace WixToolset.Mba.Core
                 this.hwndSplashScreen,
                 this.relation,
                 this.passthrough,
-                this.wzLayoutDirectory);
+                this.wzLayoutDirectory,
+                this.wzBootstrapperWorkingFolder,
+                this.wzBootstrapperApplicationDataPath);
         }
     }
 
diff --git a/src/WixToolset.Mba.Core/IBootstrapperCommand.cs b/src/WixToolset.Mba.Core/IBootstrapperCommand.cs
index 675abdf9..889db529 100644
--- a/src/WixToolset.Mba.Core/IBootstrapperCommand.cs
+++ b/src/WixToolset.Mba.Core/IBootstrapperCommand.cs
@@ -59,5 +59,15 @@ namespace WixToolset.Mba.Core
         /// Gets layout directory.
         /// </summary>
         string LayoutDirectory { get; }
+
+        /// <summary>
+        /// Gets bootstrapper working folder.
+        /// </summary>
+        string BootstrapperWorkingFolder { get; }
+
+        /// <summary>
+        /// Gets path to BootstrapperApplicationData.xml.
+        /// </summary>
+        string BootstrapperApplicationDataPath { get; }
     }
 }
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 134bc2f6..ce109d36 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.12\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.12\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\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">
@@ -90,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.12\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.12\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\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/packages.config b/src/balutil/packages.config
index 01a9390c..75a6476b 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.12" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/balutil/precomp.h b/src/balutil/precomp.h
index 89607416..c500060a 100644
--- a/src/balutil/precomp.h
+++ b/src/balutil/precomp.h
@@ -16,8 +16,9 @@
 #include <thmutil.h>
 #include <xmlutil.h>
 
-#include "BootstrapperEngine.h"
-#include "BootstrapperApplication.h"
+#include <BootstrapperEngine.h>
+#include <BootstrapperApplication.h>
+
 #include "IBootstrapperEngine.h"
 #include "IBootstrapperApplication.h"
 
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index 4a9b91f6..605cc535 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.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.12\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.12\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\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">
@@ -69,7 +69,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.12\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.12\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\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/mbanative/packages.config b/src/mbanative/packages.config
index 01a9390c..75a6476b 100644
--- a/src/mbanative/packages.config
+++ b/src/mbanative/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.12" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/mbanative/precomp.h b/src/mbanative/precomp.h
index 54d8cb08..d19b4695 100644
--- a/src/mbanative/precomp.h
+++ b/src/mbanative/precomp.h
@@ -7,9 +7,9 @@
 
 #include <dutil.h>
 
-#include "BootstrapperEngine.h"
-#include "BootstrapperApplication.h"
-#include "IBootstrapperEngine.h"
-#include "IBootstrapperApplication.h"
+#include <BootstrapperEngine.h>
+#include <BootstrapperApplication.h>
 
-#include "balutil.h"
+#include <IBootstrapperEngine.h>
+#include <IBootstrapperApplication.h>
+#include <balutil.h>
-- 
cgit v1.2.3-55-g6feb