From ab7e604a7d7b53f288b81a603c0dce1fc5c8e048 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 19 Jul 2020 18:27:06 +1000
Subject: Update dependencies.
---
src/Samples/bafunctions/bafunctions.vcxproj | 12 ++++++------
src/Samples/bafunctions/packages.config | 6 +++---
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +-
src/WixToolset.Mba.Host/packages.config | 2 +-
src/dnchost/dnchost.vcxproj | 12 ++++++------
src/dnchost/packages.config | 6 +++---
src/mbahost/mbahost.vcxproj | 12 ++++++------
src/mbahost/packages.config | 6 +++---
src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 1 +
.../examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +-
.../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +-
.../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +-
src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +-
src/test/examples/TestEngine/Example.TestEngine.vcxproj | 12 ++++++------
src/test/examples/TestEngine/packages.config | 6 +++---
src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +-
src/wixlib/bal.wixproj | 1 +
src/wixstdba/packages.config | 6 +++---
src/wixstdba/wixstdba.vcxproj | 12 ++++++------
19 files changed, 54 insertions(+), 52 deletions(-)
(limited to 'src')
diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj
index 7312e802..e1e83dbe 100644
--- a/src/Samples/bafunctions/bafunctions.vcxproj
+++ b/src/Samples/bafunctions/bafunctions.vcxproj
@@ -2,9 +2,9 @@
<!-- 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.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
- <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
- <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
+ <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
+ <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -57,9 +57,9 @@
<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.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
- <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.45\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>
</Project>
diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config
index 4642439f..34e10a05 100644
--- a/src/Samples/bafunctions/packages.config
+++ b/src/Samples/bafunctions/packages.config
@@ -1,7 +1,7 @@
<?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.16" targetFramework="native" />
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
</packages>
\ No newline at end of file
diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
index 6bbdf63a..42e07501 100644
--- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
@@ -48,7 +48,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WixToolset.Mba.Core">
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.32\lib\net20\WixToolset.Mba.Core.dll</HintPath>
+ <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.33\lib\net20\WixToolset.Mba.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config
index c551d4a4..500dc72d 100644
--- a/src/WixToolset.Mba.Host/packages.config
+++ b/src/WixToolset.Mba.Host/packages.config
@@ -4,5 +4,5 @@
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net20" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net20" developmentDependency="true" />
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
- <package id="WixToolset.Mba.Core" version="4.0.32" targetFramework="net20" />
+ <package id="WixToolset.Mba.Core" version="4.0.33" targetFramework="net20" />
</packages>
\ No newline at end of file
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj
index a130bd05..a278d714 100644
--- a/src/dnchost/dnchost.vcxproj
+++ b/src/dnchost/dnchost.vcxproj
@@ -4,9 +4,9 @@
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -83,8 +83,8 @@
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
<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'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
</Target>
</Project>
\ No newline at end of file
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config
index 29cc1384..e0396349 100644
--- a/src/dnchost/packages.config
+++ b/src/dnchost/packages.config
@@ -5,7 +5,7 @@
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" />
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
</packages>
\ No newline at end of file
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj
index 2b5b2ce7..575187b4 100644
--- a/src/mbahost/mbahost.vcxproj
+++ b/src/mbahost/mbahost.vcxproj
@@ -5,9 +5,9 @@
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -83,8 +83,8 @@
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
<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'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
</Target>
</Project>
\ No newline at end of file
diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config
index 5020bdb5..f3c6255c 100644
--- a/src/mbahost/packages.config
+++ b/src/mbahost/packages.config
@@ -4,7 +4,7 @@
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
</packages>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
index 62271029..3c742604 100644
--- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
@@ -31,6 +31,7 @@
<PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
<PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
<PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" />
<!-- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.*" /> -->
</ItemGroup>
diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
index a2d7ea6d..a7983a16 100644
--- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
@@ -13,6 +13,6 @@
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index 0b1dff31..5b7e2c0a 100644
--- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -15,6 +15,6 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
index 2405d28d..6ff0cfda 100644
--- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" PrivateAssets="All" />
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
index bebce2f9..8016ad15 100644
--- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
@@ -18,6 +18,6 @@
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index 17b76fe9..4890f609 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
- <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
- <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
+ <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
+ <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
+ <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -68,8 +68,8 @@
<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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
</Target>
</Project>
\ No newline at end of file
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config
index 4642439f..34e10a05 100644
--- a/src/test/examples/TestEngine/packages.config
+++ b/src/test/examples/TestEngine/packages.config
@@ -1,7 +1,7 @@
<?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.16" targetFramework="native" />
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
</packages>
\ No newline at end of file
diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
index 12ca0d13..d99e1ba3 100644
--- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -11,6 +11,6 @@
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.32" />
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.33" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 4d35d516..5c743cd9 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -11,6 +11,7 @@
<BindInputPaths Include="..\wixstdba\Resources\" />
<BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
<BindInputPaths Include="$(OutputPath)" />
+ <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
</ItemGroup>
<ItemGroup>
diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config
index 5020bdb5..f3c6255c 100644
--- a/src/wixstdba/packages.config
+++ b/src/wixstdba/packages.config
@@ -4,7 +4,7 @@
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
- <package id="WixToolset.BalUtil" version="4.0.32" targetFramework="native" />
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
- <package id="WixToolset.DUtil" version="4.0.40" targetFramework="native" />
+ <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
+ <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
+ <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
</packages>
\ No newline at end of file
diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj
index 0d0ef073..b3400e35 100644
--- a/src/wixstdba/wixstdba.vcxproj
+++ b/src/wixstdba/wixstdba.vcxproj
@@ -5,9 +5,9 @@
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" />
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" />
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" />
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" />
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -78,8 +78,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
<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'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.32\build\WixToolset.BalUtil.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.40\build\WixToolset.DUtil.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.33\build\WixToolset.BalUtil.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.31\build\WixToolset.BootstrapperCore.Native.props'))" />
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
</Target>
</Project>
\ No newline at end of file
--
cgit v1.2.3-55-g6feb