Upgrade to latest BootstrapperCore.
Sean Hall committed
Mar 30, 2020 at 18:51 UTC
83e4e5d759903e70a9bbf75d4d084bfda49e5877
10 files changed
+39
-16
src/WixToolset.Mba.Core/BootstrapperApplicationData.cs
+1
-1
@@ -9,7 +9,7 @@ namespace WixToolset.Mba.Core
9
public class BootstrapperApplicationData : IBootstrapperApplicationData
10
{
11
public const string DefaultFileName = "BootstrapperApplicationData.xml";
12
- public const string XMLNamespace = "http://wixtoolset.org/schemas/v4/2010/BootstrapperApplicationData";
12
+ public const string XMLNamespace = "http://wixtoolset.org/schemas/v4/BootstrapperApplicationData";
13
14
public static readonly DirectoryInfo DefaultFolder;
15
public static readonly FileInfo DefaultFile;
src/WixToolset.Mba.Core/BootstrapperCommand.cs
+9
-1
@@ -20,7 +20,9 @@ namespace WixToolset.Mba.Core
20
IntPtr splashScreen,
21
RelationType relation,
22
bool passthrough,
23
- string layoutDirectory)
23
+ string layoutDirectory,
24
+ string bootstrapperWorkingFolder,
25
+ string bootstrapperApplicationDataPath)
26
{
27
this.Action = action;
28
this.Display = display;
@@ -32,6 +34,8 @@ namespace WixToolset.Mba.Core
34
this.Relation = relation;
35
this.Passthrough = passthrough;
36
this.LayoutDirectory = layoutDirectory;
37
+ this.BootstrapperWorkingFolder = bootstrapperWorkingFolder;
38
+ this.BootstrapperApplicationDataPath = bootstrapperApplicationDataPath;
39
}
40
41
public LaunchAction Action { get; }
@@ -54,6 +58,10 @@ namespace WixToolset.Mba.Core
58
59
public string LayoutDirectory { get; }
60
61
+ public string BootstrapperWorkingFolder { get; }
62
+
63
+ public string BootstrapperApplicationDataPath { get; }
64
+
65
/// <summary>
66
/// Gets the command line arguments as a string array.
67
/// </summary>
src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
+5
-1
@@ -34,6 +34,8 @@ namespace WixToolset.Mba.Core
34
[MarshalAs(UnmanagedType.I4)] private readonly RelationType relation;
35
[MarshalAs(UnmanagedType.Bool)] private readonly bool passthrough;
36
[MarshalAs(UnmanagedType.LPWStr)] private readonly string wzLayoutDirectory;
37
+ [MarshalAs(UnmanagedType.LPWStr)] private readonly string wzBootstrapperWorkingFolder;
38
+ [MarshalAs(UnmanagedType.LPWStr)] private readonly string wzBootstrapperApplicationDataPath;
39
40
public IBootstrapperCommand GetBootstrapperCommand()
41
{
@@ -47,7 +49,9 @@ namespace WixToolset.Mba.Core
49
this.hwndSplashScreen,
50
this.relation,
51
this.passthrough,
50
- this.wzLayoutDirectory);
52
+ this.wzLayoutDirectory,
53
+ this.wzBootstrapperWorkingFolder,
54
+ this.wzBootstrapperApplicationDataPath);
55
}
56
}
57
src/WixToolset.Mba.Core/IBootstrapperCommand.cs
+10
@@ -59,5 +59,15 @@ namespace WixToolset.Mba.Core
59
/// Gets layout directory.
60
/// </summary>
61
string LayoutDirectory { get; }
62
+
63
+ /// <summary>
64
+ /// Gets bootstrapper working folder.
65
+ /// </summary>
66
+ string BootstrapperWorkingFolder { get; }
67
+
68
+ /// <summary>
69
+ /// Gets path to BootstrapperApplicationData.xml.
70
+ /// </summary>
71
+ string BootstrapperApplicationDataPath { get; }
72
}
73
}
src/balutil/balutil.vcxproj
+2
-2
@@ -2,7 +2,7 @@
2
<!-- 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. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <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')" />
5
+ <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')" />
6
<Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
7
8
<ItemGroup Label="ProjectConfigurations">
@@ -90,7 +90,7 @@
90
<PropertyGroup>
91
<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>
92
</PropertyGroup>
93
- <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'))" />
93
+ <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'))" />
94
<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'))" />
95
<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'))" />
96
</Target>
src/balutil/packages.config
+1
-1
@@ -1,6 +1,6 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.12" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
5
<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
6
</packages>
\ No newline at end of file
src/balutil/precomp.h
+3
-2
@@ -16,8 +16,9 @@
16
#include <thmutil.h>
17
#include <xmlutil.h>
18
19
-#include "BootstrapperEngine.h"
20
-#include "BootstrapperApplication.h"
19
+#include <BootstrapperEngine.h>
20
+#include <BootstrapperApplication.h>
21
+
22
#include "IBootstrapperEngine.h"
23
#include "IBootstrapperApplication.h"
24
src/mbanative/mbanative.vcxproj
+2
-2
@@ -2,7 +2,7 @@
2
<!-- 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. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <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')" />
5
+ <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')" />
6
<Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
7
8
<ItemGroup Label="ProjectConfigurations">
@@ -69,7 +69,7 @@
69
<PropertyGroup>
70
<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>
71
</PropertyGroup>
72
- <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'))" />
72
+ <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'))" />
73
<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'))" />
74
<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'))" />
75
</Target>
src/mbanative/packages.config
+1
-1
@@ -1,6 +1,6 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.12" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
5
<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
6
</packages>
\ No newline at end of file
src/mbanative/precomp.h
+5
-5
@@ -7,9 +7,9 @@
7
8
#include <dutil.h>
9
10
-#include "BootstrapperEngine.h"
11
-#include "BootstrapperApplication.h"
12
-#include "IBootstrapperEngine.h"
13
-#include "IBootstrapperApplication.h"
10
+#include <BootstrapperEngine.h>
11
+#include <BootstrapperApplication.h>
12
15
-#include "balutil.h"
13
+#include <IBootstrapperEngine.h>
14
+#include <IBootstrapperApplication.h>
15
+#include <balutil.h>