From d5b89ecb2ba931cd5429e00a78b9457f8a63c6d2 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 30 Mar 2020 19:25:36 +1000
Subject: Upgrade to latest dependencies. Stop skipping CanBuildUsingWixStdBa.
 Fix memory leak in wixstdba.

---
 .../examples/FullFramework2MBA/Example.FullFramework2MBA.csproj   | 6 +++---
 src/test/examples/FullFramework2MBA/packages.config               | 2 +-
 .../examples/FullFramework4MBA/Example.FullFramework4MBA.csproj   | 2 +-
 src/test/examples/TestEngine/Example.TestEngine.vcxproj           | 8 ++++----
 src/test/examples/TestEngine/packages.config                      | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/test/examples')

diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index 3a884020..09348ac8 100644
--- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -3,7 +3,7 @@
 
 
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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')" />
+  <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')" />
   <PropertyGroup>
     <ProjectGuid>{CC4236FC-226E-4232-AB50-24CBEC4D314D}</ProjectGuid>
     <AssemblyName>Example.FullFramework2MBA</AssemblyName>
@@ -40,7 +40,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WixToolset.Mba.Core">
-      <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -67,7 +67,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.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'))" />
+    <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'))" />
     <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/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config
index 6a2328ef..9950b1b6 100644
--- a/src/test/examples/FullFramework2MBA/packages.config
+++ b/src/test/examples/FullFramework2MBA/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WixToolset.Mba.Core" version="4.0.13" targetFramework="net461" />
+  <package id="WixToolset.Mba.Core" version="4.0.16" targetFramework="net461" />
 </packages>
\ 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 04553354..549e096e 100644
--- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.13" PrivateAssets="All" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.16" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index 90002795..44ba2c9b 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -1,8 +1,8 @@
 <?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.13\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" />
-  <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')" />
+  <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.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">
     <ProjectConfiguration Include="Debug|Win32">
@@ -63,8 +63,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.13\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props'))" />
-    <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'))" />
+    <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'))" />
+    <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'))" />
   </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 fbcb6700..56b68f10 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.11" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.13" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.16" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb