Upgrade to latest dependencies. Stop skipping CanBuildUsingWixStdBa. Fix memory leak in wixstdba.
Upgrade to latest dependencies. Stop skipping CanBuildUsingWixStdBa. Fix memory leak in wixstdba.
Sean Hall committed
Mar 30, 2020 at 19:25 UTC
d5b89ecb2ba931cd5429e00a78b9457f8a63c6d2
20 files changed
+50
-42
src/Samples/bafunctions/bafunctions.vcxproj
+4
-4
@@ -2,8 +2,8 @@
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.BalUtil.4.0.13\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" />
5
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" />
6
+ <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')" />
7
<Import Project="..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
@@ -57,8 +57,8 @@
57
<PropertyGroup>
58
<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>
59
</PropertyGroup>
60
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props'))" />
61
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props'))" />
60
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props'))" />
61
+ <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'))" />
62
<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'))" />
63
<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'))" />
64
</Target>
src/Samples/bafunctions/packages.config
+2
-2
@@ -1,7 +1,7 @@
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.11" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.13" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.16" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+1
-1
@@ -44,7 +44,7 @@
44
<Reference Include="System.Data" />
45
<Reference Include="System.Xml" />
46
<Reference Include="WixToolset.Mba.Core">
47
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll</HintPath>
47
+ <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll</HintPath>
48
</Reference>
49
</ItemGroup>
50
<ItemGroup>
src/WixToolset.Mba.Host/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
4
- <package id="WixToolset.Mba.Core" version="4.0.13" targetFramework="net20" />
4
+ <package id="WixToolset.Mba.Core" version="4.0.16" targetFramework="net20" />
5
</packages>
\ No newline at end of file
src/mbahost/mbahost.vcxproj
+4
-4
@@ -2,8 +2,8 @@
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.BalUtil.4.0.13\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" />
5
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" />
6
+ <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')" />
7
<Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
@@ -68,8 +68,8 @@
68
<PropertyGroup>
69
<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>
70
</PropertyGroup>
71
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props'))" />
72
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props'))" />
71
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.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/mbahost/packages.config
+2
-2
@@ -1,7 +1,7 @@
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.11" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.13" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.16" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
+3
-1
@@ -9,7 +9,7 @@ namespace WixToolsetTest.Bal
9
10
public class BalExtensionFixture
11
{
12
- [Fact(Skip = "Test demonstrates failure")]
12
+ [Fact]
13
public void CanBuildUsingWixStdBa()
14
{
15
using (var fs = new DisposableFileSystem())
@@ -17,12 +17,14 @@ namespace WixToolsetTest.Bal
17
var baseFolder = fs.GetFolder();
18
var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
19
var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa");
20
+ var intermediateFolder = Path.Combine(baseFolder, "obj");
21
22
var compileResult = WixRunner.Execute(new[]
23
{
24
"build",
25
Path.Combine(bundleSourceFolder, "Bundle.wxs"),
26
"-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
27
+ "-intermediateFolder", intermediateFolder,
28
"-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"),
29
"-o", bundleFile,
30
});
src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+3
-3
@@ -3,7 +3,7 @@
3
4
5
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6
- <Import Project="..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" />
6
+ <Import Project="..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props')" />
7
<PropertyGroup>
8
<ProjectGuid>{CC4236FC-226E-4232-AB50-24CBEC4D314D}</ProjectGuid>
9
<AssemblyName>Example.FullFramework2MBA</AssemblyName>
@@ -40,7 +40,7 @@
40
<Reference Include="System.Data" />
41
<Reference Include="System.Xml" />
42
<Reference Include="WixToolset.Mba.Core">
43
- <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll</HintPath>
43
+ <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll</HintPath>
44
</Reference>
45
</ItemGroup>
46
<ItemGroup>
@@ -67,7 +67,7 @@
67
<PropertyGroup>
68
<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>
69
</PropertyGroup>
70
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props'))" />
70
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props'))" />
71
<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'))" />
72
</Target>
73
src/test/examples/FullFramework2MBA/packages.config
+1
-1
@@ -1,4 +1,4 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
- <package id="WixToolset.Mba.Core" version="4.0.13" targetFramework="net461" />
3
+ <package id="WixToolset.Mba.Core" version="4.0.16" targetFramework="net461" />
4
</packages>
\ No newline at end of file
src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+1
-1
@@ -7,7 +7,7 @@
7
8
<ItemGroup>
9
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
10
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.13" PrivateAssets="All" />
10
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.16" PrivateAssets="All" />
11
</ItemGroup>
12
13
<ItemGroup>
src/test/examples/TestEngine/Example.TestEngine.vcxproj
+4
-4
@@ -1,8 +1,8 @@
1
<?xml version="1.0" encoding="utf-8"?>
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
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" />
5
- <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" />
4
+ <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.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
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|Win32">
@@ -63,8 +63,8 @@
63
<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>
64
</PropertyGroup>
65
<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'))" />
66
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props'))" />
67
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props'))" />
66
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props'))" />
67
+ <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'))" />
68
<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'))" />
69
</Target>
70
</Project>
\ No newline at end of file
src/test/examples/TestEngine/packages.config
+2
-2
@@ -1,7 +1,7 @@
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.11" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.13" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.16" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/wixext/BalWindowsInstallerBackendBinderExtension.cs
+3
-3
@@ -29,11 +29,11 @@ namespace WixToolset.Bal
29
}
30
}
31
32
- public override void PostBackendBind(IBindResult result, WixOutput wixout)
32
+ public override void PostBackendBind(IBindResult result)
33
{
34
- base.PostBackendBind(result, wixout);
34
+ base.PostBackendBind(result);
35
36
- var output = WindowsInstallerData.Load(wixout.Uri.AbsoluteUri, false);
36
+ var output = WindowsInstallerData.Load(result.Wixout, false);
37
38
// Only process Bundles.
39
if (OutputType.Bundle != output.Type)
src/wixlib/bal.wixproj
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8" ?>
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
<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props')" />
4
+ <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -59,7 +59,7 @@
59
<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>
60
</PropertyGroup>
61
<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'))" />
62
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props'))" />
62
+ <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props'))" />
63
</Target>
64
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
65
</Project>
src/wixlib/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0059" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0080" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file
src/wixstdba/WixStandardBootstrapperApplication.cpp
+3
-1
@@ -3726,7 +3726,8 @@ HRESULT CreateBootstrapperApplication(
3726
__in HRESULT hrHostInitialization,
3727
__in IBootstrapperEngine* pEngine,
3728
__in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
3729
- __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
3729
+ __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
3730
+ __out IBootstrapperApplication** ppApplication
3731
)
3732
{
3733
HRESULT hr = S_OK;
@@ -3737,6 +3738,7 @@ HRESULT CreateBootstrapperApplication(
3738
3739
pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc;
3740
pResults->pvBootstrapperApplicationProcContext = pApplication;
3741
+ *ppApplication = pApplication;
3742
pApplication = NULL;
3743
3744
LExit:
src/wixstdba/packages.config
+2
-2
@@ -1,7 +1,7 @@
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.11" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.13" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.16" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/wixstdba/precomp.h
+2
-1
@@ -52,5 +52,6 @@ HRESULT CreateBootstrapperApplication(
52
__in HRESULT hrHostInitialization,
53
__in IBootstrapperEngine* pEngine,
54
__in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
55
- __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
55
+ __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
56
+ __out IBootstrapperApplication** ppApplication
57
);
src/wixstdba/wixstdba.cpp
+5
-2
@@ -3,6 +3,7 @@
3
#include "precomp.h"
4
5
static HINSTANCE vhInstance = NULL;
6
+static IBootstrapperApplication* vpApplication = NULL;
7
8
extern "C" BOOL WINAPI DllMain(
9
IN HINSTANCE hInstance,
@@ -37,7 +38,7 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
38
hr = BalInitializeFromCreateArgs(pArgs, &pEngine);
39
ExitOnFailure(hr, "Failed to initialize Bal.");
40
40
- hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults);
41
+ hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults, &vpApplication);
42
BalExitOnFailure(hr, "Failed to create bootstrapper application interface.");
43
44
LExit:
@@ -49,6 +50,7 @@ LExit:
50
51
extern "C" void WINAPI BootstrapperApplicationDestroy()
52
{
53
+ ReleaseNullObject(vpApplication);
54
BalUninitialize();
55
}
56
@@ -64,7 +66,7 @@ extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate(
66
67
BalInitialize(pEngine);
68
67
- hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults);
69
+ hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication);
70
BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface.");
71
72
LExit:
@@ -74,5 +76,6 @@ LExit:
76
77
extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy()
78
{
79
+ ReleaseNullObject(vpApplication);
80
BalUninitialize();
81
}
src/wixstdba/wixstdba.vcxproj
+4
-4
@@ -2,8 +2,8 @@
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.BalUtil.4.0.13\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" />
5
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" />
6
+ <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')" />
7
<Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
@@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
107
<PropertyGroup>
108
<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>
109
</PropertyGroup>
110
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props'))" />
111
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props'))" />
110
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props'))" />
111
+ <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'))" />
112
<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'))" />
113
<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'))" />
114
</Target>