From 091573d459d6ab4947bd39bd3bc8faee3d18b4fc Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 10 Feb 2022 00:38:43 -0500
Subject: Central caDecor and caErr.

---
 src/ext/Bal/wixlib/BalExtension_platform.wxi       |  9 +-
 src/ext/Bal/wixlib/Mbahost_platform.wxi            |  4 +-
 src/ext/Bal/wixlib/caDecor.wxi                     | 39 ---------
 src/ext/ComPlus/wixlib/ComPlusExtension.wxs        |  2 +-
 src/ext/ComPlus/wixlib/caerr.wxi                   | 96 ----------------------
 src/ext/Dependency/wixlib/DependencyExtension.wxs  |  2 +-
 .../wixlib/DependencyExtension_Platform.wxi        |  2 +-
 src/ext/Dependency/wixlib/caDecor.wxi              | 39 ---------
 src/ext/Dependency/wixlib/caerr.wxi                | 96 ----------------------
 src/ext/Firewall/wixlib/FirewallExtension.wxs      |  3 +-
 src/ext/Firewall/wixlib/caerr.wxi                  | 96 ----------------------
 src/ext/Http/wixlib/HttpExtension.wxs              |  3 +-
 src/ext/Http/wixlib/HttpExtension_Platform.wxi     |  2 +-
 src/ext/Http/wixlib/caDecor.wxi                    | 39 ---------
 src/ext/Http/wixlib/caerr.wxi                      | 96 ----------------------
 src/ext/Iis/wixlib/IIsExtension.wxs                |  2 +-
 src/ext/Iis/wixlib/caerr.wxi                       | 96 ----------------------
 src/ext/Msmq/wixlib/MsmqExtension.wxs              |  2 +-
 src/ext/Msmq/wixlib/caerr.wxi                      | 96 ----------------------
 src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi   |  3 +-
 src/ext/NetFx/wixlib/caDecor.wxi                   | 39 ---------
 src/ext/Sql/wixlib/SqlExtension.wxi                |  2 +-
 src/ext/Sql/wixlib/SqlExtension.wxs                |  2 +-
 src/ext/Sql/wixlib/caDecor.wxi                     | 39 ---------
 src/ext/Sql/wixlib/caerr.wxi                       | 96 ----------------------
 .../Util/wixlib/UtilBundleExtension_Platform.wxi   |  2 +-
 src/ext/Util/wixlib/UtilExtension.wxs              |  4 +-
 src/ext/Util/wixlib/UtilExtension_Platform.wxi     |  2 +-
 src/ext/Util/wixlib/caDecor.wxi                    | 39 ---------
 src/ext/Util/wixlib/caerr.wxi                      | 96 ----------------------
 src/ext/caerr.wxi                                  | 96 ++++++++++++++++++++++
 31 files changed, 124 insertions(+), 1020 deletions(-)
 delete mode 100644 src/ext/Bal/wixlib/caDecor.wxi
 delete mode 100644 src/ext/ComPlus/wixlib/caerr.wxi
 delete mode 100644 src/ext/Dependency/wixlib/caDecor.wxi
 delete mode 100644 src/ext/Dependency/wixlib/caerr.wxi
 delete mode 100644 src/ext/Firewall/wixlib/caerr.wxi
 delete mode 100644 src/ext/Http/wixlib/caDecor.wxi
 delete mode 100644 src/ext/Http/wixlib/caerr.wxi
 delete mode 100644 src/ext/Iis/wixlib/caerr.wxi
 delete mode 100644 src/ext/Msmq/wixlib/caerr.wxi
 delete mode 100644 src/ext/NetFx/wixlib/caDecor.wxi
 delete mode 100644 src/ext/Sql/wixlib/caDecor.wxi
 delete mode 100644 src/ext/Sql/wixlib/caerr.wxi
 delete mode 100644 src/ext/Util/wixlib/caDecor.wxi
 delete mode 100644 src/ext/Util/wixlib/caerr.wxi
 create mode 100644 src/ext/caerr.wxi

diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi
index 6978ba99..e1d846ce 100644
--- a/src/ext/Bal/wixlib/BalExtension_platform.wxi
+++ b/src/ext/Bal/wixlib/BalExtension_platform.wxi
@@ -2,7 +2,8 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
+
     <Fragment>
         <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)">
             <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\dnchost.dll" />
