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 ----------------------------
 3 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 src/ext/Bal/wixlib/caDecor.wxi

(limited to 'src/ext/Bal')

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>
-- 
cgit v1.2.3-55-g6feb