@joebigelow / wix-1 / commits / 091573d4

Central caDecor and caErr.

Bob Arnson committed Feb 10, 2022 at 00:38 UTC 091573d459d6ab4947bd39bd3bc8faee3d18b4fc
30 files changed +28 -924
src/ext/Bal/wixlib/BalExtension_platform.wxi
+8 -1
@@ -2,7 +2,8 @@
2
3
4 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caDecor.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6 +
7 <Fragment>
8 <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)">
9 <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\dnchost.dll" />
@@ -10,6 +11,7 @@
11 <PayloadGroupRef Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads" />
12 </BootstrapperApplication>
13 </Fragment>
14 +
15 <Fragment>
16 <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost.Standard$(var.Suffix)">
17 <PayloadGroupRef Id="DncPreqStandardPayloads" />
@@ -22,30 +24,35 @@
24 <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
25 </BootstrapperApplication>
26 </Fragment>
27 +
28 <Fragment>
29 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
30 <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
31 </BootstrapperApplication>
32 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
33 </Fragment>
34 +
35 <Fragment>
36 <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
37 <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
38 </BootstrapperApplication>
39 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
40 </Fragment>
41 +
42 <Fragment>
43 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
44 <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
45 </BootstrapperApplication>
46 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
47 </Fragment>
48 +
49 <Fragment>
50 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
51 <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
52 </BootstrapperApplication>
53 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
54 </Fragment>
55 +
56 <Fragment>
57 <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
58 <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
src/ext/Bal/wixlib/Mbahost_platform.wxi
+3 -1
@@ -2,7 +2,8 @@
2
3
4 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caDecor.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6 +
7 <Fragment>
8 <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
9 <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
@@ -10,6 +11,7 @@
11 <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
12 </BootstrapperApplication>
13 </Fragment>
14 +
15 <Fragment>
16 <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)">
17 <PayloadGroupRef Id="MbaPreqStandardPayloads" />
src/ext/Bal/wixlib/caDecor.wxi deleted
-39
@@ -1,39 +0,0 @@
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 -
4 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?ifdef Prefix ?>
6 - <?undef Prefix ?>
7 - <?endif?>
8 -
9 - <?define Prefix="Wix4" ?>
10 -
11 - <?ifndef platform ?>
12 - <?define platform="x86" ?>
13 - <?endif?>
14 -
15 - <?if $(var.platform)="" ?>
16 - <?undef platform ?>
17 - <?define platform="x86" ?>
18 - <?endif?>
19 -
20 - <?ifdef Suffix ?>
21 - <?undef Suffix ?>
22 - <?endif?>
23 -
24 - <?if $(var.platform)~="x86" ?>
25 - <?define Suffix="_X86" ?>
26 - <?endif?>
27 -
28 - <?if $(var.platform)~="x64" ?>
29 - <?define Suffix="_X64" ?>
30 - <?endif?>
31 -
32 - <?if $(var.platform)~="arm" ?>
33 - <?define Suffix="_A32" ?>
34 - <?endif?>
35 -
36 - <?if $(var.platform)~="arm64" ?>
37 - <?define Suffix="_A64" ?>
38 - <?endif?>
39 -</Include>
src/ext/ComPlus/wixlib/ComPlusExtension.wxs
+1 -1
@@ -1,7 +1,7 @@
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 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 - <?include caerr.wxi ?>
4 + <?include ..\..\caerr.wxi ?>
5
6 <Fragment>
7 <UI Id="ComPlusUI">
src/ext/Dependency/wixlib/DependencyExtension.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caerr.wxi ?>
5 + <?include ..\..\caerr.wxi ?>
6
7 <Fragment>
8 <UI Id="WixDependencyErrors">
src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
+1 -1
@@ -2,7 +2,7 @@
2
3
4 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caDecor.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6
7 <Fragment>
8 <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
src/ext/Dependency/wixlib/caDecor.wxi deleted
-39
@@ -1,39 +0,0 @@
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 -
4 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?ifdef Prefix ?>
6 - <?undef Prefix ?>
7 - <?endif?>
8 -
9 - <?define Prefix="Wix4" ?>
10 -
11 - <?ifndef platform ?>
12 - <?define platform="x86" ?>
13 - <?endif?>
14 -
15 - <?if $(var.platform)="" ?>
16 - <?undef platform ?>
17 - <?define platform="x86" ?>
18 - <?endif?>
19 -
20 - <?ifdef Suffix ?>
21 - <?undef Suffix ?>
22 - <?endif?>
23 -
24 - <?if $(var.platform)~="x86" ?>
25 - <?define Suffix="_X86" ?>
26 - <?endif?>
27 -
28 - <?if $(var.platform)~="x64" ?>
29 - <?define Suffix="_X64" ?>
30 - <?endif?>
31 -
32 - <?if $(var.platform)~="arm" ?>
33 - <?define Suffix="_A32" ?>
34 - <?endif?>
35 -
36 - <?if $(var.platform)~="arm64" ?>
37 - <?define Suffix="_A64" ?>
38 - <?endif?>
39 -</Include>
src/ext/Dependency/wixlib/caerr.wxi deleted
-96
@@ -1,96 +0,0 @@
1 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 - <?define msierrSecureObjectsFailedSet = 25521?>
4 - <?define msierrSecureObjectsUnknownType = 25522?>
5 - <?define msierrXmlFileFailedRead = 25530?>
6 - <?define msierrXmlFileFailedOpen = 25531?>
7 - <?define msierrXmlFileFailedSelect = 25532?>
8 - <?define msierrXmlFileFailedSave = 25533?>
9 - <?define msierrXmlConfigFailedRead = 25540?>
10 - <?define msierrXmlConfigFailedOpen = 25541?>
11 - <?define msierrXmlConfigFailedSelect = 25542?>
12 - <?define msierrXmlConfigFailedSave = 25543?>
13 - <?define msierrFirewallCannotConnect = 25580?>
14 - <?define msierrIISCannotConnect = 26001?>
15 - <?define msierrIISFailedReadWebSite = 26002?>
16 - <?define msierrIISFailedReadWebDirs = 26003?>
17 - <?define msierrIISFailedReadVDirs = 26004?>
18 - <?define msierrIISFailedReadFilters = 26005?>
19 - <?define msierrIISFailedReadAppPool = 26006?>
20 - <?define msierrIISFailedReadMimeMap = 26007?>
21 - <?define msierrIISFailedReadProp = 26008?>
22 - <?define msierrIISFailedReadWebSvcExt = 26009?>
23 - <?define msierrIISFailedReadWebError = 26010?>
24 - <?define msierrIISFailedReadHttpHeader = 26011?>
25 - <?define msierrIISFailedSchedTransaction = 26031?>
26 - <?define msierrIISFailedSchedInstallWebs = 26032?>
27 - <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 - <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 - <?define msierrIISFailedSchedInstallFilters = 26035?>
30 - <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 - <?define msierrIISFailedSchedInstallProp = 26037?>
32 - <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 - <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 - <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 - <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 - <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 - <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 - <?define msierrIISFailedSchedUninstallProp = 26056?>
39 - <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 - <?define msierrIISFailedStartTransaction = 26101?>
41 - <?define msierrIISFailedOpenKey = 26102?>
42 - <?define msierrIISFailedCreateKey = 26103?>
43 - <?define msierrIISFailedWriteData = 26104?>
44 - <?define msierrIISFailedCreateApp = 26105?>
45 - <?define msierrIISFailedDeleteKey = 26106?>
46 - <?define msierrIISFailedDeleteApp = 26107?>
47 - <?define msierrIISFailedDeleteValue = 26108?>
48 - <?define msierrIISFailedCommitInUse = 26109?>
49 - <?define msierrSQLFailedCreateDatabase = 26201?>
50 - <?define msierrSQLFailedDropDatabase = 26202?>
51 - <?define msierrSQLFailedConnectDatabase = 26203?>
52 - <?define msierrSQLFailedExecString = 26204?>
53 - <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 - <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 - <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 - <?define msierrInstallPerfCounterData = 26253?>
57 - <?define msierrUninstallPerfCounterData = 26254?>
58 - <?define msierrSMBFailedCreate = 26301?>
59 - <?define msierrSMBFailedDrop = 26302?>
60 - <?define msierrCERTFailedOpen = 26351?>
61 - <?define msierrCERTFailedAdd = 26352?>
62 - <?define msierrUSRFailedUserCreate = 26401?>
63 - <?define msierrUSRFailedUserCreatePswd = 26402?>
64 - <?define msierrUSRFailedUserGroupAdd = 26403?>
65 - <?define msierrUSRFailedUserCreateExists = 26404?>
66 - <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 - <?define msierrDependencyMissingDependencies = 26451?>
68 - <?define msierrDependencyHasDependents = 26452?>
69 - <?define msierrDotNetRuntimeRequired = 27000?>
70 - <?define msierrComPlusCannotConnect = 28001?>
71 - <?define msierrComPlusPartitionReadFailed = 28002?>
72 - <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 - <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 - <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 - <?define msierrComPlusApplicationReadFailed = 28006?>
76 - <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 - <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 - <?define msierrComPlusAssembliesReadFailed = 28009?>
79 - <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 - <?define msierrComPlusPartitionDependency = 28011?>
81 - <?define msierrComPlusPartitionNotFound = 28012?>
82 - <?define msierrComPlusPartitionIdConflict = 28013?>
83 - <?define msierrComPlusPartitionNameConflict = 28014?>
84 - <?define msierrComPlusApplicationDependency = 28015?>
85 - <?define msierrComPlusApplicationNotFound = 28016?>
86 - <?define msierrComPlusApplicationIdConflict = 28017?>
87 - <?define msierrComPlusApplicationNameConflict = 28018?>
88 - <?define msierrComPlusApplicationRoleDependency = 28019?>
89 - <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 - <?define msierrComPlusApplicationRoleConflict = 28021?>
91 - <?define msierrComPlusAssemblyDependency = 28022?>
92 - <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 - <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 - <?define msierrComPlusFailedLookupNames = 28025?>
95 - <?define msierrMsmqCannotConnect = 28101?>
96 -</Include>
\ No newline at end of file
src/ext/Firewall/wixlib/FirewallExtension.wxs
+2 -1
@@ -2,7 +2,8 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caerr.wxi ?>
5 + <?include ..\..\caerr.wxi ?>
6 +
7 <Fragment>
8 <UI Id="WixFirewallErrors">
9 <Error Id="$(var.msierrFirewallCannotConnect)" Message="!(loc.msierrFirewallCannotConnect)" />
src/ext/Firewall/wixlib/caerr.wxi deleted
-96
@@ -1,96 +0,0 @@
1 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 - <?define msierrSecureObjectsFailedSet = 25521?>
4 - <?define msierrSecureObjectsUnknownType = 25522?>
5 - <?define msierrXmlFileFailedRead = 25530?>
6 - <?define msierrXmlFileFailedOpen = 25531?>
7 - <?define msierrXmlFileFailedSelect = 25532?>
8 - <?define msierrXmlFileFailedSave = 25533?>
9 - <?define msierrXmlConfigFailedRead = 25540?>
10 - <?define msierrXmlConfigFailedOpen = 25541?>
11 - <?define msierrXmlConfigFailedSelect = 25542?>
12 - <?define msierrXmlConfigFailedSave = 25543?>
13 - <?define msierrFirewallCannotConnect = 25580?>
14 - <?define msierrIISCannotConnect = 26001?>
15 - <?define msierrIISFailedReadWebSite = 26002?>
16 - <?define msierrIISFailedReadWebDirs = 26003?>
17 - <?define msierrIISFailedReadVDirs = 26004?>
18 - <?define msierrIISFailedReadFilters = 26005?>
19 - <?define msierrIISFailedReadAppPool = 26006?>
20 - <?define msierrIISFailedReadMimeMap = 26007?>
21 - <?define msierrIISFailedReadProp = 26008?>
22 - <?define msierrIISFailedReadWebSvcExt = 26009?>
23 - <?define msierrIISFailedReadWebError = 26010?>
24 - <?define msierrIISFailedReadHttpHeader = 26011?>
25 - <?define msierrIISFailedSchedTransaction = 26031?>
26 - <?define msierrIISFailedSchedInstallWebs = 26032?>
27 - <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 - <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 - <?define msierrIISFailedSchedInstallFilters = 26035?>
30 - <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 - <?define msierrIISFailedSchedInstallProp = 26037?>
32 - <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 - <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 - <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 - <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 - <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 - <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 - <?define msierrIISFailedSchedUninstallProp = 26056?>
39 - <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 - <?define msierrIISFailedStartTransaction = 26101?>
41 - <?define msierrIISFailedOpenKey = 26102?>
42 - <?define msierrIISFailedCreateKey = 26103?>
43 - <?define msierrIISFailedWriteData = 26104?>
44 - <?define msierrIISFailedCreateApp = 26105?>
45 - <?define msierrIISFailedDeleteKey = 26106?>
46 - <?define msierrIISFailedDeleteApp = 26107?>
47 - <?define msierrIISFailedDeleteValue = 26108?>
48 - <?define msierrIISFailedCommitInUse = 26109?>
49 - <?define msierrSQLFailedCreateDatabase = 26201?>
50 - <?define msierrSQLFailedDropDatabase = 26202?>
51 - <?define msierrSQLFailedConnectDatabase = 26203?>
52 - <?define msierrSQLFailedExecString = 26204?>
53 - <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 - <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 - <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 - <?define msierrInstallPerfCounterData = 26253?>
57 - <?define msierrUninstallPerfCounterData = 26254?>
58 - <?define msierrSMBFailedCreate = 26301?>
59 - <?define msierrSMBFailedDrop = 26302?>
60 - <?define msierrCERTFailedOpen = 26351?>
61 - <?define msierrCERTFailedAdd = 26352?>
62 - <?define msierrUSRFailedUserCreate = 26401?>
63 - <?define msierrUSRFailedUserCreatePswd = 26402?>
64 - <?define msierrUSRFailedUserGroupAdd = 26403?>
65 - <?define msierrUSRFailedUserCreateExists = 26404?>
66 - <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 - <?define msierrDependencyMissingDependencies = 26451?>
68 - <?define msierrDependencyHasDependents = 26452?>
69 - <?define msierrDotNetRuntimeRequired = 27000?>
70 - <?define msierrComPlusCannotConnect = 28001?>
71 - <?define msierrComPlusPartitionReadFailed = 28002?>
72 - <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 - <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 - <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 - <?define msierrComPlusApplicationReadFailed = 28006?>
76 - <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 - <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 - <?define msierrComPlusAssembliesReadFailed = 28009?>
79 - <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 - <?define msierrComPlusPartitionDependency = 28011?>
81 - <?define msierrComPlusPartitionNotFound = 28012?>
82 - <?define msierrComPlusPartitionIdConflict = 28013?>
83 - <?define msierrComPlusPartitionNameConflict = 28014?>
84 - <?define msierrComPlusApplicationDependency = 28015?>
85 - <?define msierrComPlusApplicationNotFound = 28016?>
86 - <?define msierrComPlusApplicationIdConflict = 28017?>
87 - <?define msierrComPlusApplicationNameConflict = 28018?>
88 - <?define msierrComPlusApplicationRoleDependency = 28019?>
89 - <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 - <?define msierrComPlusApplicationRoleConflict = 28021?>
91 - <?define msierrComPlusAssemblyDependency = 28022?>
92 - <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 - <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 - <?define msierrComPlusFailedLookupNames = 28025?>
95 - <?define msierrMsmqCannotConnect = 28101?>
96 -</Include>
\ No newline at end of file
src/ext/Http/wixlib/HttpExtension.wxs
+2 -1
@@ -2,7 +2,8 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caerr.wxi ?>
5 + <?include ..\..\caerr.wxi ?>
6 +
7 <Fragment>
8 <UI Id="WixHttpErrors">
9 </UI>
src/ext/Http/wixlib/HttpExtension_Platform.wxi
+1 -1
@@ -2,7 +2,7 @@
2
3
4 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caDecor.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6
7 <Fragment>
8 <UIRef Id="WixHttpErrors" />
src/ext/Http/wixlib/caDecor.wxi deleted
-39
@@ -1,39 +0,0 @@
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 -
4 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?ifdef Prefix ?>
6 - <?undef Prefix ?>
7 - <?endif?>
8 -
9 - <?define Prefix="Wix4" ?>
10 -
11 - <?ifndef platform ?>
12 - <?define platform="x86" ?>
13 - <?endif?>
14 -
15 - <?if $(var.platform)="" ?>
16 - <?undef platform ?>
17 - <?define platform="x86" ?>
18 - <?endif?>
19 -
20 - <?ifdef Suffix ?>
21 - <?undef Suffix ?>
22 - <?endif?>
23 -
24 - <?if $(var.platform)~="x86" ?>
25 - <?define Suffix="_X86" ?>
26 - <?endif?>
27 -
28 - <?if $(var.platform)~="x64" ?>
29 - <?define Suffix="_X64" ?>
30 - <?endif?>
31 -
32 - <?if $(var.platform)~="arm" ?>
33 - <?define Suffix="_A32" ?>
34 - <?endif?>
35 -
36 - <?if $(var.platform)~="arm64" ?>
37 - <?define Suffix="_A64" ?>
38 - <?endif?>
39 -</Include>
src/ext/Http/wixlib/caerr.wxi deleted
-96
@@ -1,96 +0,0 @@
1 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 - <?define msierrSecureObjectsFailedSet = 25521?>
4 - <?define msierrSecureObjectsUnknownType = 25522?>
5 - <?define msierrXmlFileFailedRead = 25530?>
6 - <?define msierrXmlFileFailedOpen = 25531?>
7 - <?define msierrXmlFileFailedSelect = 25532?>
8 - <?define msierrXmlFileFailedSave = 25533?>
9 - <?define msierrXmlConfigFailedRead = 25540?>
10 - <?define msierrXmlConfigFailedOpen = 25541?>
11 - <?define msierrXmlConfigFailedSelect = 25542?>
12 - <?define msierrXmlConfigFailedSave = 25543?>
13 - <?define msierrFirewallCannotConnect = 25580?>
14 - <?define msierrIISCannotConnect = 26001?>
15 - <?define msierrIISFailedReadWebSite = 26002?>
16 - <?define msierrIISFailedReadWebDirs = 26003?>
17 - <?define msierrIISFailedReadVDirs = 26004?>
18 - <?define msierrIISFailedReadFilters = 26005?>
19 - <?define msierrIISFailedReadAppPool = 26006?>
20 - <?define msierrIISFailedReadMimeMap = 26007?>
21 - <?define msierrIISFailedReadProp = 26008?>
22 - <?define msierrIISFailedReadWebSvcExt = 26009?>
23 - <?define msierrIISFailedReadWebError = 26010?>
24 - <?define msierrIISFailedReadHttpHeader = 26011?>
25 - <?define msierrIISFailedSchedTransaction = 26031?>
26 - <?define msierrIISFailedSchedInstallWebs = 26032?>
27 - <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 - <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 - <?define msierrIISFailedSchedInstallFilters = 26035?>
30 - <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 - <?define msierrIISFailedSchedInstallProp = 26037?>
32 - <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 - <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 - <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 - <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 - <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 - <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 - <?define msierrIISFailedSchedUninstallProp = 26056?>
39 - <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 - <?define msierrIISFailedStartTransaction = 26101?>
41 - <?define msierrIISFailedOpenKey = 26102?>
42 - <?define msierrIISFailedCreateKey = 26103?>
43 - <?define msierrIISFailedWriteData = 26104?>
44 - <?define msierrIISFailedCreateApp = 26105?>
45 - <?define msierrIISFailedDeleteKey = 26106?>
46 - <?define msierrIISFailedDeleteApp = 26107?>
47 - <?define msierrIISFailedDeleteValue = 26108?>
48 - <?define msierrIISFailedCommitInUse = 26109?>
49 - <?define msierrSQLFailedCreateDatabase = 26201?>
50 - <?define msierrSQLFailedDropDatabase = 26202?>
51 - <?define msierrSQLFailedConnectDatabase = 26203?>
52 - <?define msierrSQLFailedExecString = 26204?>
53 - <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 - <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 - <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 - <?define msierrInstallPerfCounterData = 26253?>
57 - <?define msierrUninstallPerfCounterData = 26254?>
58 - <?define msierrSMBFailedCreate = 26301?>
59 - <?define msierrSMBFailedDrop = 26302?>
60 - <?define msierrCERTFailedOpen = 26351?>
61 - <?define msierrCERTFailedAdd = 26352?>
62 - <?define msierrUSRFailedUserCreate = 26401?>
63 - <?define msierrUSRFailedUserCreatePswd = 26402?>
64 - <?define msierrUSRFailedUserGroupAdd = 26403?>
65 - <?define msierrUSRFailedUserCreateExists = 26404?>
66 - <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 - <?define msierrDependencyMissingDependencies = 26451?>
68 - <?define msierrDependencyHasDependents = 26452?>
69 - <?define msierrDotNetRuntimeRequired = 27000?>
70 - <?define msierrComPlusCannotConnect = 28001?>
71 - <?define msierrComPlusPartitionReadFailed = 28002?>
72 - <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 - <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 - <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 - <?define msierrComPlusApplicationReadFailed = 28006?>
76 - <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 - <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 - <?define msierrComPlusAssembliesReadFailed = 28009?>
79 - <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 - <?define msierrComPlusPartitionDependency = 28011?>
81 - <?define msierrComPlusPartitionNotFound = 28012?>
82 - <?define msierrComPlusPartitionIdConflict = 28013?>
83 - <?define msierrComPlusPartitionNameConflict = 28014?>
84 - <?define msierrComPlusApplicationDependency = 28015?>
85 - <?define msierrComPlusApplicationNotFound = 28016?>
86 - <?define msierrComPlusApplicationIdConflict = 28017?>
87 - <?define msierrComPlusApplicationNameConflict = 28018?>
88 - <?define msierrComPlusApplicationRoleDependency = 28019?>
89 - <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 - <?define msierrComPlusApplicationRoleConflict = 28021?>
91 - <?define msierrComPlusAssemblyDependency = 28022?>
92 - <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 - <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 - <?define msierrComPlusFailedLookupNames = 28025?>
95 - <?define msierrMsmqCannotConnect = 28101?>
96 -</Include>
\ No newline at end of file
src/ext/Iis/wixlib/IIsExtension.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caerr.wxi ?>
5 + <?include ..\..\caerr.wxi ?>
6
7 <Fragment>
8 <Property Id="IISMAJORVERSION">
src/ext/Iis/wixlib/caerr.wxi deleted
-96
@@ -1,96 +0,0 @@
1 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 - <?define msierrSecureObjectsFailedSet = 25521?>
4 - <?define msierrSecureObjectsUnknownType = 25522?>
5 - <?define msierrXmlFileFailedRead = 25530?>
6 - <?define msierrXmlFileFailedOpen = 25531?>
7 - <?define msierrXmlFileFailedSelect = 25532?>
8 - <?define msierrXmlFileFailedSave = 25533?>
9 - <?define msierrXmlConfigFailedRead = 25540?>
10 - <?define msierrXmlConfigFailedOpen = 25541?>
11 - <?define msierrXmlConfigFailedSelect = 25542?>
12 - <?define msierrXmlConfigFailedSave = 25543?>
13 - <?define msierrFirewallCannotConnect = 25580?>
14 - <?define msierrIISCannotConnect = 26001?>
15 - <?define msierrIISFailedReadWebSite = 26002?>
16 - <?define msierrIISFailedReadWebDirs = 26003?>
17 - <?define msierrIISFailedReadVDirs = 26004?>
18 - <?define msierrIISFailedReadFilters = 26005?>
19 - <?define msierrIISFailedReadAppPool = 26006?>
20 - <?define msierrIISFailedReadMimeMap = 26007?>
21 - <?define msierrIISFailedReadProp = 26008?>
22 - <?define msierrIISFailedReadWebSvcExt = 26009?>
23 - <?define msierrIISFailedReadWebError = 26010?>
24 - <?define msierrIISFailedReadHttpHeader = 26011?>
25 - <?define msierrIISFailedSchedTransaction = 26031?>
26 - <?define msierrIISFailedSchedInstallWebs = 26032?>
27 - <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 - <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 - <?define msierrIISFailedSchedInstallFilters = 26035?>
30 - <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 - <?define msierrIISFailedSchedInstallProp = 26037?>
32 - <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 - <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 - <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 - <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 - <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 - <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 - <?define msierrIISFailedSchedUninstallProp = 26056?>
39 - <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 - <?define msierrIISFailedStartTransaction = 26101?>
41 - <?define msierrIISFailedOpenKey = 26102?>
42 - <?define msierrIISFailedCreateKey = 26103?>
43 - <?define msierrIISFailedWriteData = 26104?>
44 - <?define msierrIISFailedCreateApp = 26105?>
45 - <?define msierrIISFailedDeleteKey = 26106?>
46 - <?define msierrIISFailedDeleteApp = 26107?>
47 - <?define msierrIISFailedDeleteValue = 26108?>
48 - <?define msierrIISFailedCommitInUse = 26109?>
49 - <?define msierrSQLFailedCreateDatabase = 26201?>
50 - <?define msierrSQLFailedDropDatabase = 26202?>
51 - <?define msierrSQLFailedConnectDatabase = 26203?>
52 - <?define msierrSQLFailedExecString = 26204?>
53 - <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 - <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 - <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 - <?define msierrInstallPerfCounterData = 26253?>
57 - <?define msierrUninstallPerfCounterData = 26254?>
58 - <?define msierrSMBFailedCreate = 26301?>
59 - <?define msierrSMBFailedDrop = 26302?>
60 - <?define msierrCERTFailedOpen = 26351?>
61 - <?define msierrCERTFailedAdd = 26352?>
62 - <?define msierrUSRFailedUserCreate = 26401?>
63 - <?define msierrUSRFailedUserCreatePswd = 26402?>
64 - <?define msierrUSRFailedUserGroupAdd = 26403?>
65 - <?define msierrUSRFailedUserCreateExists = 26404?>
66 - <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 - <?define msierrDependencyMissingDependencies = 26451?>
68 - <?define msierrDependencyHasDependents = 26452?>
69 - <?define msierrDotNetRuntimeRequired = 27000?>
70 - <?define msierrComPlusCannotConnect = 28001?>
71 - <?define msierrComPlusPartitionReadFailed = 28002?>
72 - <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 - <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 - <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 - <?define msierrComPlusApplicationReadFailed = 28006?>
76 - <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 - <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 - <?define msierrComPlusAssembliesReadFailed = 28009?>
79 - <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 - <?define msierrComPlusPartitionDependency = 28011?>
81 - <?define msierrComPlusPartitionNotFound = 28012?>
82 - <?define msierrComPlusPartitionIdConflict = 28013?>
83 - <?define msierrComPlusPartitionNameConflict = 28014?>
84 - <?define msierrComPlusApplicationDependency = 28015?>
85 - <?define msierrComPlusApplicationNotFound = 28016?>
86 - <?define msierrComPlusApplicationIdConflict = 28017?>
87 - <?define msierrComPlusApplicationNameConflict = 28018?>
88 - <?define msierrComPlusApplicationRoleDependency = 28019?>
89 - <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 - <?define msierrComPlusApplicationRoleConflict = 28021?>
91 - <?define msierrComPlusAssemblyDependency = 28022?>
92 - <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 - <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 - <?define msierrComPlusFailedLookupNames = 28025?>
95 - <?define msierrMsmqCannotConnect = 28101?>
96 -</Include>
\ No newline at end of file
src/ext/Msmq/wixlib/MsmqExtension.wxs
+1 -1
@@ -2,7 +2,7 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caerr.wxi ?>
5 + <?include ..\..\caerr.wxi ?>
6
7 <Fragment>
8 <UI>
src/ext/Msmq/wixlib/caerr.wxi deleted
-96
@@ -1,96 +0,0 @@
1 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 - <?define msierrSecureObjectsFailedSet = 25521?>
4 - <?define msierrSecureObjectsUnknownType = 25522?>
5 - <?define msierrXmlFileFailedRead = 25530?>
6 - <?define msierrXmlFileFailedOpen = 25531?>
7 - <?define msierrXmlFileFailedSelect = 25532?>
8 - <?define msierrXmlFileFailedSave = 25533?>
9 - <?define msierrXmlConfigFailedRead = 25540?>
10 - <?define msierrXmlConfigFailedOpen = 25541?>
11 - <?define msierrXmlConfigFailedSelect = 25542?>
12 - <?define msierrXmlConfigFailedSave = 25543?>
13 - <?define msierrFirewallCannotConnect = 25580?>
14 - <?define msierrIISCannotConnect = 26001?>
15 - <?define msierrIISFailedReadWebSite = 26002?>
16 - <?define msierrIISFailedReadWebDirs = 26003?>
17 - <?define msierrIISFailedReadVDirs = 26004?>
18 - <?define msierrIISFailedReadFilters = 26005?>
19 - <?define msierrIISFailedReadAppPool = 26006?>
20 - <?define msierrIISFailedReadMimeMap = 26007?>
21 - <?define msierrIISFailedReadProp = 26008?>
22 - <?define msierrIISFailedReadWebSvcExt = 26009?>
23 - <?define msierrIISFailedReadWebError = 26010?>
24 - <?define msierrIISFailedReadHttpHeader = 26011?>
25 - <?define msierrIISFailedSchedTransaction = 26031?>
26 - <?define msierrIISFailedSchedInstallWebs = 26032?>
27 - <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 - <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 - <?define msierrIISFailedSchedInstallFilters = 26035?>
30 - <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 - <?define msierrIISFailedSchedInstallProp = 26037?>
32 - <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 - <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 - <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 - <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 - <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 - <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 - <?define msierrIISFailedSchedUninstallProp = 26056?>
39 - <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 - <?define msierrIISFailedStartTransaction = 26101?>
41 - <?define msierrIISFailedOpenKey = 26102?>
42 - <?define msierrIISFailedCreateKey = 26103?>
43 - <?define msierrIISFailedWriteData = 26104?>
44 - <?define msierrIISFailedCreateApp = 26105?>
45 - <?define msierrIISFailedDeleteKey = 26106?>
46 - <?define msierrIISFailedDeleteApp = 26107?>
47 - <?define msierrIISFailedDeleteValue = 26108?>
48 - <?define msierrIISFailedCommitInUse = 26109?>
49 - <?define msierrSQLFailedCreateDatabase = 26201?>
50 - <?define msierrSQLFailedDropDatabase = 26202?>
51 - <?define msierrSQLFailedConnectDatabase = 26203?>
52 - <?define msierrSQLFailedExecString = 26204?>
53 - <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 - <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 - <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 - <?define msierrInstallPerfCounterData = 26253?>
57 - <?define msierrUninstallPerfCounterData = 26254?>
58 - <?define msierrSMBFailedCreate = 26301?>
59 - <?define msierrSMBFailedDrop = 26302?>
60 - <?define msierrCERTFailedOpen = 26351?>
61 - <?define msierrCERTFailedAdd = 26352?>
62 - <?define msierrUSRFailedUserCreate = 26401?>
63 - <?define msierrUSRFailedUserCreatePswd = 26402?>
64 - <?define msierrUSRFailedUserGroupAdd = 26403?>
65 - <?define msierrUSRFailedUserCreateExists = 26404?>
66 - <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 - <?define msierrDependencyMissingDependencies = 26451?>
68 - <?define msierrDependencyHasDependents = 26452?>
69 - <?define msierrDotNetRuntimeRequired = 27000?>
70 - <?define msierrComPlusCannotConnect = 28001?>
71 - <?define msierrComPlusPartitionReadFailed = 28002?>
72 - <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 - <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 - <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 - <?define msierrComPlusApplicationReadFailed = 28006?>
76 - <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 - <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 - <?define msierrComPlusAssembliesReadFailed = 28009?>
79 - <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 - <?define msierrComPlusPartitionDependency = 28011?>
81 - <?define msierrComPlusPartitionNotFound = 28012?>
82 - <?define msierrComPlusPartitionIdConflict = 28013?>
83 - <?define msierrComPlusPartitionNameConflict = 28014?>
84 - <?define msierrComPlusApplicationDependency = 28015?>
85 - <?define msierrComPlusApplicationNotFound = 28016?>
86 - <?define msierrComPlusApplicationIdConflict = 28017?>
87 - <?define msierrComPlusApplicationNameConflict = 28018?>
88 - <?define msierrComPlusApplicationRoleDependency = 28019?>
89 - <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 - <?define msierrComPlusApplicationRoleConflict = 28021?>
91 - <?define msierrComPlusAssemblyDependency = 28022?>
92 - <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 - <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 - <?define msierrComPlusFailedLookupNames = 28025?>
95 - <?define msierrMsmqCannotConnect = 28101?>
96 -</Include>
\ No newline at end of file
src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
+1 -2
@@ -2,8 +2,7 @@
2
3
4 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 -
6 - <?include caDecor.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6
7 <Fragment>
8 <CustomAction Id="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" DllEntry="SchedNetFx" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
src/ext/NetFx/wixlib/caDecor.wxi deleted
-39
@@ -1,39 +0,0 @@
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 -
4 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?ifdef Prefix ?>
6 - <?undef Prefix ?>
7 - <?endif?>
8 -
9 - <?define Prefix="Wix4" ?>
10 -
11 - <?ifndef platform ?>
12 - <?define platform="x86" ?>
13 - <?endif?>
14 -
15 - <?if $(var.platform)="" ?>
16 - <?undef platform ?>
17 - <?define platform="x86" ?>
18 - <?endif?>
19 -
20 - <?ifdef Suffix ?>
21 - <?undef Suffix ?>
22 - <?endif?>
23 -
24 - <?if $(var.platform)~="x86" ?>
25 - <?define Suffix="_X86" ?>
26 - <?endif?>
27 -
28 - <?if $(var.platform)~="x64" ?>
29 - <?define Suffix="_X64" ?>
30 - <?endif?>
31 -
32 - <?if $(var.platform)~="arm" ?>
33 - <?define Suffix="_A32" ?>
34 - <?endif?>
35 -
36 - <?if $(var.platform)~="arm64" ?>
37 - <?define Suffix="_A64" ?>
38 - <?endif?>
39 -</Include>
src/ext/Sql/wixlib/SqlExtension.wxi
+1 -1
@@ -1,7 +1,7 @@
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 - <?include caDecor.wxi ?>
4 + <?include ..\..\caDecor.wxi ?>
5
6 <Fragment>
7 <UI>
src/ext/Sql/wixlib/SqlExtension.wxs
+1 -1
@@ -1,7 +1,7 @@
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 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4 - <?include caerr.wxi ?>
4 + <?include ..\..\caerr.wxi ?>
5
6 <Fragment>
7 <UI>
src/ext/Sql/wixlib/caDecor.wxi deleted
-39
@@ -1,39 +0,0 @@
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 -
4 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?ifdef Prefix ?>
6 - <?undef Prefix ?>
7 - <?endif?>
8 -
9 - <?define Prefix="Wix4" ?>
10 -
11 - <?ifndef platform ?>
12 - <?define platform="x86" ?>
13 - <?endif?>
14 -
15 - <?if $(var.platform)="" ?>
16 - <?undef platform ?>
17 - <?define platform="x86" ?>
18 - <?endif?>
19 -
20 - <?ifdef Suffix ?>
21 - <?undef Suffix ?>
22 - <?endif?>
23 -
24 - <?if $(var.platform)~="x86" ?>
25 - <?define Suffix="_X86" ?>
26 - <?endif?>
27 -
28 - <?if $(var.platform)~="x64" ?>
29 - <?define Suffix="_X64" ?>
30 - <?endif?>
31 -
32 - <?if $(var.platform)~="arm" ?>
33 - <?define Suffix="_A32" ?>
34 - <?endif?>
35 -
36 - <?if $(var.platform)~="arm64" ?>
37 - <?define Suffix="_A64" ?>
38 - <?endif?>
39 -</Include>
src/ext/Sql/wixlib/caerr.wxi deleted
-96
@@ -1,96 +0,0 @@
1 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 - <?define msierrSecureObjectsFailedSet = 25521?>
4 - <?define msierrSecureObjectsUnknownType = 25522?>
5 - <?define msierrXmlFileFailedRead = 25530?>
6 - <?define msierrXmlFileFailedOpen = 25531?>
7 - <?define msierrXmlFileFailedSelect = 25532?>
8 - <?define msierrXmlFileFailedSave = 25533?>
9 - <?define msierrXmlConfigFailedRead = 25540?>
10 - <?define msierrXmlConfigFailedOpen = 25541?>
11 - <?define msierrXmlConfigFailedSelect = 25542?>
12 - <?define msierrXmlConfigFailedSave = 25543?>
13 - <?define msierrFirewallCannotConnect = 25580?>
14 - <?define msierrIISCannotConnect = 26001?>
15 - <?define msierrIISFailedReadWebSite = 26002?>
16 - <?define msierrIISFailedReadWebDirs = 26003?>
17 - <?define msierrIISFailedReadVDirs = 26004?>
18 - <?define msierrIISFailedReadFilters = 26005?>
19 - <?define msierrIISFailedReadAppPool = 26006?>
20 - <?define msierrIISFailedReadMimeMap = 26007?>
21 - <?define msierrIISFailedReadProp = 26008?>
22 - <?define msierrIISFailedReadWebSvcExt = 26009?>
23 - <?define msierrIISFailedReadWebError = 26010?>
24 - <?define msierrIISFailedReadHttpHeader = 26011?>
25 - <?define msierrIISFailedSchedTransaction = 26031?>
26 - <?define msierrIISFailedSchedInstallWebs = 26032?>
27 - <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 - <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 - <?define msierrIISFailedSchedInstallFilters = 26035?>
30 - <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 - <?define msierrIISFailedSchedInstallProp = 26037?>
32 - <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 - <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 - <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 - <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 - <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 - <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 - <?define msierrIISFailedSchedUninstallProp = 26056?>
39 - <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 - <?define msierrIISFailedStartTransaction = 26101?>
41 - <?define msierrIISFailedOpenKey = 26102?>
42 - <?define msierrIISFailedCreateKey = 26103?>
43 - <?define msierrIISFailedWriteData = 26104?>
44 - <?define msierrIISFailedCreateApp = 26105?>
45 - <?define msierrIISFailedDeleteKey = 26106?>
46 - <?define msierrIISFailedDeleteApp = 26107?>
47 - <?define msierrIISFailedDeleteValue = 26108?>
48 - <?define msierrIISFailedCommitInUse = 26109?>
49 - <?define msierrSQLFailedCreateDatabase = 26201?>
50 - <?define msierrSQLFailedDropDatabase = 26202?>
51 - <?define msierrSQLFailedConnectDatabase = 26203?>
52 - <?define msierrSQLFailedExecString = 26204?>
53 - <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 - <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 - <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 - <?define msierrInstallPerfCounterData = 26253?>
57 - <?define msierrUninstallPerfCounterData = 26254?>
58 - <?define msierrSMBFailedCreate = 26301?>
59 - <?define msierrSMBFailedDrop = 26302?>
60 - <?define msierrCERTFailedOpen = 26351?>
61 - <?define msierrCERTFailedAdd = 26352?>
62 - <?define msierrUSRFailedUserCreate = 26401?>
63 - <?define msierrUSRFailedUserCreatePswd = 26402?>
64 - <?define msierrUSRFailedUserGroupAdd = 26403?>
65 - <?define msierrUSRFailedUserCreateExists = 26404?>
66 - <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 - <?define msierrDependencyMissingDependencies = 26451?>
68 - <?define msierrDependencyHasDependents = 26452?>
69 - <?define msierrDotNetRuntimeRequired = 27000?>
70 - <?define msierrComPlusCannotConnect = 28001?>
71 - <?define msierrComPlusPartitionReadFailed = 28002?>
72 - <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 - <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 - <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 - <?define msierrComPlusApplicationReadFailed = 28006?>
76 - <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 - <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 - <?define msierrComPlusAssembliesReadFailed = 28009?>
79 - <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 - <?define msierrComPlusPartitionDependency = 28011?>
81 - <?define msierrComPlusPartitionNotFound = 28012?>
82 - <?define msierrComPlusPartitionIdConflict = 28013?>
83 - <?define msierrComPlusPartitionNameConflict = 28014?>
84 - <?define msierrComPlusApplicationDependency = 28015?>
85 - <?define msierrComPlusApplicationNotFound = 28016?>
86 - <?define msierrComPlusApplicationIdConflict = 28017?>
87 - <?define msierrComPlusApplicationNameConflict = 28018?>
88 - <?define msierrComPlusApplicationRoleDependency = 28019?>
89 - <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 - <?define msierrComPlusApplicationRoleConflict = 28021?>
91 - <?define msierrComPlusAssemblyDependency = 28022?>
92 - <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 - <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 - <?define msierrComPlusFailedLookupNames = 28025?>
95 - <?define msierrMsmqCannotConnect = 28101?>
96 -</Include>
\ No newline at end of file
src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi
+1 -1
@@ -2,7 +2,7 @@
2
3
4 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caDecor.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6
7 <Fragment>
8 <BundleExtension Id="$(var.Prefix)UtilBundleExtension$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBundleExtension$(var.Suffix)\utilbe.dll" />
src/ext/Util/wixlib/UtilExtension.wxs
+2 -2
@@ -2,8 +2,8 @@
2
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caDecor.wxi ?>
6 - <?include caerr.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6 + <?include ..\..\caerr.wxi ?>
7
8 <Fragment>
9 <UI Id="ConfigureUsersErrorText">
src/ext/Util/wixlib/UtilExtension_Platform.wxi
+1 -1
@@ -2,7 +2,7 @@
2
3
4 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?include caDecor.wxi ?>
5 + <?include ..\..\caDecor.wxi ?>
6
7 <Fragment>
8 <CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
src/ext/Util/wixlib/caDecor.wxi deleted
-39
@@ -1,39 +0,0 @@
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 -
4 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 - <?ifdef Prefix ?>
6 - <?undef Prefix ?>
7 - <?endif?>
8 -
9 - <?define Prefix="Wix4" ?>
10 -
11 - <?ifndef platform ?>
12 - <?define platform="x86" ?>
13 - <?endif?>
14 -
15 - <?if $(var.platform)="" ?>
16 - <?undef platform ?>
17 - <?define platform="x86" ?>
18 - <?endif?>
19 -
20 - <?ifdef Suffix ?>
21 - <?undef Suffix ?>
22 - <?endif?>
23 -
24 - <?if $(var.platform)~="x86" ?>
25 - <?define Suffix="_X86" ?>
26 - <?endif?>
27 -
28 - <?if $(var.platform)~="x64" ?>
29 - <?define Suffix="_X64" ?>
30 - <?endif?>
31 -
32 - <?if $(var.platform)~="arm" ?>
33 - <?define Suffix="_A32" ?>
34 - <?endif?>
35 -
36 - <?if $(var.platform)~="arm64" ?>
37 - <?define Suffix="_A64" ?>
38 - <?endif?>
39 -</Include>
src/ext/Util/wixlib/caerr.wxi deleted
-96
@@ -1,96 +0,0 @@
1 -<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 - <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 - <?define msierrSecureObjectsFailedSet = 25521?>
4 - <?define msierrSecureObjectsUnknownType = 25522?>
5 - <?define msierrXmlFileFailedRead = 25530?>
6 - <?define msierrXmlFileFailedOpen = 25531?>
7 - <?define msierrXmlFileFailedSelect = 25532?>
8 - <?define msierrXmlFileFailedSave = 25533?>
9 - <?define msierrXmlConfigFailedRead = 25540?>
10 - <?define msierrXmlConfigFailedOpen = 25541?>
11 - <?define msierrXmlConfigFailedSelect = 25542?>
12 - <?define msierrXmlConfigFailedSave = 25543?>
13 - <?define msierrFirewallCannotConnect = 25580?>
14 - <?define msierrIISCannotConnect = 26001?>
15 - <?define msierrIISFailedReadWebSite = 26002?>
16 - <?define msierrIISFailedReadWebDirs = 26003?>
17 - <?define msierrIISFailedReadVDirs = 26004?>
18 - <?define msierrIISFailedReadFilters = 26005?>
19 - <?define msierrIISFailedReadAppPool = 26006?>
20 - <?define msierrIISFailedReadMimeMap = 26007?>
21 - <?define msierrIISFailedReadProp = 26008?>
22 - <?define msierrIISFailedReadWebSvcExt = 26009?>
23 - <?define msierrIISFailedReadWebError = 26010?>
24 - <?define msierrIISFailedReadHttpHeader = 26011?>
25 - <?define msierrIISFailedSchedTransaction = 26031?>
26 - <?define msierrIISFailedSchedInstallWebs = 26032?>
27 - <?define msierrIISFailedSchedInstallWebDirs = 26033?>
28 - <?define msierrIISFailedSchedInstallVDirs = 26034?>
29 - <?define msierrIISFailedSchedInstallFilters = 26035?>
30 - <?define msierrIISFailedSchedInstallAppPool = 26036?>
31 - <?define msierrIISFailedSchedInstallProp = 26037?>
32 - <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
33 - <?define msierrIISFailedSchedUninstallWebs = 26051?>
34 - <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
35 - <?define msierrIISFailedSchedUninstallVDirs = 26053?>
36 - <?define msierrIISFailedSchedUninstallFilters = 26054?>
37 - <?define msierrIISFailedSchedUninstallAppPool = 26055?>
38 - <?define msierrIISFailedSchedUninstallProp = 26056?>
39 - <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
40 - <?define msierrIISFailedStartTransaction = 26101?>
41 - <?define msierrIISFailedOpenKey = 26102?>
42 - <?define msierrIISFailedCreateKey = 26103?>
43 - <?define msierrIISFailedWriteData = 26104?>
44 - <?define msierrIISFailedCreateApp = 26105?>
45 - <?define msierrIISFailedDeleteKey = 26106?>
46 - <?define msierrIISFailedDeleteApp = 26107?>
47 - <?define msierrIISFailedDeleteValue = 26108?>
48 - <?define msierrIISFailedCommitInUse = 26109?>
49 - <?define msierrSQLFailedCreateDatabase = 26201?>
50 - <?define msierrSQLFailedDropDatabase = 26202?>
51 - <?define msierrSQLFailedConnectDatabase = 26203?>
52 - <?define msierrSQLFailedExecString = 26204?>
53 - <?define msierrSQLDatabaseAlreadyExists = 26205?>
54 - <?define msierrPERFMONFailedRegisterDLL = 26251?>
55 - <?define msierrPERFMONFailedUnregisterDLL = 26252?>
56 - <?define msierrInstallPerfCounterData = 26253?>
57 - <?define msierrUninstallPerfCounterData = 26254?>
58 - <?define msierrSMBFailedCreate = 26301?>
59 - <?define msierrSMBFailedDrop = 26302?>
60 - <?define msierrCERTFailedOpen = 26351?>
61 - <?define msierrCERTFailedAdd = 26352?>
62 - <?define msierrUSRFailedUserCreate = 26401?>
63 - <?define msierrUSRFailedUserCreatePswd = 26402?>
64 - <?define msierrUSRFailedUserGroupAdd = 26403?>
65 - <?define msierrUSRFailedUserCreateExists = 26404?>
66 - <?define msierrUSRFailedGrantLogonAsService = 26405?>
67 - <?define msierrDependencyMissingDependencies = 26451?>
68 - <?define msierrDependencyHasDependents = 26452?>
69 - <?define msierrDotNetRuntimeRequired = 27000?>
70 - <?define msierrComPlusCannotConnect = 28001?>
71 - <?define msierrComPlusPartitionReadFailed = 28002?>
72 - <?define msierrComPlusPartitionRoleReadFailed = 28003?>
73 - <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
74 - <?define msierrComPlusPartitionUserReadFailed = 28005?>
75 - <?define msierrComPlusApplicationReadFailed = 28006?>
76 - <?define msierrComPlusApplicationRoleReadFailed = 28007?>
77 - <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
78 - <?define msierrComPlusAssembliesReadFailed = 28009?>
79 - <?define msierrComPlusSubscriptionReadFailed = 28010?>
80 - <?define msierrComPlusPartitionDependency = 28011?>
81 - <?define msierrComPlusPartitionNotFound = 28012?>
82 - <?define msierrComPlusPartitionIdConflict = 28013?>
83 - <?define msierrComPlusPartitionNameConflict = 28014?>
84 - <?define msierrComPlusApplicationDependency = 28015?>
85 - <?define msierrComPlusApplicationNotFound = 28016?>
86 - <?define msierrComPlusApplicationIdConflict = 28017?>
87 - <?define msierrComPlusApplicationNameConflict = 28018?>
88 - <?define msierrComPlusApplicationRoleDependency = 28019?>
89 - <?define msierrComPlusApplicationRoleNotFound = 28020?>
90 - <?define msierrComPlusApplicationRoleConflict = 28021?>
91 - <?define msierrComPlusAssemblyDependency = 28022?>
92 - <?define msierrComPlusSubscriptionIdConflict = 28023?>
93 - <?define msierrComPlusSubscriptionNameConflict = 28024?>
94 - <?define msierrComPlusFailedLookupNames = 28025?>
95 - <?define msierrMsmqCannotConnect = 28101?>
96 -</Include>
\ No newline at end of file
src/ext/caerr.wxi renamed