@@ -10,6 +11,7 @@
             <PayloadGroupRef Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads" />
         </BootstrapperApplication>
     </Fragment>
+
     <Fragment>
         <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost.Standard$(var.Suffix)">
             <PayloadGroupRef Id="DncPreqStandardPayloads" />
@@ -22,30 +24,35 @@
             <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
         </BootstrapperApplication>
     </Fragment>
+
     <Fragment>
         <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
         </BootstrapperApplication>
         <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
     </Fragment>
+
     <Fragment>
         <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
         </BootstrapperApplication>
         <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
     </Fragment>
+
     <Fragment>
         <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
         </BootstrapperApplication>
         <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
     </Fragment>
+
     <Fragment>
         <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
         </BootstrapperApplication>
         <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
     </Fragment>
+
     <Fragment>
         <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
             <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
diff --git a/src/ext/Bal/wixlib/Mbahost_platform.wxi b/src/ext/Bal/wixlib/Mbahost_platform.wxi
index 06d7f1fc..9a5241cf 100644
--- a/src/ext/Bal/wixlib/Mbahost_platform.wxi
+++ b/src/ext/Bal/wixlib/Mbahost_platform.wxi
@@ -2,7 +2,8 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
+
     <Fragment>
         <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
             <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
@@ -10,6 +11,7 @@
             <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
         </BootstrapperApplication>
     </Fragment>
+
     <Fragment>
         <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)">
             <PayloadGroupRef Id="MbaPreqStandardPayloads" />
diff --git a/src/ext/Bal/wixlib/caDecor.wxi b/src/ext/Bal/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/Bal/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 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. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifdef Prefix ?>
-        <?undef Prefix ?>
-    <?endif?>
-
-    <?define Prefix="Wix4" ?>
-
-    <?ifndef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?if $(var.platform)="" ?>
-        <?undef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x86" ?>
-        <?define Suffix="_X86" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x64" ?>
-        <?define Suffix="_X64" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm" ?>
-        <?define Suffix="_A32" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm64" ?>
-        <?define Suffix="_A64" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/ComPlus/wixlib/ComPlusExtension.wxs b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs
index fe74eeae..736fd9b5 100644
--- a/src/ext/ComPlus/wixlib/ComPlusExtension.wxs
+++ b/src/ext/ComPlus/wixlib/ComPlusExtension.wxs
@@ -1,7 +1,7 @@
 <!-- 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. -->
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include caerr.wxi ?>
+  <?include ..\..\caerr.wxi ?>
 
   <Fragment>
     <UI Id="ComPlusUI">
diff --git a/src/ext/ComPlus/wixlib/caerr.wxi b/src/ext/ComPlus/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/ComPlus/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/Dependency/wixlib/DependencyExtension.wxs b/src/ext/Dependency/wixlib/DependencyExtension.wxs
index 0516b18c..3849f635 100644
--- a/src/ext/Dependency/wixlib/DependencyExtension.wxs
+++ b/src/ext/Dependency/wixlib/DependencyExtension.wxs
@@ -2,7 +2,7 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caerr.wxi ?>
+    <?include ..\..\caerr.wxi ?>
 
     <Fragment>
         <UI Id="WixDependencyErrors">
diff --git a/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi b/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
index 9ab28ef3..e1feea28 100644
--- a/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
+++ b/src/ext/Dependency/wixlib/DependencyExtension_Platform.wxi
@@ -2,7 +2,7 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
     
     <Fragment>
         <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
diff --git a/src/ext/Dependency/wixlib/caDecor.wxi b/src/ext/Dependency/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/Dependency/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 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. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifdef Prefix ?>
-        <?undef Prefix ?>
-    <?endif?>
-
-    <?define Prefix="Wix4" ?>
-
-    <?ifndef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?if $(var.platform)="" ?>
-        <?undef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x86" ?>
-        <?define Suffix="_X86" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x64" ?>
-        <?define Suffix="_X64" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm" ?>
-        <?define Suffix="_A32" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm64" ?>
-        <?define Suffix="_A64" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/Dependency/wixlib/caerr.wxi b/src/ext/Dependency/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/Dependency/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/Firewall/wixlib/FirewallExtension.wxs b/src/ext/Firewall/wixlib/FirewallExtension.wxs
index 56ad693e..513fc6bd 100644
--- a/src/ext/Firewall/wixlib/FirewallExtension.wxs
+++ b/src/ext/Firewall/wixlib/FirewallExtension.wxs
@@ -2,7 +2,8 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caerr.wxi ?>
+    <?include ..\..\caerr.wxi ?>
+
     <Fragment>
         <UI Id="WixFirewallErrors">
             <Error Id="$(var.msierrFirewallCannotConnect)" Message="!(loc.msierrFirewallCannotConnect)" />
diff --git a/src/ext/Firewall/wixlib/caerr.wxi b/src/ext/Firewall/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/Firewall/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/Http/wixlib/HttpExtension.wxs b/src/ext/Http/wixlib/HttpExtension.wxs
index e9717fc1..20d951a0 100644
--- a/src/ext/Http/wixlib/HttpExtension.wxs
+++ b/src/ext/Http/wixlib/HttpExtension.wxs
@@ -2,7 +2,8 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caerr.wxi ?>
+    <?include ..\..\caerr.wxi ?>
+
     <Fragment>
         <UI Id="WixHttpErrors">
         </UI>
diff --git a/src/ext/Http/wixlib/HttpExtension_Platform.wxi b/src/ext/Http/wixlib/HttpExtension_Platform.wxi
index 4f4a9e23..49d39c02 100644
--- a/src/ext/Http/wixlib/HttpExtension_Platform.wxi
+++ b/src/ext/Http/wixlib/HttpExtension_Platform.wxi
@@ -2,7 +2,7 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
         <UIRef Id="WixHttpErrors" />
diff --git a/src/ext/Http/wixlib/caDecor.wxi b/src/ext/Http/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/Http/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 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. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifdef Prefix ?>
-        <?undef Prefix ?>
-    <?endif?>
-
-    <?define Prefix="Wix4" ?>
-
-    <?ifndef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?if $(var.platform)="" ?>
-        <?undef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x86" ?>
-        <?define Suffix="_X86" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x64" ?>
-        <?define Suffix="_X64" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm" ?>
-        <?define Suffix="_A32" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm64" ?>
-        <?define Suffix="_A64" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/Http/wixlib/caerr.wxi b/src/ext/Http/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/Http/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/Iis/wixlib/IIsExtension.wxs b/src/ext/Iis/wixlib/IIsExtension.wxs
index 18fc34ff..1f069ae5 100644
--- a/src/ext/Iis/wixlib/IIsExtension.wxs
+++ b/src/ext/Iis/wixlib/IIsExtension.wxs
@@ -2,7 +2,7 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caerr.wxi ?>
+    <?include ..\..\caerr.wxi ?>
 
     <Fragment>
         <Property Id="IISMAJORVERSION">
diff --git a/src/ext/Iis/wixlib/caerr.wxi b/src/ext/Iis/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/Iis/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/Msmq/wixlib/MsmqExtension.wxs b/src/ext/Msmq/wixlib/MsmqExtension.wxs
index 86239545..87b2b382 100644
--- a/src/ext/Msmq/wixlib/MsmqExtension.wxs
+++ b/src/ext/Msmq/wixlib/MsmqExtension.wxs
@@ -2,7 +2,7 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include caerr.wxi ?>
+  <?include ..\..\caerr.wxi ?>
 
   <Fragment>
     <UI>
diff --git a/src/ext/Msmq/wixlib/caerr.wxi b/src/ext/Msmq/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/Msmq/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
index 7bd727c5..f607c72d 100644
--- a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
+++ b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi
@@ -2,8 +2,7 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include caDecor.wxi ?>
+  <?include ..\..\caDecor.wxi ?>
 
   <Fragment>
     <CustomAction Id="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" DllEntry="SchedNetFx" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)NetFxCA$(var.Suffix)" />
