aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-08 11:36:06 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-08 15:52:52 -0600
commitc52a40fc649b0aebb673cced64a2773aa2425e2d (patch)
treea469d318c227be444dd31755f15c963078c0715a /src
parent1362692be423f821e98f2f5693849206f5ce8620 (diff)
downloadwix-c52a40fc649b0aebb673cced64a2773aa2425e2d.tar.gz
wix-c52a40fc649b0aebb673cced64a2773aa2425e2d.tar.bz2
wix-c52a40fc649b0aebb673cced64a2773aa2425e2d.zip
Use new BootstrapperApplicationDll element.
Diffstat (limited to 'src')
-rw-r--r--src/wixlib/Dnc.wxs15
-rw-r--r--src/wixlib/Mba.wxs15
-rw-r--r--src/wixlib/wixstdba_platform.wxi19
3 files changed, 33 insertions, 16 deletions
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 @@
6 Dnc.wxs - .NET Core BA resources. 6 Dnc.wxs - .NET Core BA resources.
7 --> 7 -->
8 <Fragment> 8 <Fragment>
9 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost" SourceFile="dnchost.dll"> 9 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost">
10 <PayloadGroupRef Id="Dnc" /> 10 <PayloadGroupRef Id="Dnc" />
11 <PayloadGroupRef Id="DncPreqStandard" /> 11 <PayloadGroupRef Id="DncPreqStandard" />
12 <BootstrapperApplicationDll SourceFile="dnchost.dll" />
12 </BootstrapperApplication> 13 </BootstrapperApplication>
13 </Fragment> 14 </Fragment>
14 15
15 <Fragment> 16 <Fragment>
16 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense" SourceFile="dnchost.dll"> 17 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense">
17 <PayloadGroupRef Id="Dnc" /> 18 <PayloadGroupRef Id="Dnc" />
18 <PayloadGroupRef Id="DncPreqStandard" /> 19 <PayloadGroupRef Id="DncPreqStandard" />
20 <BootstrapperApplicationDll SourceFile="dnchost.dll" />
19 </BootstrapperApplication> 21 </BootstrapperApplication>
20 </Fragment> 22 </Fragment>
21 23
22 <Fragment> 24 <Fragment>
23 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal" SourceFile="dnchost.dll"> 25 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal">
24 <PayloadGroupRef Id="Dnc" /> 26 <PayloadGroupRef Id="Dnc" />
27 <BootstrapperApplicationDll SourceFile="dnchost.dll" />
25 </BootstrapperApplication> 28 </BootstrapperApplication>
26 </Fragment> 29 </Fragment>
27 30
28 <Fragment> 31 <Fragment>
29 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="dnchost.dll"> 32 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal">
30 <PayloadGroupRef Id="Dnc" /> 33 <PayloadGroupRef Id="Dnc" />
34 <BootstrapperApplicationDll SourceFile="dnchost.dll" />
31 </BootstrapperApplication> 35 </BootstrapperApplication>
32 </Fragment> 36 </Fragment>
33 37
34 <Fragment> 38 <Fragment>
35 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation" SourceFile="dnchost.dll"> 39 <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation">
36 <PayloadGroupRef Id="Dnc" /> 40 <PayloadGroupRef Id="Dnc" />
41 <BootstrapperApplicationDll SourceFile="dnchost.dll" />
37 </BootstrapperApplication> 42 </BootstrapperApplication>
38 </Fragment> 43 </Fragment>
39 44
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 @@
6 Mba.wxs - Managed UX resources. 6 Mba.wxs - Managed UX resources.
7 --> 7 -->
8 <Fragment> 8 <Fragment>
9 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost" SourceFile="mbahost.dll"> 9 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost">
10 <PayloadGroupRef Id="Mba" /> 10 <PayloadGroupRef Id="Mba" />
11 <PayloadGroupRef Id="MbaPreqStandard" /> 11 <PayloadGroupRef Id="MbaPreqStandard" />
12 <BootstrapperApplicationDll SourceFile="mbahost.dll" />
12 </BootstrapperApplication> 13 </BootstrapperApplication>
13 </Fragment> 14 </Fragment>
14 <Fragment> 15 <Fragment>
15 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense" SourceFile="mbahost.dll"> 16 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense">
16 <PayloadGroupRef Id="Mba" /> 17 <PayloadGroupRef Id="Mba" />
17 <PayloadGroupRef Id="MbaPreqStandard" /> 18 <PayloadGroupRef Id="MbaPreqStandard" />
19 <BootstrapperApplicationDll SourceFile="mbahost.dll" />
18 </BootstrapperApplication> 20 </BootstrapperApplication>
19 </Fragment> 21 </Fragment>
20 22
21 <Fragment> 23 <Fragment>
22 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal" SourceFile="mbahost.dll"> 24 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal">
23 <PayloadGroupRef Id="Mba" /> 25 <PayloadGroupRef Id="Mba" />
26 <BootstrapperApplicationDll SourceFile="mbahost.dll" />
24 </BootstrapperApplication> 27 </BootstrapperApplication>
25 </Fragment> 28 </Fragment>
26 29
27 <Fragment> 30 <Fragment>
28 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="mbahost.dll"> 31 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal">
29 <PayloadGroupRef Id="Mba" /> 32 <PayloadGroupRef Id="Mba" />
33 <BootstrapperApplicationDll SourceFile="mbahost.dll" />
30 </BootstrapperApplication> 34 </BootstrapperApplication>
31 </Fragment> 35 </Fragment>
32 36
33 <Fragment> 37 <Fragment>
34 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation" SourceFile="mbahost.dll"> 38 <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation">
35 <PayloadGroupRef Id="Mba" /> 39 <PayloadGroupRef Id="Mba" />
40 <BootstrapperApplicationDll SourceFile="mbahost.dll" />
36 </BootstrapperApplication> 41 </BootstrapperApplication>
37 </Fragment> 42 </Fragment>
38 43
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 @@
4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include caSuffix.wxi ?> 5 <?include caSuffix.wxi ?>
6 <Fragment> 6 <Fragment>
7 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> 7 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
8 <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" /> 8 <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
9 <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
9 </BootstrapperApplication> 10 </BootstrapperApplication>
10 </Fragment> 11 </Fragment>
11 12
12 <Fragment> 13 <Fragment>
13 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> 14 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
14 <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" /> 15 <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
16 <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
15 </BootstrapperApplication> 17 </BootstrapperApplication>
16 </Fragment> 18 </Fragment>
17 19
18 <Fragment> 20 <Fragment>
19 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> 21 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
20 <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" /> 22 <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
23 <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
21 </BootstrapperApplication> 24 </BootstrapperApplication>
22 </Fragment> 25 </Fragment>
23 26
24 <Fragment> 27 <Fragment>
25 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> 28 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
26 <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" /> 29 <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
30 <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
27 </BootstrapperApplication> 31 </BootstrapperApplication>
28 </Fragment> 32 </Fragment>
29 33
30 <Fragment> 34 <Fragment>
31 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> 35 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
32 <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" /> 36 <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
37 <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
33 </BootstrapperApplication> 38 </BootstrapperApplication>
34 </Fragment> 39 </Fragment>
35 40
36 <Fragment> 41 <Fragment>
37 42
38 <BootstrapperApplication Id="WixStandardBootstrapperApplication.Foundation$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" /> 43 <BootstrapperApplication Id="WixStandardBootstrapperApplication.Foundation$(var.Suffix)">
44 <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
45 </BootstrapperApplication>
39 </Fragment> 46 </Fragment>
40</Include> 47</Include>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 13:54:23 +0000