From c52a40fc649b0aebb673cced64a2773aa2425e2d Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 8 Dec 2020 11:36:06 -0600
Subject: Use new BootstrapperApplicationDll element.

---
 src/wixlib/Dnc.wxs               | 15 ++++++++++-----
 src/wixlib/Mba.wxs               | 15 ++++++++++-----
 src/wixlib/wixstdba_platform.wxi | 19 +++++++++++++------
 3 files changed, 33 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs
index bb70583a..9b5dc0ee 100644
--- a/src/wixlib/Dnc.wxs
+++ b/src/wixlib/Dnc.wxs
@@ -6,34 +6,39 @@
      Dnc.wxs - .NET Core BA resources.
     -->
     <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost" SourceFile="dnchost.dll">
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost">
             <PayloadGroupRef Id="Dnc" />
             <PayloadGroupRef Id="DncPreqStandard" />
+            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense" SourceFile="dnchost.dll">
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense">
             <PayloadGroupRef Id="Dnc" />
             <PayloadGroupRef Id="DncPreqStandard" />
+            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal" SourceFile="dnchost.dll">
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal">
             <PayloadGroupRef Id="Dnc" />
+            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="dnchost.dll">
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal">
             <PayloadGroupRef Id="Dnc" />
+            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation" SourceFile="dnchost.dll">
+        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation">
             <PayloadGroupRef Id="Dnc" />
+            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs
index ae3084ca..4667904a 100644
--- a/src/wixlib/Mba.wxs
+++ b/src/wixlib/Mba.wxs
@@ -6,33 +6,38 @@
      Mba.wxs - Managed UX resources.
     -->
     <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost" SourceFile="mbahost.dll">
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost">
             <PayloadGroupRef Id="Mba" />
             <PayloadGroupRef Id="MbaPreqStandard" />
+            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
         </BootstrapperApplication>
     </Fragment>
     <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense" SourceFile="mbahost.dll">
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense">
             <PayloadGroupRef Id="Mba" />
             <PayloadGroupRef Id="MbaPreqStandard" />
+            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal" SourceFile="mbahost.dll">
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal">
             <PayloadGroupRef Id="Mba" />
+            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="mbahost.dll">
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal">
             <PayloadGroupRef Id="Mba" />
+            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation" SourceFile="mbahost.dll">
+        <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation">
             <PayloadGroupRef Id="Mba" />
+            <BootstrapperApplicationDll SourceFile="mbahost.dll" />
         </BootstrapperApplication>
     </Fragment>
 
diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi
index a4dc917d..fae52b80 100644
--- a/src/wixlib/wixstdba_platform.wxi
+++ b/src/wixlib/wixstdba_platform.wxi
@@ -4,37 +4,44 @@
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?include caSuffix.wxi ?>
     <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
         </BootstrapperApplication>
     </Fragment>
 
     <Fragment>
 
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.Foundation$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.Foundation$(var.Suffix)">
+            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
+        </BootstrapperApplication>
     </Fragment>
 </Include>
-- 
cgit v1.2.3-55-g6feb