diff --git a/src/ext/NetFx/wixlib/caDecor.wxi b/src/ext/NetFx/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/NetFx/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 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. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifdef Prefix ?>
-        <?undef Prefix ?>
-    <?endif?>
-
-    <?define Prefix="Wix4" ?>
-
-    <?ifndef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?if $(var.platform)="" ?>
-        <?undef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x86" ?>
-        <?define Suffix="_X86" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x64" ?>
-        <?define Suffix="_X64" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm" ?>
-        <?define Suffix="_A32" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm64" ?>
-        <?define Suffix="_A64" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/Sql/wixlib/SqlExtension.wxi b/src/ext/Sql/wixlib/SqlExtension.wxi
index c9261f1d..13cb6178 100644
--- a/src/ext/Sql/wixlib/SqlExtension.wxi
+++ b/src/ext/Sql/wixlib/SqlExtension.wxi
@@ -1,7 +1,7 @@
 <!-- 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. -->
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
         <UI>
diff --git a/src/ext/Sql/wixlib/SqlExtension.wxs b/src/ext/Sql/wixlib/SqlExtension.wxs
index 8b5320fa..f824bff8 100644
--- a/src/ext/Sql/wixlib/SqlExtension.wxs
+++ b/src/ext/Sql/wixlib/SqlExtension.wxs
@@ -1,7 +1,7 @@
 <!-- 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. -->
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caerr.wxi ?>
+    <?include ..\..\caerr.wxi ?>
 
     <Fragment>
         <UI>
diff --git a/src/ext/Sql/wixlib/caDecor.wxi b/src/ext/Sql/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/Sql/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 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. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifdef Prefix ?>
-        <?undef Prefix ?>
-    <?endif?>
-
-    <?define Prefix="Wix4" ?>
-
-    <?ifndef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?if $(var.platform)="" ?>
-        <?undef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x86" ?>
-        <?define Suffix="_X86" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x64" ?>
-        <?define Suffix="_X64" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm" ?>
-        <?define Suffix="_A32" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm64" ?>
-        <?define Suffix="_A64" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/Sql/wixlib/caerr.wxi b/src/ext/Sql/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/Sql/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi
index 379c8f57..a2e295f2 100644
--- a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi
+++ b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi
@@ -2,7 +2,7 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
         <BundleExtension Id="$(var.Prefix)UtilBundleExtension$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBundleExtension$(var.Suffix)\utilbe.dll" />
diff --git a/src/ext/Util/wixlib/UtilExtension.wxs b/src/ext/Util/wixlib/UtilExtension.wxs
index 0f445ab4..f2786b25 100644
--- a/src/ext/Util/wixlib/UtilExtension.wxs
+++ b/src/ext/Util/wixlib/UtilExtension.wxs
@@ -2,8 +2,8 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
-    <?include caerr.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
+    <?include ..\..\caerr.wxi ?>
 
     <Fragment>
         <UI Id="ConfigureUsersErrorText">
diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
index ab436adc..f445f87f 100644
--- a/src/ext/Util/wixlib/UtilExtension_Platform.wxi
+++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
@@ -2,7 +2,7 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include caDecor.wxi ?>
+    <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
         <CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
diff --git a/src/ext/Util/wixlib/caDecor.wxi b/src/ext/Util/wixlib/caDecor.wxi
deleted file mode 100644
index b1711518..00000000
--- a/src/ext/Util/wixlib/caDecor.wxi
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 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. -->
-
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifdef Prefix ?>
-        <?undef Prefix ?>
-    <?endif?>
-
-    <?define Prefix="Wix4" ?>
-
-    <?ifndef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?if $(var.platform)="" ?>
-        <?undef platform ?>
-        <?define platform="x86" ?>
-    <?endif?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x86" ?>
-        <?define Suffix="_X86" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="x64" ?>
-        <?define Suffix="_X64" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm" ?>
-        <?define Suffix="_A32" ?>
-    <?endif?>
-
-    <?if $(var.platform)~="arm64" ?>
-        <?define Suffix="_A64" ?>
-    <?endif?>
-</Include>
diff --git a/src/ext/Util/wixlib/caerr.wxi b/src/ext/Util/wixlib/caerr.wxi
deleted file mode 100644
index ff7ec121..00000000
--- a/src/ext/Util/wixlib/caerr.wxi
+++ /dev/null
@@ -1,96 +0,0 @@
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define msierrSecureObjectsFailedCreateSD = 25520?>
-  <?define msierrSecureObjectsFailedSet = 25521?>
-  <?define msierrSecureObjectsUnknownType = 25522?>
-  <?define msierrXmlFileFailedRead = 25530?>
-  <?define msierrXmlFileFailedOpen = 25531?>
-  <?define msierrXmlFileFailedSelect = 25532?>
-  <?define msierrXmlFileFailedSave = 25533?>
-  <?define msierrXmlConfigFailedRead = 25540?>
-  <?define msierrXmlConfigFailedOpen = 25541?>
-  <?define msierrXmlConfigFailedSelect = 25542?>
-  <?define msierrXmlConfigFailedSave = 25543?>
-  <?define msierrFirewallCannotConnect = 25580?>
-  <?define msierrIISCannotConnect = 26001?>
-  <?define msierrIISFailedReadWebSite = 26002?>
-  <?define msierrIISFailedReadWebDirs = 26003?>
-  <?define msierrIISFailedReadVDirs = 26004?>
-  <?define msierrIISFailedReadFilters = 26005?>
-  <?define msierrIISFailedReadAppPool = 26006?>
-  <?define msierrIISFailedReadMimeMap = 26007?>
-  <?define msierrIISFailedReadProp = 26008?>
-  <?define msierrIISFailedReadWebSvcExt = 26009?>
-  <?define msierrIISFailedReadWebError = 26010?>
-  <?define msierrIISFailedReadHttpHeader = 26011?>
-  <?define msierrIISFailedSchedTransaction = 26031?>
-  <?define msierrIISFailedSchedInstallWebs = 26032?>
-  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
-  <?define msierrIISFailedSchedInstallVDirs = 26034?>
-  <?define msierrIISFailedSchedInstallFilters = 26035?>
-  <?define msierrIISFailedSchedInstallAppPool = 26036?>
-  <?define msierrIISFailedSchedInstallProp = 26037?>
-  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
-  <?define msierrIISFailedSchedUninstallWebs = 26051?>
-  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
-  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
-  <?define msierrIISFailedSchedUninstallFilters = 26054?>
-  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
-  <?define msierrIISFailedSchedUninstallProp = 26056?>
-  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
-  <?define msierrIISFailedStartTransaction = 26101?>
-  <?define msierrIISFailedOpenKey = 26102?>
-  <?define msierrIISFailedCreateKey = 26103?>
-  <?define msierrIISFailedWriteData = 26104?>
-  <?define msierrIISFailedCreateApp = 26105?>
-  <?define msierrIISFailedDeleteKey = 26106?>
-  <?define msierrIISFailedDeleteApp = 26107?>
-  <?define msierrIISFailedDeleteValue = 26108?>
-  <?define msierrIISFailedCommitInUse = 26109?>
-  <?define msierrSQLFailedCreateDatabase = 26201?>
-  <?define msierrSQLFailedDropDatabase = 26202?>
-  <?define msierrSQLFailedConnectDatabase = 26203?>
-  <?define msierrSQLFailedExecString = 26204?>
-  <?define msierrSQLDatabaseAlreadyExists = 26205?>
-  <?define msierrPERFMONFailedRegisterDLL = 26251?>
-  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
-  <?define msierrInstallPerfCounterData = 26253?>
-  <?define msierrUninstallPerfCounterData = 26254?>
-  <?define msierrSMBFailedCreate = 26301?>
-  <?define msierrSMBFailedDrop = 26302?>
-  <?define msierrCERTFailedOpen = 26351?>
-  <?define msierrCERTFailedAdd = 26352?>
-  <?define msierrUSRFailedUserCreate = 26401?>
-  <?define msierrUSRFailedUserCreatePswd = 26402?>
-  <?define msierrUSRFailedUserGroupAdd = 26403?>
-  <?define msierrUSRFailedUserCreateExists = 26404?>
-  <?define msierrUSRFailedGrantLogonAsService = 26405?>
-  <?define msierrDependencyMissingDependencies = 26451?>
-  <?define msierrDependencyHasDependents = 26452?>
-  <?define msierrDotNetRuntimeRequired = 27000?>
-  <?define msierrComPlusCannotConnect = 28001?>
-  <?define msierrComPlusPartitionReadFailed = 28002?>
-  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
-  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
-  <?define msierrComPlusPartitionUserReadFailed = 28005?>
-  <?define msierrComPlusApplicationReadFailed = 28006?>
-  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
-  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
-  <?define msierrComPlusAssembliesReadFailed = 28009?>
-  <?define msierrComPlusSubscriptionReadFailed = 28010?>
-  <?define msierrComPlusPartitionDependency = 28011?>
-  <?define msierrComPlusPartitionNotFound = 28012?>
-  <?define msierrComPlusPartitionIdConflict = 28013?>
-  <?define msierrComPlusPartitionNameConflict = 28014?>
-  <?define msierrComPlusApplicationDependency = 28015?>
-  <?define msierrComPlusApplicationNotFound = 28016?>
-  <?define msierrComPlusApplicationIdConflict = 28017?>
-  <?define msierrComPlusApplicationNameConflict = 28018?>
-  <?define msierrComPlusApplicationRoleDependency = 28019?>
-  <?define msierrComPlusApplicationRoleNotFound = 28020?>
-  <?define msierrComPlusApplicationRoleConflict = 28021?>
-  <?define msierrComPlusAssemblyDependency = 28022?>
-  <?define msierrComPlusSubscriptionIdConflict = 28023?>
-  <?define msierrComPlusSubscriptionNameConflict = 28024?>
-  <?define msierrComPlusFailedLookupNames = 28025?>
-  <?define msierrMsmqCannotConnect = 28101?>
-</Include>
\ No newline at end of file
diff --git a/src/ext/caerr.wxi b/src/ext/caerr.wxi
new file mode 100644
index 00000000..ff7ec121
--- /dev/null
+++ b/src/ext/caerr.wxi
@@ -0,0 +1,96 @@
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define msierrSecureObjectsFailedCreateSD = 25520?>
+  <?define msierrSecureObjectsFailedSet = 25521?>
+  <?define msierrSecureObjectsUnknownType = 25522?>
+  <?define msierrXmlFileFailedRead = 25530?>
+  <?define msierrXmlFileFailedOpen = 25531?>
+  <?define msierrXmlFileFailedSelect = 25532?>
+  <?define msierrXmlFileFailedSave = 25533?>
+  <?define msierrXmlConfigFailedRead = 25540?>
+  <?define msierrXmlConfigFailedOpen = 25541?>
+  <?define msierrXmlConfigFailedSelect = 25542?>
+  <?define msierrXmlConfigFailedSave = 25543?>
+  <?define msierrFirewallCannotConnect = 25580?>
+  <?define msierrIISCannotConnect = 26001?>
+  <?define msierrIISFailedReadWebSite = 26002?>
+  <?define msierrIISFailedReadWebDirs = 26003?>
+  <?define msierrIISFailedReadVDirs = 26004?>
+  <?define msierrIISFailedReadFilters = 26005?>
+  <?define msierrIISFailedReadAppPool = 26006?>
+  <?define msierrIISFailedReadMimeMap = 26007?>
+  <?define msierrIISFailedReadProp = 26008?>
+  <?define msierrIISFailedReadWebSvcExt = 26009?>
+  <?define msierrIISFailedReadWebError = 26010?>
+  <?define msierrIISFailedReadHttpHeader = 26011?>
+  <?define msierrIISFailedSchedTransaction = 26031?>
+  <?define msierrIISFailedSchedInstallWebs = 26032?>
+  <?define msierrIISFailedSchedInstallWebDirs = 26033?>
+  <?define msierrIISFailedSchedInstallVDirs = 26034?>
+  <?define msierrIISFailedSchedInstallFilters = 26035?>
+  <?define msierrIISFailedSchedInstallAppPool = 26036?>
+  <?define msierrIISFailedSchedInstallProp = 26037?>
+  <?define msierrIISFailedSchedInstallWebSvcExt = 26038?>
+  <?define msierrIISFailedSchedUninstallWebs = 26051?>
+  <?define msierrIISFailedSchedUninstallWebDirs = 26052?>
+  <?define msierrIISFailedSchedUninstallVDirs = 26053?>
+  <?define msierrIISFailedSchedUninstallFilters = 26054?>
+  <?define msierrIISFailedSchedUninstallAppPool = 26055?>
+  <?define msierrIISFailedSchedUninstallProp = 26056?>
+  <?define msierrIISFailedSchedUninstallWebSvcExt = 26057?>
+  <?define msierrIISFailedStartTransaction = 26101?>
+  <?define msierrIISFailedOpenKey = 26102?>
+  <?define msierrIISFailedCreateKey = 26103?>
+  <?define msierrIISFailedWriteData = 26104?>
+  <?define msierrIISFailedCreateApp = 26105?>
+  <?define msierrIISFailedDeleteKey = 26106?>
+  <?define msierrIISFailedDeleteApp = 26107?>
+  <?define msierrIISFailedDeleteValue = 26108?>
+  <?define msierrIISFailedCommitInUse = 26109?>
+  <?define msierrSQLFailedCreateDatabase = 26201?>
+  <?define msierrSQLFailedDropDatabase = 26202?>
+  <?define msierrSQLFailedConnectDatabase = 26203?>
+  <?define msierrSQLFailedExecString = 26204?>
+  <?define msierrSQLDatabaseAlreadyExists = 26205?>
+  <?define msierrPERFMONFailedRegisterDLL = 26251?>
+  <?define msierrPERFMONFailedUnregisterDLL = 26252?>
+  <?define msierrInstallPerfCounterData = 26253?>
+  <?define msierrUninstallPerfCounterData = 26254?>
+  <?define msierrSMBFailedCreate = 26301?>
+  <?define msierrSMBFailedDrop = 26302?>
+  <?define msierrCERTFailedOpen = 26351?>
+  <?define msierrCERTFailedAdd = 26352?>
+  <?define msierrUSRFailedUserCreate = 26401?>
+  <?define msierrUSRFailedUserCreatePswd = 26402?>
+  <?define msierrUSRFailedUserGroupAdd = 26403?>
+  <?define msierrUSRFailedUserCreateExists = 26404?>
+  <?define msierrUSRFailedGrantLogonAsService = 26405?>
+  <?define msierrDependencyMissingDependencies = 26451?>
+  <?define msierrDependencyHasDependents = 26452?>
+  <?define msierrDotNetRuntimeRequired = 27000?>
+  <?define msierrComPlusCannotConnect = 28001?>
+  <?define msierrComPlusPartitionReadFailed = 28002?>
+  <?define msierrComPlusPartitionRoleReadFailed = 28003?>
+  <?define msierrComPlusUserInPartitionRoleReadFailed = 28004?>
+  <?define msierrComPlusPartitionUserReadFailed = 28005?>
+  <?define msierrComPlusApplicationReadFailed = 28006?>
+  <?define msierrComPlusApplicationRoleReadFailed = 28007?>
+  <?define msierrComPlusUserInApplicationRoleReadFailed = 28008?>
+  <?define msierrComPlusAssembliesReadFailed = 28009?>
+  <?define msierrComPlusSubscriptionReadFailed = 28010?>
+  <?define msierrComPlusPartitionDependency = 28011?>
+  <?define msierrComPlusPartitionNotFound = 28012?>
+  <?define msierrComPlusPartitionIdConflict = 28013?>
+  <?define msierrComPlusPartitionNameConflict = 28014?>
+  <?define msierrComPlusApplicationDependency = 28015?>
+  <?define msierrComPlusApplicationNotFound = 28016?>
+  <?define msierrComPlusApplicationIdConflict = 28017?>
+  <?define msierrComPlusApplicationNameConflict = 28018?>
+  <?define msierrComPlusApplicationRoleDependency = 28019?>
+  <?define msierrComPlusApplicationRoleNotFound = 28020?>
+  <?define msierrComPlusApplicationRoleConflict = 28021?>
+  <?define msierrComPlusAssemblyDependency = 28022?>
+  <?define msierrComPlusSubscriptionIdConflict = 28023?>
+  <?define msierrComPlusSubscriptionNameConflict = 28024?>
+  <?define msierrComPlusFailedLookupNames = 28025?>
+  <?define msierrMsmqCannotConnect = 28101?>
+</Include>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb