From e4f1a4310f09e3777d035f35f4b4ca69d69f5083 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 22 Jun 2020 14:34:24 +1000
Subject: Update dependencies.

---
 src/wixlib/bal.wixproj     |  4 ++--
 src/wixlib/packages.config |  2 +-
 src/wixlib/wixstdba.wxs    | 58 +++++++++++++++++++++++-----------------------
 3 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/wixlib')

diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 45ca7f88..ae8559d5 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -1,7 +1,7 @@
 <?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" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" />
   <Import Project="..\FindLocalWix.props" />
   <PropertyGroup>
     <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -57,7 +57,7 @@
       <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.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props'))" />
   </Target>
   <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
 </Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index 6e79c4c9..8ffe0d58 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.MSBuild" version="4.0.0-build-0126" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0137" developmentDependency="true" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs
index 5c99747d..1b5e1342 100644
--- a/src/wixlib/wixstdba.wxs
+++ b/src/wixlib/wixstdba.wxs
@@ -13,11 +13,11 @@
             <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
         </PayloadGroup>
 
-        <CustomTable Id='WixStdbaInformation'>
-            <Row>
-                <Data Column='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</Data>
-            </Row>
-        </CustomTable>
+        <BundleCustomDataRef Id='WixStdbaInformation'>
+            <BundleElement>
+                <BundleAttribute Id='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</BundleAttribute>
+            </BundleElement>
+        </BundleCustomDataRef>
     </Fragment>
 
     <!-- RTF Large License Payload Group -->
@@ -30,11 +30,11 @@
             <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
         </PayloadGroup>
 
-        <CustomTable Id='WixStdbaInformation'>
-            <Row>
-                <Data Column='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</Data>
-            </Row>
-        </CustomTable>
+        <BundleCustomDataRef Id='WixStdbaInformation'>
+            <BundleElement>
+                <BundleAttribute Id='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</BundleAttribute>
+            </BundleElement>
+        </BundleCustomDataRef>
     </Fragment>
 
     <!-- Hyperlink License Payload Group -->
@@ -45,11 +45,11 @@
             <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
         </PayloadGroup>
 
-        <CustomTable Id='WixStdbaInformation'>
-            <Row>
-                <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data>
-            </Row>
-        </CustomTable>
+        <BundleCustomDataRef Id='WixStdbaInformation'>
+            <BundleElement>
+                <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
+            </BundleElement>
+        </BundleCustomDataRef>
     </Fragment>
 
     <!-- Hyperlink Large License Payload Group -->
@@ -60,11 +60,11 @@
             <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
         </PayloadGroup>
 
-        <CustomTable Id='WixStdbaInformation'>
-            <Row>
-                <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data>
-            </Row>
-        </CustomTable>
+        <BundleCustomDataRef Id='WixStdbaInformation'>
+            <BundleElement>
+                <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
+            </BundleElement>
+        </BundleCustomDataRef>
     </Fragment>
 
     <!-- HyperlinkSidebar License Payload Group -->
@@ -76,18 +76,18 @@
             <Payload Name='logoside.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogoSide=logoside.png)' />
         </PayloadGroup>
 
-        <CustomTable Id='WixStdbaInformation'>
-            <Row>
-                <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data>
-            </Row>
-        </CustomTable>
+        <BundleCustomDataRef Id='WixStdbaInformation'>
+            <BundleElement>
+                <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
+            </BundleElement>
+        </BundleCustomDataRef>
     </Fragment>
 
     <!-- BootstrapperApplicationData tables definition -->
     <Fragment>
-        <CustomTable Id='WixStdbaInformation' Unreal='yes'>
-            <Column Id='LicenseFile' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' />
-            <Column Id='LicenseUrl' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' />
-        </CustomTable>
+        <BundleCustomData Id='WixStdbaInformation'>
+            <BundleAttributeDefinition Id='LicenseFile' />
+            <BundleAttributeDefinition Id='LicenseUrl' />
+        </BundleCustomData>
     </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb