Use new BootstrapperApplicationDll element.
Sean Hall committed
Dec 8, 2020 at 11:36 UTC
c52a40fc649b0aebb673cced64a2773aa2425e2d
4 files changed
+34
-17
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0170"
3
+ "WixToolset.Sdk": "4.0.0-build-0171"
4
},
5
"sdk": {
6
"allowPrerelease": true
src/wixlib/Dnc.wxs
+10
-5
@@ -6,34 +6,39 @@
6
Dnc.wxs - .NET Core BA resources.
7
-->
8
<Fragment>
9
- <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost" SourceFile="dnchost.dll">
9
+ <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost">
10
<PayloadGroupRef Id="Dnc" />
11
<PayloadGroupRef Id="DncPreqStandard" />
12
+ <BootstrapperApplicationDll SourceFile="dnchost.dll" />
13
</BootstrapperApplication>
14
</Fragment>
15
16
<Fragment>
16
- <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense" SourceFile="dnchost.dll">
17
+ <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense">
18
<PayloadGroupRef Id="Dnc" />
19
<PayloadGroupRef Id="DncPreqStandard" />
20
+ <BootstrapperApplicationDll SourceFile="dnchost.dll" />
21
</BootstrapperApplication>
22
</Fragment>
23
24
<Fragment>
23
- <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal" SourceFile="dnchost.dll">
25
+ <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal">
26
<PayloadGroupRef Id="Dnc" />
27
+ <BootstrapperApplicationDll SourceFile="dnchost.dll" />
28
</BootstrapperApplication>
29
</Fragment>
30
31
<Fragment>
29
- <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="dnchost.dll">
32
+ <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal">
33
<PayloadGroupRef Id="Dnc" />
34
+ <BootstrapperApplicationDll SourceFile="dnchost.dll" />
35
</BootstrapperApplication>
36
</Fragment>
37
38
<Fragment>
35
- <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation" SourceFile="dnchost.dll">
39
+ <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation">
40
<PayloadGroupRef Id="Dnc" />
41
+ <BootstrapperApplicationDll SourceFile="dnchost.dll" />
42
</BootstrapperApplication>
43
</Fragment>
44
src/wixlib/Mba.wxs
+10
-5
@@ -6,33 +6,38 @@
6
Mba.wxs - Managed UX resources.
7
-->
8
<Fragment>
9
- <BootstrapperApplication Id="ManagedBootstrapperApplicationHost" SourceFile="mbahost.dll">
9
+ <BootstrapperApplication Id="ManagedBootstrapperApplicationHost">
10
<PayloadGroupRef Id="Mba" />
11
<PayloadGroupRef Id="MbaPreqStandard" />
12
+ <BootstrapperApplicationDll SourceFile="mbahost.dll" />
13
</BootstrapperApplication>
14
</Fragment>
15
<Fragment>
15
- <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense" SourceFile="mbahost.dll">
16
+ <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense">
17
<PayloadGroupRef Id="Mba" />
18
<PayloadGroupRef Id="MbaPreqStandard" />
19
+ <BootstrapperApplicationDll SourceFile="mbahost.dll" />
20
</BootstrapperApplication>
21
</Fragment>
22
23
<Fragment>
22
- <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal" SourceFile="mbahost.dll">
24
+ <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal">
25
<PayloadGroupRef Id="Mba" />
26
+ <BootstrapperApplicationDll SourceFile="mbahost.dll" />
27
</BootstrapperApplication>
28
</Fragment>
29
30
<Fragment>
28
- <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="mbahost.dll">
31
+ <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal">
32
<PayloadGroupRef Id="Mba" />
33
+ <BootstrapperApplicationDll SourceFile="mbahost.dll" />
34
</BootstrapperApplication>
35
</Fragment>
36
37
<Fragment>
34
- <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation" SourceFile="mbahost.dll">
38
+ <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation">
39
<PayloadGroupRef Id="Mba" />
40
+ <BootstrapperApplicationDll SourceFile="mbahost.dll" />
41
</BootstrapperApplication>
42
</Fragment>
43
src/wixlib/wixstdba_platform.wxi
+13
-6
@@ -4,37 +4,44 @@
4
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?include caSuffix.wxi ?>
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" />
9
+ <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
10
</BootstrapperApplication>
11
</Fragment>
12
13
<Fragment>
13
- <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
14
+ <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
15
<PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
16
+ <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
17
</BootstrapperApplication>
18
</Fragment>
19
20
<Fragment>
19
- <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
21
+ <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
22
<PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
23
+ <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
24
</BootstrapperApplication>
25
</Fragment>
26
27
<Fragment>
25
- <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
28
+ <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
29
<PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
30
+ <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
31
</BootstrapperApplication>
32
</Fragment>
33
34
<Fragment>
31
- <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
35
+ <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
36
<PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
37
+ <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
38
</BootstrapperApplication>
39
</Fragment>
40
41
<Fragment>
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>
46
</Fragment>
47
</Include>