4 files changed, 25 insertions, 3 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; }
     }
 }