diff options
Diffstat (limited to 'src/ext/ComPlus/wixlib')
-rw-r--r-- | src/ext/ComPlus/wixlib/ComPlusExtension.wxs | 122 | ||||
-rw-r--r-- | src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi | 44 | ||||
-rw-r--r-- | src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs | 7 | ||||
-rw-r--r-- | src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs | 7 | ||||
-rw-r--r-- | src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs | 7 | ||||
-rw-r--r-- | src/ext/ComPlus/wixlib/complus.wixproj | 6 |
6 files changed, 92 insertions, 101 deletions
diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs index 736fd9b5..d8febf5c 100644 --- a/src/ext/ComPlus/wixlib/ComPlusExtension.wxs +++ b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs | |||
@@ -1,6 +1,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. --> | 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 | 2 | ||
3 | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
5 | <?include ..\..\caDecor.wxi ?> | ||
4 | <?include ..\..\caerr.wxi ?> | 6 | <?include ..\..\caerr.wxi ?> |
5 | 7 | ||
6 | <Fragment> | 8 | <Fragment> |
@@ -31,105 +33,27 @@ | |||
31 | <Error Id="$(var.msierrComPlusSubscriptionNameConflict)" Message="!(loc.msierrComPlusSubscriptionNameConflict)" /> | 33 | <Error Id="$(var.msierrComPlusSubscriptionNameConflict)" Message="!(loc.msierrComPlusSubscriptionNameConflict)" /> |
32 | <Error Id="$(var.msierrComPlusFailedLookupNames)" Message="!(loc.msierrComPlusFailedLookupNames)" /> | 34 | <Error Id="$(var.msierrComPlusFailedLookupNames)" Message="!(loc.msierrComPlusFailedLookupNames)" /> |
33 | 35 | ||
34 | <ProgressText Action="ComPlusInstallExecute" Message="!(loc.ComPlusInstallExecute)" /> | 36 | <ProgressText Action="$(var.Prefix)ComPlusInstallExecute$(var.Suffix)" Message="!(loc.ComPlusInstallExecute)" /> |
35 | <ProgressText Action="ComPlusUninstallExecute" Message="!(loc.ComPlusUninstallExecute)" /> | 37 | <ProgressText Action="$(var.Prefix)ComPlusUninstallExecute$(var.Suffix)" Message="!(loc.ComPlusUninstallExecute)" /> |
36 | 38 | ||
37 | <ProgressText Action="CreateComPlusPartitions" Template="!(loc.CreateComPlusPartitionsTemplate)" Message="!(loc.CreateComPlusPartitions)" /> | 39 | <ProgressText Action="$(var.Prefix)CreateComPlusPartitions$(var.Suffix)" Template="!(loc.CreateComPlusPartitionsTemplate)" Message="!(loc.CreateComPlusPartitions)" /> |
38 | <ProgressText Action="RemoveComPlusPartitions" Template="!(loc.RemoveComPlusPartitionsTemplate)" Message="!(loc.RemoveComPlusPartitions)" /> | 40 | <ProgressText Action="$(var.Prefix)RemoveComPlusPartitions$(var.Suffix)" Template="!(loc.RemoveComPlusPartitionsTemplate)" Message="!(loc.RemoveComPlusPartitions)" /> |
39 | <ProgressText Action="AddUsersToComPlusPartitionRoles" Template="!(loc.AddUsersToComPlusPartitionRolesTemplate)" Message="!(loc.AddUsersToComPlusPartitionRoles)" /> | 41 | <ProgressText Action="$(var.Prefix)AddUsersToComPlusPartitionRoles$(var.Suffix)" Template="!(loc.AddUsersToComPlusPartitionRolesTemplate)" Message="!(loc.AddUsersToComPlusPartitionRoles)" /> |
40 | <ProgressText Action="RemoveUsersFromComPlusPartRoles" Template="!(loc.RemoveUsersFromComPlusPartitionRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusPartitionRoles)" /> | 42 | <ProgressText Action="$(var.Prefix)RemoveUsersFromComPlusPartRoles$(var.Suffix)" Template="!(loc.RemoveUsersFromComPlusPartitionRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusPartitionRoles)" /> |
41 | <ProgressText Action="AddComPlusPartitionUsers" Template="!(loc.AddComPlusPartitionUsersTemplate)" Message="!(loc.AddComPlusPartitionUsers)" /> | 43 | <ProgressText Action="$(var.Prefix)AddComPlusPartitionUsers$(var.Suffix)" Template="!(loc.AddComPlusPartitionUsersTemplate)" Message="!(loc.AddComPlusPartitionUsers)" /> |
42 | <ProgressText Action="RemoveComPlusPartitionUsers" Template="!(loc.RemoveComPlusPartitionUsersTemplate)" Message="!(loc.RemoveComPlusPartitionUsers)" /> | 44 | <ProgressText Action="$(var.Prefix)RemoveComPlusPartitionUsers$(var.Suffix)" Template="!(loc.RemoveComPlusPartitionUsersTemplate)" Message="!(loc.RemoveComPlusPartitionUsers)" /> |
43 | <ProgressText Action="CreateComPlusApplications" Template="!(loc.CreateComPlusApplicationsTemplate)" Message="!(loc.CreateComPlusApplications)" /> | 45 | <ProgressText Action="$(var.Prefix)CreateComPlusApplications$(var.Suffix)" Template="!(loc.CreateComPlusApplicationsTemplate)" Message="!(loc.CreateComPlusApplications)" /> |
44 | <ProgressText Action="RemoveComPlusApplications" Template="!(loc.RemoveComPlusApplicationsTemplate)" Message="!(loc.RemoveComPlusApplications)" /> | 46 | <ProgressText Action="$(var.Prefix)RemoveComPlusApplications$(var.Suffix)" Template="!(loc.RemoveComPlusApplicationsTemplate)" Message="!(loc.RemoveComPlusApplications)" /> |
45 | <ProgressText Action="CreateComPlusApplicationRoles" Template="!(loc.CreateComPlusApplicationRolesTemplate)" Message="!(loc.CreateComPlusApplicationRoles)" /> | 47 | <ProgressText Action="$(var.Prefix)CreateComPlusApplicationRoles$(var.Suffix)" Template="!(loc.CreateComPlusApplicationRolesTemplate)" Message="!(loc.CreateComPlusApplicationRoles)" /> |
46 | <ProgressText Action="RemoveComPlusApplicationRoles" Template="!(loc.RemoveComPlusApplicationRolesTemplate)" Message="!(loc.RemoveComPlusApplicationRoles)" /> | 48 | <ProgressText Action="$(var.Prefix)RemoveComPlusApplicationRoles$(var.Suffix)" Template="!(loc.RemoveComPlusApplicationRolesTemplate)" Message="!(loc.RemoveComPlusApplicationRoles)" /> |
47 | <ProgressText Action="AddUsersToComPlusApplicationRoles" Template="!(loc.AddUsersToComPlusApplicationRolesTemplate)" Message="!(loc.AddUsersToComPlusApplicationRoles)" /> | 49 | <ProgressText Action="$(var.Prefix)AddUsersToComPlusApplicationRoles$(var.Suffix)" Template="!(loc.AddUsersToComPlusApplicationRolesTemplate)" Message="!(loc.AddUsersToComPlusApplicationRoles)" /> |
48 | <ProgressText Action="RemoveUsersFromComPlusAppRoles" Template="!(loc.RemoveUsersFromComPlusApplicationRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusApplicationRoles)" /> | 50 | <ProgressText Action="$(var.Prefix)RemoveUsersFromComPlusAppRoles$(var.Suffix)" Template="!(loc.RemoveUsersFromComPlusApplicationRolesTemplate)" Message="!(loc.RemoveUsersFromComPlusApplicationRoles)" /> |
49 | <ProgressText Action="RegisterComPlusAssemblies" Template="!(loc.RegisterComPlusAssembliesTemplate)" Message="!(loc.RegisterComPlusAssemblies)" /> | 51 | <ProgressText Action="$(var.Prefix)RegisterComPlusAssemblies$(var.Suffix)" Template="!(loc.RegisterComPlusAssembliesTemplate)" Message="!(loc.RegisterComPlusAssemblies)" /> |
50 | <ProgressText Action="UnregisterComPlusAssemblies" Template="!(loc.UnregisterComPlusAssembliesTemplate)" Message="!(loc.UnregisterComPlusAssemblies)" /> | 52 | <ProgressText Action="$(var.Prefix)UnregisterComPlusAssemblies$(var.Suffix)" Template="!(loc.UnregisterComPlusAssembliesTemplate)" Message="!(loc.UnregisterComPlusAssemblies)" /> |
51 | <ProgressText Action="AddComPlusRoleAssignments" Template="!(loc.AddComPlusRoleAssignmentsTemplate)" Message="!(loc.AddComPlusRoleAssignments)" /> | 53 | <ProgressText Action="$(var.Prefix)AddComPlusRoleAssignments$(var.Suffix)" Template="!(loc.AddComPlusRoleAssignmentsTemplate)" Message="!(loc.AddComPlusRoleAssignments)" /> |
52 | <ProgressText Action="RemoveComPlusRoleAssignments" Template="!(loc.RemoveComPlusRoleAssignmentsTemplate)" Message="!(loc.RemoveComPlusRoleAssignments)" /> | 54 | <ProgressText Action="$(var.Prefix)RemoveComPlusRoleAssignments$(var.Suffix)" Template="!(loc.RemoveComPlusRoleAssignmentsTemplate)" Message="!(loc.RemoveComPlusRoleAssignments)" /> |
53 | <ProgressText Action="CreateSubscrComPlusComponents" Template="!(loc.CreateSubscriptionsComPlusComponentsTemplate)" Message="!(loc.CreateSubscriptionsComPlusComponents)" /> | 55 | <ProgressText Action="$(var.Prefix)CreateSubscrComPlusComponents$(var.Suffix)" Template="!(loc.CreateSubscriptionsComPlusComponentsTemplate)" Message="!(loc.CreateSubscriptionsComPlusComponents)" /> |
54 | <ProgressText Action="RemoveSubscrComPlusComponents" Template="!(loc.RemoveSubscriptionsComPlusComponentsTemplate)" Message="!(loc.RemoveSubscriptionsComPlusComponents)" /> | 56 | <ProgressText Action="$(var.Prefix)RemoveSubscrComPlusComponents$(var.Suffix)" Template="!(loc.RemoveSubscriptionsComPlusComponentsTemplate)" Message="!(loc.RemoveSubscriptionsComPlusComponents)" /> |
55 | </UI> | 57 | </UI> |
56 | </Fragment> | 58 | </Fragment> |
57 | |||
58 | <Fragment> | ||
59 | <UIRef Id="ComPlusUI" /> | ||
60 | |||
61 | <CustomAction Id="ConfigureComPlusInstall" DllEntry="ConfigureComPlusInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
62 | <CustomAction Id="ConfigureComPlusUninstall" DllEntry="ConfigureComPlusUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
63 | <CustomAction Id="ComPlusInstallPrepare" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
64 | <CustomAction Id="ComPlusRollbackInstallPrepare" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
65 | <CustomAction Id="ComPlusInstallExecute" DllEntry="ComPlusInstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
66 | <CustomAction Id="ComPlusInstallExecuteCommit" DllEntry="ComPlusInstallExecuteCommit" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
67 | <CustomAction Id="ComPlusRollbackInstallExecute" DllEntry="ComPlusRollbackInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
68 | <CustomAction Id="ComPlusInstallCommit" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
69 | <CustomAction Id="ComPlusUninstallPrepare" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
70 | <CustomAction Id="ComPlusRollbackUninstallPrepare" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
71 | <CustomAction Id="ComPlusUninstallExecute" DllEntry="ComPlusUninstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
72 | <CustomAction Id="ComPlusRollbackUninstallExecute" DllEntry="ComPlusInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
73 | <CustomAction Id="ComPlusUninstallCommit" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x86" /> | ||
74 | |||
75 | <Property Id="ComPlusInstallPrepare" Hidden="yes" SuppressModularization="yes" /> | ||
76 | <Property Id="ComPlusRollbackInstallPrepare" Hidden="yes" SuppressModularization="yes" /> | ||
77 | <Property Id="ComPlusInstallExecute" Hidden="yes" SuppressModularization="yes" /> | ||
78 | <Property Id="ComPlusInstallExecuteCommit" Hidden="yes" SuppressModularization="yes" /> | ||
79 | <Property Id="ComPlusRollbackInstallExecute" Hidden="yes" SuppressModularization="yes" /> | ||
80 | <Property Id="ComPlusInstallCommit" Hidden="yes" SuppressModularization="yes" /> | ||
81 | <Property Id="ComPlusUninstallPrepare" Hidden="yes" SuppressModularization="yes" /> | ||
82 | <Property Id="ComPlusRollbackUninstallPrepare" Hidden="yes" SuppressModularization="yes" /> | ||
83 | <Property Id="ComPlusUninstallExecute" Hidden="yes" SuppressModularization="yes" /> | ||
84 | <Property Id="ComPlusRollbackUninstallExecute" Hidden="yes" SuppressModularization="yes" /> | ||
85 | <Property Id="ComPlusUninstallCommit" Hidden="yes" SuppressModularization="yes" /> | ||
86 | |||
87 | <InstallExecuteSequence> | ||
88 | <Custom Action="ConfigureComPlusUninstall" After="DeleteServices" Overridable="yes" Condition="VersionNT >= 500" /> | ||
89 | <Custom Action="ConfigureComPlusInstall" Before="InstallServices" Overridable="yes" Condition="VersionNT >= 500" /> | ||
90 | </InstallExecuteSequence> | ||
91 | </Fragment> | ||
92 | |||
93 | <Fragment> | ||
94 | <UIRef Id="ComPlusUI" /> | ||
95 | |||
96 | <CustomAction Id="ConfigureComPlusInstall_x64" DllEntry="ConfigureComPlusInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
97 | <CustomAction Id="ConfigureComPlusUninstall_x64" DllEntry="ConfigureComPlusUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
98 | <CustomAction Id="ComPlusInstallPrepare_64" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
99 | <CustomAction Id="ComPlusRollbackInstallPrepare_64" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
100 | <CustomAction Id="ComPlusInstallExecute_64" DllEntry="ComPlusInstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
101 | <CustomAction Id="ComPlusInstallExecuteCommit_64" DllEntry="ComPlusInstallExecuteCommit" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
102 | <CustomAction Id="ComPlusRollbackInstallExecute_64" DllEntry="ComPlusRollbackInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
103 | <CustomAction Id="ComPlusInstallCommit_64" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
104 | <CustomAction Id="ComPlusUninstallPrepare_64" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
105 | <CustomAction Id="ComPlusRollbackUninstallPrepare_64" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
106 | <CustomAction Id="ComPlusUninstallExecute_64" DllEntry="ComPlusUninstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
107 | <CustomAction Id="ComPlusRollbackUninstallExecute_64" DllEntry="ComPlusInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
108 | <CustomAction Id="ComPlusUninstallCommit_64" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="ComPlusCA_x64" /> | ||
109 | |||
110 | <Property Id="ComPlusInstallPrepare_64" Hidden="yes" SuppressModularization="yes" /> | ||
111 | <Property Id="ComPlusRollbackInstallPrepare_64" Hidden="yes" SuppressModularization="yes" /> | ||
112 | <Property Id="ComPlusInstallExecute_64" Hidden="yes" SuppressModularization="yes" /> | ||
113 | <Property Id="ComPlusInstallExecuteCommit_64" Hidden="yes" SuppressModularization="yes" /> | ||
114 | <Property Id="ComPlusRollbackInstallExecute_64" Hidden="yes" SuppressModularization="yes" /> | ||
115 | <Property Id="ComPlusInstallCommit_64" Hidden="yes" SuppressModularization="yes" /> | ||
116 | <Property Id="ComPlusUninstallPrepare_64" Hidden="yes" SuppressModularization="yes" /> | ||
117 | <Property Id="ComPlusRollbackUninstallPrepare_64" Hidden="yes" SuppressModularization="yes" /> | ||
118 | <Property Id="ComPlusUninstallExecute_64" Hidden="yes" SuppressModularization="yes" /> | ||
119 | <Property Id="ComPlusRollbackUninstallExecute_64" Hidden="yes" SuppressModularization="yes" /> | ||
120 | <Property Id="ComPlusUninstallCommit_64" Hidden="yes" SuppressModularization="yes" /> | ||
121 | |||
122 | <InstallExecuteSequence> | ||
123 | <Custom Action="ConfigureComPlusUninstall_x64" After="DeleteServices" Overridable="yes" Condition="VersionNT >= 500" /> | ||
124 | <Custom Action="ConfigureComPlusInstall_x64" Before="InstallServices" Overridable="yes" Condition="VersionNT >= 500" /> | ||
125 | </InstallExecuteSequence> | ||
126 | </Fragment> | ||
127 | |||
128 | <Fragment> | ||
129 | <Binary Id="ComPlusCA_x86" SourceFile="!(bindpath.x86)complusca.dll" /> | ||
130 | </Fragment> | ||
131 | |||
132 | <Fragment> | ||
133 | <Binary Id="ComPlusCA_x64" SourceFile="!(bindpath.x64)complusca.dll" /> | ||
134 | </Fragment> | ||
135 | </Wix> | 59 | </Wix> |
diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi b/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi new file mode 100644 index 00000000..7edae031 --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_Platform.wxi | |||
@@ -0,0 +1,44 @@ | |||
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 ?> | ||
5 | |||
6 | <Fragment> | ||
7 | <UIRef Id="ComPlusUI" /> | ||
8 | |||
9 | <CustomAction Id="$(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" DllEntry="ConfigureComPlusInstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
10 | <CustomAction Id="$(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" DllEntry="ConfigureComPlusUninstall" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
11 | <CustomAction Id="$(var.Prefix)ComPlusInstallPrepare$(var.Suffix)" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
12 | <CustomAction Id="$(var.Prefix)ComPlusRollbackInstallPrepare$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
13 | <CustomAction Id="$(var.Prefix)ComPlusInstallExecute$(var.Suffix)" DllEntry="ComPlusInstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
14 | <CustomAction Id="$(var.Prefix)ComPlusInstallExecuteCommit$(var.Suffix)" DllEntry="ComPlusInstallExecuteCommit" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
15 | <CustomAction Id="$(var.Prefix)ComPlusRollbackInstallExecute$(var.Suffix)" DllEntry="ComPlusRollbackInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
16 | <CustomAction Id="$(var.Prefix)ComPlusInstallCommit$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
17 | <CustomAction Id="$(var.Prefix)ComPlusUninstallPrepare$(var.Suffix)" DllEntry="ComPlusPrepare" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
18 | <CustomAction Id="$(var.Prefix)ComPlusRollbackUninstallPrepare$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
19 | <CustomAction Id="$(var.Prefix)ComPlusUninstallExecute$(var.Suffix)" DllEntry="ComPlusUninstallExecute" Execute="deferred" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
20 | <CustomAction Id="$(var.Prefix)ComPlusRollbackUninstallExecute$(var.Suffix)" DllEntry="ComPlusInstallExecute" Execute="rollback" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
21 | <CustomAction Id="$(var.Prefix)ComPlusUninstallCommit$(var.Suffix)" DllEntry="ComPlusCleanup" Execute="commit" Return="check" Impersonate="no" HideTarget="yes" SuppressModularization="yes" BinaryRef="$(var.Prefix)cpca$(var.Suffix)" /> | ||
22 | |||
23 | <Property Id="$(var.Prefix)ComPlusInstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
24 | <Property Id="$(var.Prefix)ComPlusRollbackInstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
25 | <Property Id="$(var.Prefix)ComPlusInstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
26 | <Property Id="$(var.Prefix)ComPlusInstallExecuteCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
27 | <Property Id="$(var.Prefix)ComPlusRollbackInstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
28 | <Property Id="$(var.Prefix)ComPlusInstallCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
29 | <Property Id="$(var.Prefix)ComPlusUninstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
30 | <Property Id="$(var.Prefix)ComPlusRollbackUninstallPrepare$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
31 | <Property Id="$(var.Prefix)ComPlusUninstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
32 | <Property Id="$(var.Prefix)ComPlusRollbackUninstallExecute$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
33 | <Property Id="$(var.Prefix)ComPlusUninstallCommit$(var.Suffix)" Hidden="yes" SuppressModularization="yes" /> | ||
34 | |||
35 | <InstallExecuteSequence> | ||
36 | <Custom Action="$(var.Prefix)ConfigureComPlusUninstall$(var.Suffix)" After="DeleteServices" Overridable="yes" Condition="VersionNT >= 500" /> | ||
37 | <Custom Action="$(var.Prefix)ConfigureComPlusInstall$(var.Suffix)" Before="InstallServices" Overridable="yes" Condition="VersionNT >= 500" /> | ||
38 | </InstallExecuteSequence> | ||
39 | </Fragment> | ||
40 | |||
41 | <Fragment> | ||
42 | <Binary Id="$(var.Prefix)cpca$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))complusca.dll" /> | ||
43 | </Fragment> | ||
44 | </Include> | ||
diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs new file mode 100644 index 00000000..cb40cd85 --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_arm64.wxs | |||
@@ -0,0 +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 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
5 | <?define platform=arm64 ?> | ||
6 | <?include ComPlusExtension_Platform.wxi ?> | ||
7 | </Wix> | ||
diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs new file mode 100644 index 00000000..67d70d12 --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_x64.wxs | |||
@@ -0,0 +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 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
5 | <?define platform=x64 ?> | ||
6 | <?include ComPlusExtension_Platform.wxi ?> | ||
7 | </Wix> | ||
diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs new file mode 100644 index 00000000..0c2e9cef --- /dev/null +++ b/src/ext/ComPlus/wixlib/ComPlusExtension_x86.wxs | |||
@@ -0,0 +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 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
5 | <?define platform=x86 ?> | ||
6 | <?include ComPlusExtension_Platform.wxi ?> | ||
7 | </Wix> | ||
diff --git a/src/ext/ComPlus/wixlib/complus.wixproj b/src/ext/ComPlus/wixlib/complus.wixproj index f0eaebee..9a70c17a 100644 --- a/src/ext/ComPlus/wixlib/complus.wixproj +++ b/src/ext/ComPlus/wixlib/complus.wixproj | |||
@@ -11,11 +11,13 @@ | |||
11 | <ItemGroup> | 11 | <ItemGroup> |
12 | <BindInputPaths Include="$(OutputPath)x86" BindName='x86' /> | 12 | <BindInputPaths Include="$(OutputPath)x86" BindName='x86' /> |
13 | <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> | 13 | <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> |
14 | <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> | ||
14 | </ItemGroup> | 15 | </ItemGroup> |
15 | 16 | ||
16 | <ItemGroup> | 17 | <ItemGroup> |
17 | <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> | 18 | <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x86" /> |
18 | <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> | 19 | <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=x64" /> |
20 | <ProjectReference Include="..\ca\complusca.vcxproj" Properties="Platform=ARM64" /> | ||
19 | </ItemGroup> | 21 | </ItemGroup> |
20 | 22 | ||
21 | <ItemGroup> | 23 | <ItemGroup> |