@joebigelow / wix / commits / 1362692b

Format wixlib files using 'wix format'.

Sean Hall committed Dec 8, 2020 at 11:35 UTC 1362692be423f821e98f2f5693849206f5ce8620
7 files changed +124 -139
src/wixlib/BalExtension.wxs deleted
-8
@@ -1,8 +0,0 @@
1 -<?xml version="1.0" encoding="UTF-8"?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 -
4 -
5 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 - <Fragment>
7 - </Fragment>
8 -</Wix>
src/wixlib/Dnc.wxs
+21 -22
@@ -1,55 +1,54 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1 +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <!--
6 Dnc.wxs - .NET Core BA resources.
7 -->
8 <Fragment>
10 - <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost' SourceFile='dnchost.dll'>
11 - <PayloadGroupRef Id='Dnc' />
12 - <PayloadGroupRef Id='DncPreqStandard' />
9 + <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost" SourceFile="dnchost.dll">
10 + <PayloadGroupRef Id="Dnc" />
11 + <PayloadGroupRef Id="DncPreqStandard" />
12 </BootstrapperApplication>
13 </Fragment>
14
15 <Fragment>
17 - <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.RtfLicense' SourceFile='dnchost.dll'>
18 - <PayloadGroupRef Id='Dnc' />
19 - <PayloadGroupRef Id='DncPreqStandard' />
16 + <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense" SourceFile="dnchost.dll">
17 + <PayloadGroupRef Id="Dnc" />
18 + <PayloadGroupRef Id="DncPreqStandard" />
19 </BootstrapperApplication>
20 </Fragment>
21
22 <Fragment>
24 - <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.Minimal' SourceFile='dnchost.dll'>
25 - <PayloadGroupRef Id='Dnc' />
23 + <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal" SourceFile="dnchost.dll">
24 + <PayloadGroupRef Id="Dnc" />
25 </BootstrapperApplication>
26 </Fragment>
27
28 <Fragment>
30 - <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal' SourceFile='dnchost.dll'>
31 - <PayloadGroupRef Id='Dnc' />
29 + <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="dnchost.dll">
30 + <PayloadGroupRef Id="Dnc" />
31 </BootstrapperApplication>
32 </Fragment>
33
34 <Fragment>
36 - <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.Foundation' SourceFile='dnchost.dll'>
37 - <PayloadGroupRef Id='Dnc' />
35 + <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation" SourceFile="dnchost.dll">
36 + <PayloadGroupRef Id="Dnc" />
37 </BootstrapperApplication>
38 </Fragment>
39
40 <Fragment>
42 - <PayloadGroup Id='Dnc'>
43 - <Payload Compressed='yes' SourceFile='WixToolset.Dnc.Host.dll' />
44 - <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='dncpreq.dll' />
41 + <PayloadGroup Id="Dnc">
42 + <Payload Compressed="yes" SourceFile="WixToolset.Dnc.Host.dll" />
43 + <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="dncpreq.dll" />
44 </PayloadGroup>
45 </Fragment>
46
47 <Fragment>
49 - <PayloadGroup Id='DncPreqStandard'>
50 - <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)' />
51 - <Payload Name='mbapreq.png' Compressed='yes' SourceFile='!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)' />
52 - <Payload Name='mbapreq.wxl' Compressed='yes' SourceFile='!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)' />
48 + <PayloadGroup Id="DncPreqStandard">
49 + <Payload Name="mbapreq.thm" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)" />
50 + <Payload Name="mbapreq.png" Compressed="yes" SourceFile="!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)" />
51 + <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" />
52 </PayloadGroup>
53 </Fragment>
54 </Wix>
src/wixlib/Mba.wxs
+44 -46
@@ -1,78 +1,76 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1 +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <!--
6 Mba.wxs - Managed UX resources.
7 -->
8 <Fragment>
10 - <BootstrapperApplication Id='ManagedBootstrapperApplicationHost' SourceFile='mbahost.dll'>
11 - <PayloadGroupRef Id='Mba' />
12 - <PayloadGroupRef Id='MbaPreqStandard' />
9 + <BootstrapperApplication Id="ManagedBootstrapperApplicationHost" SourceFile="mbahost.dll">
10 + <PayloadGroupRef Id="Mba" />
11 + <PayloadGroupRef Id="MbaPreqStandard" />
12 </BootstrapperApplication>
13 </Fragment>
15 -
14 <Fragment>
17 - <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.RtfLicense' SourceFile='mbahost.dll'>
18 - <PayloadGroupRef Id='Mba' />
19 - <PayloadGroupRef Id='MbaPreqStandard' />
15 + <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense" SourceFile="mbahost.dll">
16 + <PayloadGroupRef Id="Mba" />
17 + <PayloadGroupRef Id="MbaPreqStandard" />
18 </BootstrapperApplication>
19 </Fragment>
20
21 <Fragment>
24 - <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.Minimal' SourceFile='mbahost.dll'>
25 - <PayloadGroupRef Id='Mba' />
22 + <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal" SourceFile="mbahost.dll">
23 + <PayloadGroupRef Id="Mba" />
24 </BootstrapperApplication>
25 </Fragment>
26
27 <Fragment>
30 - <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.RtfLicense.Minimal' SourceFile='mbahost.dll'>
31 - <PayloadGroupRef Id='Mba' />
28 + <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="mbahost.dll">
29 + <PayloadGroupRef Id="Mba" />
30 </BootstrapperApplication>
31 </Fragment>
32
33 <Fragment>
36 - <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.Foundation' SourceFile='mbahost.dll'>
37 - <PayloadGroupRef Id='Mba' />
34 + <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation" SourceFile="mbahost.dll">
35 + <PayloadGroupRef Id="Mba" />
36 </BootstrapperApplication>
37 </Fragment>
38
39 <Fragment>
42 - <PayloadGroup Id='Mba'>
43 - <Payload Compressed='yes' SourceFile='WixToolset.Mba.Host.dll' />
44 - <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='mbapreq.dll' />
40 + <PayloadGroup Id="Mba">
41 + <Payload Compressed="yes" SourceFile="WixToolset.Mba.Host.dll" />
42 + <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="mbapreq.dll" />
43 </PayloadGroup>
44 </Fragment>
45
46 <Fragment>
49 - <PayloadGroup Id='MbaPreqStandard'>
50 - <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)' />
51 - <Payload Name='mbapreq.png' Compressed='yes' SourceFile='!(wix.PreqbaLogo=SourceDir\mbapreq.png)' />
52 - <Payload Name='mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)' />
53 - <Payload Name='1028\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)' />
54 - <Payload Name='1029\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)' />
55 - <Payload Name='1030\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)' />
56 - <Payload Name='1031\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)' />
57 - <Payload Name='1032\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)' />
58 - <Payload Name='1035\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)' />
59 - <Payload Name='1036\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)' />
60 - <Payload Name='1038\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)' />
61 - <Payload Name='1040\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)' />
62 - <Payload Name='1041\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)' />
63 - <Payload Name='1042\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)' />
64 - <Payload Name='1043\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)' />
65 - <Payload Name='1044\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)' />
66 - <Payload Name='1045\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)' />
67 - <Payload Name='1046\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)' />
68 - <Payload Name='1049\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)' />
69 - <Payload Name='1051\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)' />
70 - <Payload Name='1053\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)' />
71 - <Payload Name='1055\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)' />
72 - <Payload Name='1060\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)' />
73 - <Payload Name='2052\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)' />
74 - <Payload Name='2070\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)' />
75 - <Payload Name='3082\mbapreq.wxl' Compressed='yes' SourceFile='!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)' />
47 + <PayloadGroup Id="MbaPreqStandard">
48 + <Payload Name="mbapreq.thm" Compressed="yes" SourceFile="!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)" />
49 + <Payload Name="mbapreq.png" Compressed="yes" SourceFile="!(wix.PreqbaLogo=SourceDir\mbapreq.png)" />
50 + <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)" />
51 + <Payload Name="1028\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)" />
52 + <Payload Name="1029\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)" />
53 + <Payload Name="1030\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)" />
54 + <Payload Name="1031\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)" />
55 + <Payload Name="1032\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)" />
56 + <Payload Name="1035\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)" />
57 + <Payload Name="1036\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)" />
58 + <Payload Name="1038\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)" />
59 + <Payload Name="1040\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)" />
60 + <Payload Name="1041\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)" />
61 + <Payload Name="1042\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)" />
62 + <Payload Name="1043\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)" />
63 + <Payload Name="1044\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)" />
64 + <Payload Name="1045\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)" />
65 + <Payload Name="1046\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)" />
66 + <Payload Name="1049\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)" />
67 + <Payload Name="1051\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)" />
68 + <Payload Name="1053\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)" />
69 + <Payload Name="1055\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)" />
70 + <Payload Name="1060\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)" />
71 + <Payload Name="2052\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)" />
72 + <Payload Name="2070\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)" />
73 + <Payload Name="3082\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)" />
74 </PayloadGroup>
75 </Fragment>
76 </Wix>
src/wixlib/caSuffix.wxi
+6 -7
@@ -1,28 +1,27 @@
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1 +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 <?ifndef platform ?>
5 <?error Required value "platform" not defined in include caSuffix.wxi ?>
7 - <?endif ?>
6 + <?endif?>
7
8 <?ifdef Suffix ?>
9 <?undef Suffix ?>
10 <?undef DeferredSuffix ?>
12 - <?endif ?>
11 + <?endif?>
12
13 <?if $(var.platform)="x86" ?>
14 <?define Suffix="" ?>
15 <?define DeferredSuffix="" ?>
17 - <?endif ?>
16 + <?endif?>
17
18 <?if $(var.platform)="x64" ?>
19 <?define Suffix="_x64" ?>
20 <?define DeferredSuffix="_64" ?>
22 - <?endif ?>
21 + <?endif?>
22
23 <?if $(var.platform)="arm" ?>
24 <?define Suffix="_ARM" ?>
25 <?define DeferredSuffix="_ARM" ?>
27 - <?endif ?>
26 + <?endif?>
27 </Include>
src/wixlib/wixstdba.wxs
+38 -39
@@ -1,93 +1,92 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1 +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <!-- RTF License Payload Group -->
6 <Fragment>
8 - <PayloadGroup Id='WixStdbaRtfLicensePayloads'>
9 - <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=RtfTheme.xml)' />
10 - <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=RtfTheme.wxl)' />
11 - <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
7 + <PayloadGroup Id="WixStdbaRtfLicensePayloads">
8 + <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=RtfTheme.xml)" />
9 + <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=RtfTheme.wxl)" />
10 + <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
11
13 - <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
12 + <Payload Name="!(wix.WixStdbaLicenseRtfName=license.rtf)" Compressed="yes" SourceFile="!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)" />
13 </PayloadGroup>
14
16 - <BundleCustomDataRef Id='WixStdbaInformation'>
15 + <BundleCustomDataRef Id="WixStdbaInformation">
16 <BundleElement>
18 - <BundleAttribute Id='LicenseFile' Value='!(wix.WixStdbaLicenseRtfName=license.rtf)' />
17 + <BundleAttribute Id="LicenseFile" Value="!(wix.WixStdbaLicenseRtfName=license.rtf)" />
18 </BundleElement>
19 </BundleCustomDataRef>
20 </Fragment>
21
22 <!-- RTF Large License Payload Group -->
23 <Fragment>
25 - <PayloadGroup Id='WixStdbaRtfLargeLicensePayloads'>
26 - <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=RtfLargeTheme.xml)' />
27 - <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=RtfTheme.wxl)' />
28 - <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
24 + <PayloadGroup Id="WixStdbaRtfLargeLicensePayloads">
25 + <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=RtfLargeTheme.xml)" />
26 + <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=RtfTheme.wxl)" />
27 + <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
28
30 - <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
29 + <Payload Name="!(wix.WixStdbaLicenseRtfName=license.rtf)" Compressed="yes" SourceFile="!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)" />
30 </PayloadGroup>
31
33 - <BundleCustomDataRef Id='WixStdbaInformation'>
32 + <BundleCustomDataRef Id="WixStdbaInformation">
33 <BundleElement>
35 - <BundleAttribute Id='LicenseFile' Value='!(wix.WixStdbaLicenseRtfName=license.rtf)' />
34 + <BundleAttribute Id="LicenseFile" Value="!(wix.WixStdbaLicenseRtfName=license.rtf)" />
35 </BundleElement>
36 </BundleCustomDataRef>
37 </Fragment>
38
39 <!-- Hyperlink License Payload Group -->
40 <Fragment>
42 - <PayloadGroup Id='WixStdbaHyperlinkLicensePayloads'>
43 - <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkTheme.xml)' />
44 - <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' />
45 - <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
41 + <PayloadGroup Id="WixStdbaHyperlinkLicensePayloads">
42 + <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkTheme.xml)" />
43 + <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" />
44 + <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
45 </PayloadGroup>
46
48 - <BundleCustomDataRef Id='WixStdbaInformation'>
47 + <BundleCustomDataRef Id="WixStdbaInformation">
48 <BundleElement>
50 - <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' />
49 + <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" />
50 </BundleElement>
51 </BundleCustomDataRef>
52 </Fragment>
53
54 <!-- Hyperlink Large License Payload Group -->
55 <Fragment>
57 - <PayloadGroup Id='WixStdbaHyperlinkLargeLicensePayloads'>
58 - <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkLargeTheme.xml)' />
59 - <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' />
60 - <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
56 + <PayloadGroup Id="WixStdbaHyperlinkLargeLicensePayloads">
57 + <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkLargeTheme.xml)" />
58 + <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" />
59 + <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
60 </PayloadGroup>
61
63 - <BundleCustomDataRef Id='WixStdbaInformation'>
62 + <BundleCustomDataRef Id="WixStdbaInformation">
63 <BundleElement>
65 - <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' />
64 + <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" />
65 </BundleElement>
66 </BundleCustomDataRef>
67 </Fragment>
68
69 <!-- HyperlinkSidebar License Payload Group -->
70 <Fragment>
72 - <PayloadGroup Id='WixStdbaHyperlinkSidebarLicensePayloads'>
73 - <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkSidebarTheme.xml)' />
74 - <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' />
75 - <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
76 - <Payload Name='logoside.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogoSide=logoside.png)' />
71 + <PayloadGroup Id="WixStdbaHyperlinkSidebarLicensePayloads">
72 + <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkSidebarTheme.xml)" />
73 + <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" />
74 + <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" />
75 + <Payload Name="logoside.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogoSide=logoside.png)" />
76 </PayloadGroup>
77
79 - <BundleCustomDataRef Id='WixStdbaInformation'>
78 + <BundleCustomDataRef Id="WixStdbaInformation">
79 <BundleElement>
81 - <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' />
80 + <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" />
81 </BundleElement>
82 </BundleCustomDataRef>
83 </Fragment>
84
85 <!-- BootstrapperApplicationData tables definition -->
86 <Fragment>
88 - <BundleCustomData Id='WixStdbaInformation'>
89 - <BundleAttributeDefinition Id='LicenseFile' />
90 - <BundleAttributeDefinition Id='LicenseUrl' />
87 + <BundleCustomData Id="WixStdbaInformation">
88 + <BundleAttributeDefinition Id="LicenseFile" />
89 + <BundleAttributeDefinition Id="LicenseUrl" />
90 </BundleCustomData>
91 </Fragment>
92 </Wix>
src/wixlib/wixstdba_platform.wxi
+13 -14
@@ -1,41 +1,40 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1 +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
5 -<Include xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include caSuffix.wxi ?>
6 <Fragment>
8 - <BootstrapperApplication Id='WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
9 - <PayloadGroupRef Id='WixStdbaRtfLicensePayloads' />
7 + <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
8 + <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
9 </BootstrapperApplication>
10 </Fragment>
11
12 <Fragment>
14 - <BootstrapperApplication Id='WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
15 - <PayloadGroupRef Id='WixStdbaRtfLargeLicensePayloads' />
13 + <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
14 + <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
15 </BootstrapperApplication>
16 </Fragment>
17
18 <Fragment>
20 - <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
21 - <PayloadGroupRef Id='WixStdbaHyperlinkLicensePayloads' />
19 + <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
20 + <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
21 </BootstrapperApplication>
22 </Fragment>
23
24 <Fragment>
26 - <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
27 - <PayloadGroupRef Id='WixStdbaHyperlinkLargeLicensePayloads' />
25 + <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
26 + <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
27 </BootstrapperApplication>
28 </Fragment>
29
30 <Fragment>
32 - <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'>
33 - <PayloadGroupRef Id='WixStdbaHyperlinkSidebarLicensePayloads' />
31 + <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll">
32 + <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
33 </BootstrapperApplication>
34 </Fragment>
35
36 <Fragment>
37
39 - <BootstrapperApplication Id='WixStandardBootstrapperApplication.Foundation$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll' />
38 + <BootstrapperApplication Id="WixStandardBootstrapperApplication.Foundation$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
39 </Fragment>
40 </Include>
src/wixlib/wixstdba_x86.wxs
+2 -3
@@ -1,8 +1,7 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
1 +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
3
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?define platform=x86 ?>
6 <?include wixstdba_platform.wxi ?>
7 </Wix>