From 83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 8 Dec 2020 16:01:28 -0600
Subject: Update to latest.

---
 global.json                                             | 2 +-
 src/TestData/MsiTransaction/BundleAv1/BundleA.wxi       | 5 ++---
 src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj | 4 ++--
 src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs     | 7 +++----
 src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj | 4 ++--
 src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs     | 7 +++----
 src/TestData/MsiTransaction/BundleBv1/BundleB.wxi       | 5 ++---
 src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj | 4 ++--
 src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs     | 5 ++---
 src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj | 4 ++--
 src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs     | 7 +++----
 src/TestData/MsiTransaction/PackageF/PackageF.wixproj   | 2 +-
 src/TestData/Templates/Package.wxs                      | 2 --
 src/TestData/Templates/PackageFail.wxs                  | 2 --
 src/TestData/TestBA/TestBAWixlib/TestBA.wxs             | 8 ++++----
 src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj   | 2 +-
 16 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/global.json b/global.json
index 4c402d5e..3baefa28 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.0-build-0170"
+    "WixToolset.Sdk": "4.0.0-build-0171"
   },
   "sdk": {
     "allowPrerelease": false
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi
index 83b901cb..b31be737 100644
--- a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi
+++ b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi
@@ -1,5 +1,4 @@
-<?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. -->
+<!-- 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. -->
 
 <?ifndef Version?>
 <?define Version = 1.0.0.0?>
@@ -7,7 +6,7 @@
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleA"/>
+    <Log Prefix="~$(var.TestGroupName)_BundleA" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
 
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
index 59f856ce..95f3ccf0 100644
--- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
+++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs
index 24ef3273..f8355aa6 100644
--- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs
+++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs
@@ -1,13 +1,12 @@
-<?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. -->
+<!-- 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. -->
 
 
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include BundleA.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
-      <RollbackBoundary Transaction='yes' />
+      <RollbackBoundary Transaction="yes" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
       <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv1.TargetPath)" />
     </PackageGroup>
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
index 3b7806d1..4ecc3f8a 100644
--- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
+++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\PackageD\PackageD.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs
index 7feab97b..11360c22 100644
--- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs
+++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs
@@ -1,13 +1,12 @@
-<?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. -->
+<!-- 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. -->
 
 
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include ..\BundleAv1\BundleA.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" />
-      <RollbackBoundary Transaction='yes' />
+      <RollbackBoundary Transaction="yes" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
       <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv2.TargetPath)" />
     </PackageGroup>
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
index 5eeaa6d7..cb7a602d 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
+++ b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
@@ -1,5 +1,4 @@
-<?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. -->
+<!-- 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. -->
 
 <?ifndef Version?>
 <?define Version = 1.0.0.0?>
@@ -7,7 +6,7 @@
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{552FD011-4DD6-42B2-A4C6-AD1417C829B2}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleB"/>
+    <Log Prefix="~$(var.TestGroupName)_BundleB" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
 
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj
index f65eb0ad..f0f304b6 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj
+++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj
@@ -8,7 +8,7 @@
     <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
index 3efe2f5d..420d5157 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
+++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
@@ -1,8 +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. -->
+<!-- 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. -->
 
 
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj
index 3f748db0..ec7b29a4 100644
--- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj
+++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\PackageF\PackageF.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
index d5b88b40..39197d7d 100644
--- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
+++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
@@ -1,13 +1,12 @@
-<?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. -->
+<!-- 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. -->
 
 
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?include ..\BundleBv1\BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
-      <RollbackBoundary Transaction='yes' />
+      <RollbackBoundary Transaction="yes" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
       <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
     </PackageGroup>
diff --git a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj b/src/TestData/MsiTransaction/PackageF/PackageF.wixproj
index e83006ac..46def2c5 100644
--- a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj
+++ b/src/TestData/MsiTransaction/PackageF/PackageF.wixproj
@@ -7,6 +7,6 @@
     <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.65" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.66" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs
index 813e03d0..ff5e71c7 100644
--- a/src/TestData/Templates/Package.wxs
+++ b/src/TestData/Templates/Package.wxs
@@ -8,8 +8,6 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
-    
-
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
 
diff --git a/src/TestData/Templates/PackageFail.wxs b/src/TestData/Templates/PackageFail.wxs
index 8754d3f6..7cbf7ebc 100644
--- a/src/TestData/Templates/PackageFail.wxs
+++ b/src/TestData/Templates/PackageFail.wxs
@@ -8,8 +8,6 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
-    
-
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
 
diff --git a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
index c16da2e5..dff94992 100644
--- a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -1,9 +1,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. -->
+<!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <BootstrapperApplicationRef Id='ManagedBootstrapperApplicationHost'>
-      <Payload Name='WixToolset.Mba.Host.config' SourceFile='!(bindpath.x86)\TestBA.BootstrapperCore.config' />
-      <Payload SourceFile='!(bindpath.x86)\TestBA.dll' />
+    <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
+      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.x86)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.x86)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" />
     </BootstrapperApplicationRef>
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 1d8debac..8c28b82c 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -12,6 +12,6 @@
     <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb