diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-08 11:35:47 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-08 15:52:52 -0600 |
commit | 1362692be423f821e98f2f5693849206f5ce8620 (patch) | |
tree | 7ccb09c7cbfeefbab404fd3f3db0bc90cb2f12e8 /src | |
parent | c1c402ea51354813e7ff9ce313b95128cd60d373 (diff) | |
download | wix-1362692be423f821e98f2f5693849206f5ce8620.tar.gz wix-1362692be423f821e98f2f5693849206f5ce8620.tar.bz2 wix-1362692be423f821e98f2f5693849206f5ce8620.zip |
Format wixlib files using 'wix format'.
Diffstat (limited to 'src')
-rw-r--r-- | src/wixlib/BalExtension.wxs | 8 | ||||
-rw-r--r-- | src/wixlib/Dnc.wxs | 43 | ||||
-rw-r--r-- | src/wixlib/Mba.wxs | 90 | ||||
-rw-r--r-- | src/wixlib/caSuffix.wxi | 13 | ||||
-rw-r--r-- | src/wixlib/wixstdba.wxs | 77 | ||||
-rw-r--r-- | src/wixlib/wixstdba_platform.wxi | 27 | ||||
-rw-r--r-- | src/wixlib/wixstdba_x86.wxs | 5 |
7 files changed, 124 insertions, 139 deletions
diff --git a/src/wixlib/BalExtension.wxs b/src/wixlib/BalExtension.wxs deleted file mode 100644 index 2da3d5b2..00000000 --- a/src/wixlib/BalExtension.wxs +++ /dev/null | |||
@@ -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> | ||
diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs index 2663360f..bb70583a 100644 --- a/src/wixlib/Dnc.wxs +++ b/src/wixlib/Dnc.wxs | |||
@@ -1,55 +1,54 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <!-- | 5 | <!-- |
7 | Dnc.wxs - .NET Core BA resources. | 6 | Dnc.wxs - .NET Core BA resources. |
8 | --> | 7 | --> |
9 | <Fragment> | 8 | <Fragment> |
10 | <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost' SourceFile='dnchost.dll'> | 9 | <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost" SourceFile="dnchost.dll"> |
11 | <PayloadGroupRef Id='Dnc' /> | 10 | <PayloadGroupRef Id="Dnc" /> |
12 | <PayloadGroupRef Id='DncPreqStandard' /> | 11 | <PayloadGroupRef Id="DncPreqStandard" /> |
13 | </BootstrapperApplication> | 12 | </BootstrapperApplication> |
14 | </Fragment> | 13 | </Fragment> |
15 | 14 | ||
16 | <Fragment> | 15 | <Fragment> |
17 | <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.RtfLicense' SourceFile='dnchost.dll'> | 16 | <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense" SourceFile="dnchost.dll"> |
18 | <PayloadGroupRef Id='Dnc' /> | 17 | <PayloadGroupRef Id="Dnc" /> |
19 | <PayloadGroupRef Id='DncPreqStandard' /> | 18 | <PayloadGroupRef Id="DncPreqStandard" /> |
20 | </BootstrapperApplication> | 19 | </BootstrapperApplication> |
21 | </Fragment> | 20 | </Fragment> |
22 | 21 | ||
23 | <Fragment> | 22 | <Fragment> |
24 | <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.Minimal' SourceFile='dnchost.dll'> | 23 | <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Minimal" SourceFile="dnchost.dll"> |
25 | <PayloadGroupRef Id='Dnc' /> | 24 | <PayloadGroupRef Id="Dnc" /> |
26 | </BootstrapperApplication> | 25 | </BootstrapperApplication> |
27 | </Fragment> | 26 | </Fragment> |
28 | 27 | ||
29 | <Fragment> | 28 | <Fragment> |
30 | <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal' SourceFile='dnchost.dll'> | 29 | <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="dnchost.dll"> |
31 | <PayloadGroupRef Id='Dnc' /> | 30 | <PayloadGroupRef Id="Dnc" /> |
32 | </BootstrapperApplication> | 31 | </BootstrapperApplication> |
33 | </Fragment> | 32 | </Fragment> |
34 | 33 | ||
35 | <Fragment> | 34 | <Fragment> |
36 | <BootstrapperApplication Id='DotNetCoreBootstrapperApplicationHost.Foundation' SourceFile='dnchost.dll'> | 35 | <BootstrapperApplication Id="DotNetCoreBootstrapperApplicationHost.Foundation" SourceFile="dnchost.dll"> |
37 | <PayloadGroupRef Id='Dnc' /> | 36 | <PayloadGroupRef Id="Dnc" /> |
38 | </BootstrapperApplication> | 37 | </BootstrapperApplication> |
39 | </Fragment> | 38 | </Fragment> |
40 | 39 | ||
41 | <Fragment> | 40 | <Fragment> |
42 | <PayloadGroup Id='Dnc'> | 41 | <PayloadGroup Id="Dnc"> |
43 | <Payload Compressed='yes' SourceFile='WixToolset.Dnc.Host.dll' /> | 42 | <Payload Compressed="yes" SourceFile="WixToolset.Dnc.Host.dll" /> |
44 | <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='dncpreq.dll' /> | 43 | <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="dncpreq.dll" /> |
45 | </PayloadGroup> | 44 | </PayloadGroup> |
46 | </Fragment> | 45 | </Fragment> |
47 | 46 | ||
48 | <Fragment> | 47 | <Fragment> |
49 | <PayloadGroup Id='DncPreqStandard'> | 48 | <PayloadGroup Id="DncPreqStandard"> |
50 | <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)' /> | 49 | <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)' /> | 50 | <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)' /> | 51 | <Payload Name="mbapreq.wxl" Compressed="yes" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" /> |
53 | </PayloadGroup> | 52 | </PayloadGroup> |
54 | </Fragment> | 53 | </Fragment> |
55 | </Wix> | 54 | </Wix> |
diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs index a99b41d8..ae3084ca 100644 --- a/src/wixlib/Mba.wxs +++ b/src/wixlib/Mba.wxs | |||
@@ -1,78 +1,76 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <!-- | 5 | <!-- |
7 | Mba.wxs - Managed UX resources. | 6 | Mba.wxs - Managed UX resources. |
8 | --> | 7 | --> |
9 | <Fragment> | 8 | <Fragment> |
10 | <BootstrapperApplication Id='ManagedBootstrapperApplicationHost' SourceFile='mbahost.dll'> | 9 | <BootstrapperApplication Id="ManagedBootstrapperApplicationHost" SourceFile="mbahost.dll"> |
11 | <PayloadGroupRef Id='Mba' /> | 10 | <PayloadGroupRef Id="Mba" /> |
12 | <PayloadGroupRef Id='MbaPreqStandard' /> | 11 | <PayloadGroupRef Id="MbaPreqStandard" /> |
13 | </BootstrapperApplication> | 12 | </BootstrapperApplication> |
14 | </Fragment> | 13 | </Fragment> |
15 | |||
16 | <Fragment> | 14 | <Fragment> |
17 | <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.RtfLicense' SourceFile='mbahost.dll'> | 15 | <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense" SourceFile="mbahost.dll"> |
18 | <PayloadGroupRef Id='Mba' /> | 16 | <PayloadGroupRef Id="Mba" /> |
19 | <PayloadGroupRef Id='MbaPreqStandard' /> | 17 | <PayloadGroupRef Id="MbaPreqStandard" /> |
20 | </BootstrapperApplication> | 18 | </BootstrapperApplication> |
21 | </Fragment> | 19 | </Fragment> |
22 | 20 | ||
23 | <Fragment> | 21 | <Fragment> |
24 | <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.Minimal' SourceFile='mbahost.dll'> | 22 | <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Minimal" SourceFile="mbahost.dll"> |
25 | <PayloadGroupRef Id='Mba' /> | 23 | <PayloadGroupRef Id="Mba" /> |
26 | </BootstrapperApplication> | 24 | </BootstrapperApplication> |
27 | </Fragment> | 25 | </Fragment> |
28 | 26 | ||
29 | <Fragment> | 27 | <Fragment> |
30 | <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.RtfLicense.Minimal' SourceFile='mbahost.dll'> | 28 | <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.RtfLicense.Minimal" SourceFile="mbahost.dll"> |
31 | <PayloadGroupRef Id='Mba' /> | 29 | <PayloadGroupRef Id="Mba" /> |
32 | </BootstrapperApplication> | 30 | </BootstrapperApplication> |
33 | </Fragment> | 31 | </Fragment> |
34 | 32 | ||
35 | <Fragment> | 33 | <Fragment> |
36 | <BootstrapperApplication Id='ManagedBootstrapperApplicationHost.Foundation' SourceFile='mbahost.dll'> | 34 | <BootstrapperApplication Id="ManagedBootstrapperApplicationHost.Foundation" SourceFile="mbahost.dll"> |
37 | <PayloadGroupRef Id='Mba' /> | 35 | <PayloadGroupRef Id="Mba" /> |
38 | </BootstrapperApplication> | 36 | </BootstrapperApplication> |
39 | </Fragment> | 37 | </Fragment> |
40 | 38 | ||
41 | <Fragment> | 39 | <Fragment> |
42 | <PayloadGroup Id='Mba'> | 40 | <PayloadGroup Id="Mba"> |
43 | <Payload Compressed='yes' SourceFile='WixToolset.Mba.Host.dll' /> | 41 | <Payload Compressed="yes" SourceFile="WixToolset.Mba.Host.dll" /> |
44 | <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='mbapreq.dll' /> | 42 | <Payload Compressed="yes" SourceFile="wixstdba.dll" Name="mbapreq.dll" /> |
45 | </PayloadGroup> | 43 | </PayloadGroup> |
46 | </Fragment> | 44 | </Fragment> |
47 | 45 | ||
48 | <Fragment> | 46 | <Fragment> |
49 | <PayloadGroup Id='MbaPreqStandard'> | 47 | <PayloadGroup Id="MbaPreqStandard"> |
50 | <Payload Name='mbapreq.thm' Compressed='yes' SourceFile='!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)' /> | 48 | <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)' /> | 49 | <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)' /> | 50 | <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)' /> | 51 | <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)' /> | 52 | <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)' /> | 53 | <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)' /> | 54 | <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)' /> | 55 | <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)' /> | 56 | <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)' /> | 57 | <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)' /> | 58 | <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)' /> | 59 | <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)' /> | 60 | <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)' /> | 61 | <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)' /> | 62 | <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)' /> | 63 | <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)' /> | 64 | <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)' /> | 65 | <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)' /> | 66 | <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)' /> | 67 | <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)' /> | 68 | <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)' /> | 69 | <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)' /> | 70 | <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)' /> | 71 | <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)' /> | 72 | <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)' /> | 73 | <Payload Name="3082\mbapreq.wxl" Compressed="yes" SourceFile="!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)" /> |
76 | </PayloadGroup> | 74 | </PayloadGroup> |
77 | </Fragment> | 75 | </Fragment> |
78 | </Wix> | 76 | </Wix> |
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi index a56a2393..18436269 100644 --- a/src/wixlib/caSuffix.wxi +++ b/src/wixlib/caSuffix.wxi | |||
@@ -1,28 +1,27 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 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 | <!-- 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 | 2 | ||
4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 3 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
5 | <?ifndef platform ?> | 4 | <?ifndef platform ?> |
6 | <?error Required value "platform" not defined in include caSuffix.wxi ?> | 5 | <?error Required value "platform" not defined in include caSuffix.wxi ?> |
7 | <?endif ?> | 6 | <?endif?> |
8 | 7 | ||
9 | <?ifdef Suffix ?> | 8 | <?ifdef Suffix ?> |
10 | <?undef Suffix ?> | 9 | <?undef Suffix ?> |
11 | <?undef DeferredSuffix ?> | 10 | <?undef DeferredSuffix ?> |
12 | <?endif ?> | 11 | <?endif?> |
13 | 12 | ||
14 | <?if $(var.platform)="x86" ?> | 13 | <?if $(var.platform)="x86" ?> |
15 | <?define Suffix="" ?> | 14 | <?define Suffix="" ?> |
16 | <?define DeferredSuffix="" ?> | 15 | <?define DeferredSuffix="" ?> |
17 | <?endif ?> | 16 | <?endif?> |
18 | 17 | ||
19 | <?if $(var.platform)="x64" ?> | 18 | <?if $(var.platform)="x64" ?> |
20 | <?define Suffix="_x64" ?> | 19 | <?define Suffix="_x64" ?> |
21 | <?define DeferredSuffix="_64" ?> | 20 | <?define DeferredSuffix="_64" ?> |
22 | <?endif ?> | 21 | <?endif?> |
23 | 22 | ||
24 | <?if $(var.platform)="arm" ?> | 23 | <?if $(var.platform)="arm" ?> |
25 | <?define Suffix="_ARM" ?> | 24 | <?define Suffix="_ARM" ?> |
26 | <?define DeferredSuffix="_ARM" ?> | 25 | <?define DeferredSuffix="_ARM" ?> |
27 | <?endif ?> | 26 | <?endif?> |
28 | </Include> | 27 | </Include> |
diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs index b2923eaa..8181b9b4 100644 --- a/src/wixlib/wixstdba.wxs +++ b/src/wixlib/wixstdba.wxs | |||
@@ -1,93 +1,92 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <!-- RTF License Payload Group --> | 5 | <!-- RTF License Payload Group --> |
7 | <Fragment> | 6 | <Fragment> |
8 | <PayloadGroup Id='WixStdbaRtfLicensePayloads'> | 7 | <PayloadGroup Id="WixStdbaRtfLicensePayloads"> |
9 | <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=RtfTheme.xml)' /> | 8 | <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=RtfTheme.xml)" /> |
10 | <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=RtfTheme.wxl)' /> | 9 | <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=RtfTheme.wxl)" /> |
11 | <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' /> | 10 | <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" /> |
12 | 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)" /> |
14 | </PayloadGroup> | 13 | </PayloadGroup> |
15 | 14 | ||
16 | <BundleCustomDataRef Id='WixStdbaInformation'> | 15 | <BundleCustomDataRef Id="WixStdbaInformation"> |
17 | <BundleElement> | 16 | <BundleElement> |
18 | <BundleAttribute Id='LicenseFile' Value='!(wix.WixStdbaLicenseRtfName=license.rtf)' /> | 17 | <BundleAttribute Id="LicenseFile" Value="!(wix.WixStdbaLicenseRtfName=license.rtf)" /> |
19 | </BundleElement> | 18 | </BundleElement> |
20 | </BundleCustomDataRef> | 19 | </BundleCustomDataRef> |
21 | </Fragment> | 20 | </Fragment> |
22 | 21 | ||
23 | <!-- RTF Large License Payload Group --> | 22 | <!-- RTF Large License Payload Group --> |
24 | <Fragment> | 23 | <Fragment> |
25 | <PayloadGroup Id='WixStdbaRtfLargeLicensePayloads'> | 24 | <PayloadGroup Id="WixStdbaRtfLargeLicensePayloads"> |
26 | <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=RtfLargeTheme.xml)' /> | 25 | <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=RtfLargeTheme.xml)" /> |
27 | <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=RtfTheme.wxl)' /> | 26 | <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=RtfTheme.wxl)" /> |
28 | <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' /> | 27 | <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" /> |
29 | 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)" /> |
31 | </PayloadGroup> | 30 | </PayloadGroup> |
32 | 31 | ||
33 | <BundleCustomDataRef Id='WixStdbaInformation'> | 32 | <BundleCustomDataRef Id="WixStdbaInformation"> |
34 | <BundleElement> | 33 | <BundleElement> |
35 | <BundleAttribute Id='LicenseFile' Value='!(wix.WixStdbaLicenseRtfName=license.rtf)' /> | 34 | <BundleAttribute Id="LicenseFile" Value="!(wix.WixStdbaLicenseRtfName=license.rtf)" /> |
36 | </BundleElement> | 35 | </BundleElement> |
37 | </BundleCustomDataRef> | 36 | </BundleCustomDataRef> |
38 | </Fragment> | 37 | </Fragment> |
39 | 38 | ||
40 | <!-- Hyperlink License Payload Group --> | 39 | <!-- Hyperlink License Payload Group --> |
41 | <Fragment> | 40 | <Fragment> |
42 | <PayloadGroup Id='WixStdbaHyperlinkLicensePayloads'> | 41 | <PayloadGroup Id="WixStdbaHyperlinkLicensePayloads"> |
43 | <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkTheme.xml)' /> | 42 | <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkTheme.xml)" /> |
44 | <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' /> | 43 | <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" /> |
45 | <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' /> | 44 | <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" /> |
46 | </PayloadGroup> | 45 | </PayloadGroup> |
47 | 46 | ||
48 | <BundleCustomDataRef Id='WixStdbaInformation'> | 47 | <BundleCustomDataRef Id="WixStdbaInformation"> |
49 | <BundleElement> | 48 | <BundleElement> |
50 | <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' /> | 49 | <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" /> |
51 | </BundleElement> | 50 | </BundleElement> |
52 | </BundleCustomDataRef> | 51 | </BundleCustomDataRef> |
53 | </Fragment> | 52 | </Fragment> |
54 | 53 | ||
55 | <!-- Hyperlink Large License Payload Group --> | 54 | <!-- Hyperlink Large License Payload Group --> |
56 | <Fragment> | 55 | <Fragment> |
57 | <PayloadGroup Id='WixStdbaHyperlinkLargeLicensePayloads'> | 56 | <PayloadGroup Id="WixStdbaHyperlinkLargeLicensePayloads"> |
58 | <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkLargeTheme.xml)' /> | 57 | <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkLargeTheme.xml)" /> |
59 | <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' /> | 58 | <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" /> |
60 | <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' /> | 59 | <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" /> |
61 | </PayloadGroup> | 60 | </PayloadGroup> |
62 | 61 | ||
63 | <BundleCustomDataRef Id='WixStdbaInformation'> | 62 | <BundleCustomDataRef Id="WixStdbaInformation"> |
64 | <BundleElement> | 63 | <BundleElement> |
65 | <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' /> | 64 | <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" /> |
66 | </BundleElement> | 65 | </BundleElement> |
67 | </BundleCustomDataRef> | 66 | </BundleCustomDataRef> |
68 | </Fragment> | 67 | </Fragment> |
69 | 68 | ||
70 | <!-- HyperlinkSidebar License Payload Group --> | 69 | <!-- HyperlinkSidebar License Payload Group --> |
71 | <Fragment> | 70 | <Fragment> |
72 | <PayloadGroup Id='WixStdbaHyperlinkSidebarLicensePayloads'> | 71 | <PayloadGroup Id="WixStdbaHyperlinkSidebarLicensePayloads"> |
73 | <Payload Name='thm.xml' Compressed='yes' SourceFile='!(wix.WixStdbaThemeXml=HyperlinkSidebarTheme.xml)' /> | 72 | <Payload Name="thm.xml" Compressed="yes" SourceFile="!(wix.WixStdbaThemeXml=HyperlinkSidebarTheme.xml)" /> |
74 | <Payload Name='thm.wxl' Compressed='yes' SourceFile='!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)' /> | 73 | <Payload Name="thm.wxl" Compressed="yes" SourceFile="!(wix.WixStdbaThemeWxl=HyperlinkTheme.wxl)" /> |
75 | <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' /> | 74 | <Payload Name="logo.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogo=logo.png)" /> |
76 | <Payload Name='logoside.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogoSide=logoside.png)' /> | 75 | <Payload Name="logoside.png" Compressed="yes" SourceFile="!(wix.WixStdbaLogoSide=logoside.png)" /> |
77 | </PayloadGroup> | 76 | </PayloadGroup> |
78 | 77 | ||
79 | <BundleCustomDataRef Id='WixStdbaInformation'> | 78 | <BundleCustomDataRef Id="WixStdbaInformation"> |
80 | <BundleElement> | 79 | <BundleElement> |
81 | <BundleAttribute Id='LicenseUrl' Value='!(wix.WixStdbaLicenseUrl)' /> | 80 | <BundleAttribute Id="LicenseUrl" Value="!(wix.WixStdbaLicenseUrl)" /> |
82 | </BundleElement> | 81 | </BundleElement> |
83 | </BundleCustomDataRef> | 82 | </BundleCustomDataRef> |
84 | </Fragment> | 83 | </Fragment> |
85 | 84 | ||
86 | <!-- BootstrapperApplicationData tables definition --> | 85 | <!-- BootstrapperApplicationData tables definition --> |
87 | <Fragment> | 86 | <Fragment> |
88 | <BundleCustomData Id='WixStdbaInformation'> | 87 | <BundleCustomData Id="WixStdbaInformation"> |
89 | <BundleAttributeDefinition Id='LicenseFile' /> | 88 | <BundleAttributeDefinition Id="LicenseFile" /> |
90 | <BundleAttributeDefinition Id='LicenseUrl' /> | 89 | <BundleAttributeDefinition Id="LicenseUrl" /> |
91 | </BundleCustomData> | 90 | </BundleCustomData> |
92 | </Fragment> | 91 | </Fragment> |
93 | </Wix> | 92 | </Wix> |
diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi index 4076e30c..a4dc917d 100644 --- a/src/wixlib/wixstdba_platform.wxi +++ b/src/wixlib/wixstdba_platform.wxi | |||
@@ -1,41 +1,40 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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 | 2 | ||
4 | 3 | ||
5 | <Include xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <?include caSuffix.wxi ?> | 5 | <?include caSuffix.wxi ?> |
7 | <Fragment> | 6 | <Fragment> |
8 | <BootstrapperApplication Id='WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'> | 7 | <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> |
9 | <PayloadGroupRef Id='WixStdbaRtfLicensePayloads' /> | 8 | <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" /> |
10 | </BootstrapperApplication> | 9 | </BootstrapperApplication> |
11 | </Fragment> | 10 | </Fragment> |
12 | 11 | ||
13 | <Fragment> | 12 | <Fragment> |
14 | <BootstrapperApplication Id='WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'> | 13 | <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> |
15 | <PayloadGroupRef Id='WixStdbaRtfLargeLicensePayloads' /> | 14 | <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" /> |
16 | </BootstrapperApplication> | 15 | </BootstrapperApplication> |
17 | </Fragment> | 16 | </Fragment> |
18 | 17 | ||
19 | <Fragment> | 18 | <Fragment> |
20 | <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'> | 19 | <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> |
21 | <PayloadGroupRef Id='WixStdbaHyperlinkLicensePayloads' /> | 20 | <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" /> |
22 | </BootstrapperApplication> | 21 | </BootstrapperApplication> |
23 | </Fragment> | 22 | </Fragment> |
24 | 23 | ||
25 | <Fragment> | 24 | <Fragment> |
26 | <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'> | 25 | <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> |
27 | <PayloadGroupRef Id='WixStdbaHyperlinkLargeLicensePayloads' /> | 26 | <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" /> |
28 | </BootstrapperApplication> | 27 | </BootstrapperApplication> |
29 | </Fragment> | 28 | </Fragment> |
30 | 29 | ||
31 | <Fragment> | 30 | <Fragment> |
32 | <BootstrapperApplication Id='WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)' SourceFile='!(bindpath.$(var.platform))\wixstdba.dll'> | 31 | <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll"> |
33 | <PayloadGroupRef Id='WixStdbaHyperlinkSidebarLicensePayloads' /> | 32 | <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" /> |
34 | </BootstrapperApplication> | 33 | </BootstrapperApplication> |
35 | </Fragment> | 34 | </Fragment> |
36 | 35 | ||
37 | <Fragment> | 36 | <Fragment> |
38 | 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" /> |
40 | </Fragment> | 39 | </Fragment> |
41 | </Include> | 40 | </Include> |
diff --git a/src/wixlib/wixstdba_x86.wxs b/src/wixlib/wixstdba_x86.wxs index 09a5080c..e3ad07e8 100644 --- a/src/wixlib/wixstdba_x86.wxs +++ b/src/wixlib/wixstdba_x86.wxs | |||
@@ -1,8 +1,7 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <?define platform=x86 ?> | 5 | <?define platform=x86 ?> |
7 | <?include wixstdba_platform.wxi ?> | 6 | <?include wixstdba_platform.wxi ?> |
8 | </Wix> | 7 | </Wix> |