From 5baa1dfe8ba2a3bd4728bca118fe1de225f848d4 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 7 Mar 2024 09:41:29 -0800
Subject: Rename "bundle extension" to "bootstrapper extension" for more
 consistency

Also renames WixToolet.BextUtil nupkg to WixToolset.BootstrapperExtensionApi.
---
 .../NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi  | 15 +++++++++++++++
 src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs |  7 +++++++
 src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs   |  7 +++++++
 src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs   |  7 +++++++
 src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi    | 15 ---------------
 src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs       |  7 -------
 src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs         |  7 -------
 src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs         |  7 -------
 8 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi
 create mode 100644 src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs
 create mode 100644 src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs
 create mode 100644 src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs
 delete mode 100644 src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi
 delete mode 100644 src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs
 delete mode 100644 src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs
 delete mode 100644 src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs

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

diff --git a/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi
new file mode 100644
index 00000000..98fbd523
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi
@@ -0,0 +1,15 @@
+<!-- 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 ?>
+
+    <Fragment>
+        <BootstrapperExtension Id="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)" SourceFile="!(bindpath.netfxbe.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\netfxbe.dll">
+            <?foreach PLATFORM in x86;x64;arm64?>
+            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" />
+            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" />
+            <?endforeach?>
+        </BootstrapperExtension>
+    </Fragment>
+</Include>
diff --git a/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs
new file mode 100644
index 00000000..00b607a1
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs
@@ -0,0 +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">
+    <?define platform=arm64 ?>
+    <?include NetfxBootstrapperExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs
new file mode 100644
index 00000000..a7412e60
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs
@@ -0,0 +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">
+    <?define platform=x64 ?>
+    <?include NetfxBootstrapperExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs
new file mode 100644
index 00000000..406f6139
--- /dev/null
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs
@@ -0,0 +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">
+    <?define platform=x86 ?>
+    <?include NetfxBootstrapperExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi
deleted file mode 100644
index bc332efc..00000000
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi
+++ /dev/null
@@ -1,15 +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">
-    <?include ..\..\caDecor.wxi ?>
-
-    <Fragment>
-        <BundleExtension Id="$(var.Prefix)NetfxBundleExtension$(var.Suffix)" SourceFile="!(bindpath.netfxbe.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\netfxbe.dll">
-            <?foreach PLATFORM in x86;x64;arm64?>
-            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" />
-            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" />
-            <?endforeach?>
-        </BundleExtension>
-    </Fragment>
-</Include>
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs b/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs
deleted file mode 100644
index 13757dd8..00000000
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs
+++ /dev/null
@@ -1,7 +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. -->
-
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?define platform=arm64 ?>
-    <?include NetfxBundleExtension_Platform.wxi ?>
-</Wix>
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs b/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs
deleted file mode 100644
index f6c27a8e..00000000
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs
+++ /dev/null
@@ -1,7 +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. -->
-
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?define platform=x64 ?>
-    <?include NetfxBundleExtension_Platform.wxi ?>
-</Wix>
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs b/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs
deleted file mode 100644
index 76a8358f..00000000
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs
+++ /dev/null
@@ -1,7 +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. -->
-
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?define platform=x86 ?>
-    <?include NetfxBundleExtension_Platform.wxi ?>
-</Wix>
-- 
cgit v1.2.3-55-g6feb