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/NetFx/wixlib/NetFxExtension_Platform.wxi |  3 +-
 src/ext/NetFx/wixlib/caDecor.wxi                 | 39 ------------------------
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 src/ext/NetFx/wixlib/caDecor.wxi

(limited to 'src/ext/NetFx/wixlib')

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