From 70e370b4494a87cbbe234130882cad4a1021f82a Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 8 Dec 2020 23:03:30 -0600
Subject: Require the custom BA elements to reference built-in BAs.

---
 src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs               | 6 ++++--
 src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs       | 8 ++++----
 src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs          | 8 ++++----
 .../TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs        | 8 ++++----
 4 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/test/WixToolsetTest.Bal/TestData')

diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
index e6f1d566..1b72c725 100644
--- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost" />
+        <BootstrapperApplication>
+            <bal:WixManagedBootstrapperApplicationHost />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
         </Chain>
diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
index 3ac3df60..5072b813 100644
--- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
         <Variable Name="Test1" bal:Overridable="yes" />
         <Chain>
             <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
index 82b0434d..3ba305b5 100644
--- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
         <Chain>
             <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" />
         </Chain>
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
index 438fc23e..f08cfe6a 100644
--- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
         <Chain>
             <MsiPackage SourceFile="test.msi" bal:DisplayInternalUICondition="1" />
         </Chain>
-- 
cgit v1.2.3-55-g6feb