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/wixlib/Dnc.wxs | 51 ++++++---------------------------------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

(limited to 'src/wixlib/Dnc.wxs')

diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs
index 9b5dc0ee..d777c473 100644
--- a/src/wixlib/Dnc.wxs
+++ b/src/wixlib/Dnc.wxs
@@ -6,54 +6,15 @@
      Dnc.wxs - .NET Core BA resources.
     -->
     <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost">
-            <PayloadGroupRef Id="Dnc" />
-            <PayloadGroupRef Id="DncPreqStandard" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense">
-            <PayloadGroupRef Id="Dnc" />
-            <PayloadGroupRef Id="DncPreqStandard" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal">
-            <PayloadGroupRef Id="Dnc" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal">
-            <PayloadGroupRef Id="Dnc" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation">
-            <PayloadGroupRef Id="Dnc" />
-            <BootstrapperApplicationDll SourceFile="dnchost.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-
-    <Fragment>
-        <PayloadGroup Id="Dnc">
-            <Payload Compressed="yes" SourceFile="WixToolset.Dnc.Host.dll" />
-            <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="dncpreq.dll" />
+        <PayloadGroup Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads">
+            <Payload SourceFile="WixToolset.Dnc.Host.dll" />
         </PayloadGroup>
     </Fragment>
-
     <Fragment>
-        <PayloadGroup Id="DncPreqStandard">
-            <Payload Name="mbapreq.thm" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)" />
-            <Payload Name="mbapreq.png" Compressed="yes" SourceFile="!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)" />
-            <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" />
+        <PayloadGroup Id="DncPreqStandardPayloads">
+            <Payload Name="mbapreq.thm" SourceFile="!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)" />
+            <Payload Name="mbapreq.png" SourceFile="!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)" />
+            <Payload Name="mbapreq.wxl" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" />
         </PayloadGroup>
     </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb