Rename "bundle extension" to "bootstrapper extension" for more consistency

Also renames WixToolet.BextUtil nupkg to WixToolset.BootstrapperExtensionApi.

12 files changed, 132 insertions, 132 deletions

diff --git a/src/ext/Util/be/UtilBootstrapperExtension.cpp b/src/ext/Util/be/UtilBootstrapperExtension.cpp
new file mode 100644
index 00000000..4d4d89c7
--- /dev/null
+++ b/src/ext/Util/be/UtilBootstrapperExtension.cpp
@@ -0,0 +1,87 @@
+// 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 "precomp.h"
+#include "BextBaseBootstrapperExtension.h"
+
+class CWixUtilBootstrapperExtension : public CBextBaseBootstrapperExtension
+{
+public: // IBootstrapperExtension
+    virtual STDMETHODIMP Search(
+        __in LPCWSTR wzId,
+        __in LPCWSTR wzVariable
+        )
+    {
+        HRESULT hr = S_OK;
+
+        hr = UtilSearchExecute(&m_searches, wzId, wzVariable, m_pEngine);
+
+        return hr;
+    }
+
+public: //CBextBaseBootstrapperExtension
+    virtual STDMETHODIMP Initialize(
+        __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pCreateArgs
+        )
+    {
+        HRESULT hr = S_OK;
+        IXMLDOMDocument* pixdManifest = NULL;
+        IXMLDOMNode* pixnBootstrapperExtension = NULL;
+
+        hr = __super::Initialize(pCreateArgs);
+        BextExitOnFailure(hr, "CBextBaseBootstrapperExtension initialization failed.");
+
+        hr = XmlLoadDocumentFromFile(m_sczBootstrapperExtensionDataPath, &pixdManifest);
+        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBootstrapperExtensionDataPath);
+
+        hr = BextGetBootstrapperExtensionDataNode(pixdManifest, UTIL_BOOTSTRAPPER_EXTENSION_ID, &pixnBootstrapperExtension);
+        BextExitOnFailure(hr, "Failed to get BootstrapperExtension '%ls'", UTIL_BOOTSTRAPPER_EXTENSION_ID);
+
+        hr = UtilSearchParseFromXml(&m_searches, pixnBootstrapperExtension);
+        BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
+
+    LExit:
+        ReleaseObject(pixnBootstrapperExtension);
+        ReleaseObject(pixdManifest);
+
+        return hr;
+    }
+
+public:
+    CWixUtilBootstrapperExtension(
+        __in IBootstrapperExtensionEngine* pEngine
+        ) : CBextBaseBootstrapperExtension(pEngine)
+    {
+        m_searches = { };
+    }
+
+    ~CWixUtilBootstrapperExtension()
+    {
+        UtilSearchUninitialize(&m_searches);
+    }
+
+private:
+    UTIL_SEARCHES m_searches;
+};
+
+HRESULT UtilBootstrapperExtensionCreate(
+    __in IBootstrapperExtensionEngine* pEngine,
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBootstrapperExtension** ppBootstrapperExtension
+    )
+{
+    HRESULT hr = S_OK;
+    CWixUtilBootstrapperExtension* pExtension = NULL;
+
+    pExtension = new CWixUtilBootstrapperExtension(pEngine);
+    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBootstrapperExtension.");
+
+    hr = pExtension->Initialize(pArgs);
+    BextExitOnFailure(hr, "CWixUtilBootstrapperExtension initialization failed.");
+
+    *ppBootstrapperExtension = pExtension;
+    pExtension = NULL;
+
+LExit:
+    ReleaseObject(pExtension);
+    return hr;
+}
diff --git a/src/ext/Util/be/UtilBootstrapperExtension.h b/src/ext/Util/be/UtilBootstrapperExtension.h
new file mode 100644
index 00000000..32cabb89
--- /dev/null
+++ b/src/ext/Util/be/UtilBootstrapperExtension.h
@@ -0,0 +1,16 @@
+#pragma once
+// 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.
+
+
+// constants
+
+#define UTIL_BOOTSTRAPPER_EXTENSION_ID BOOTSTRAPPER_EXTENSION_DECORATION(L"UtilBootstrapperExtension")
+
+
+// function declarations
+
+HRESULT UtilBootstrapperExtensionCreate(
+    __in IBootstrapperExtensionEngine* pEngine,
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBootstrapperExtension** ppBootstrapperExtension
+    );
diff --git a/src/ext/Util/be/UtilBundleExtension.cpp b/src/ext/Util/be/UtilBundleExtension.cpp
deleted file mode 100644
index 23f5d94f..00000000
--- a/src/ext/Util/be/UtilBundleExtension.cpp
+++ /dev/null
@@ -1,87 +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 "precomp.h"
-#include "BextBaseBundleExtension.h"
-
-class CWixUtilBundleExtension : public CBextBaseBundleExtension
-{
-public: // IBundleExtension
-    virtual STDMETHODIMP Search(
-        __in LPCWSTR wzId,
-        __in LPCWSTR wzVariable
-        )
-    {
-        HRESULT hr = S_OK;
-
-        hr = UtilSearchExecute(&m_searches, wzId, wzVariable, m_pEngine);
-
-        return hr;
-    }
-
-public: //CBextBaseBundleExtension
-    virtual STDMETHODIMP Initialize(
-        __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs
-        )
-    {
-        HRESULT hr = S_OK;
-        IXMLDOMDocument* pixdManifest = NULL;
-        IXMLDOMNode* pixnBundleExtension = NULL;
-
-        hr = __super::Initialize(pCreateArgs);
-        BextExitOnFailure(hr, "CBextBaseBundleExtension initialization failed.");
-
-        hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest);
-        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath);
-
-        hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension);
-        BextExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID);
-
-        hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension);
-        BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
-
-    LExit:
-        ReleaseObject(pixnBundleExtension);
-        ReleaseObject(pixdManifest);
-
-        return hr;
-    }
-
-public:
-    CWixUtilBundleExtension(
-        __in IBundleExtensionEngine* pEngine
-        ) : CBextBaseBundleExtension(pEngine)
-    {
-        m_searches = { };
-    }
-
-    ~CWixUtilBundleExtension()
-    {
-        UtilSearchUninitialize(&m_searches);
-    }
-
-private:
-    UTIL_SEARCHES m_searches;
-};
-
-HRESULT UtilBundleExtensionCreate(
-    __in IBundleExtensionEngine* pEngine,
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __out IBundleExtension** ppBundleExtension
-    )
-{
-    HRESULT hr = S_OK;
-    CWixUtilBundleExtension* pExtension = NULL;
-
-    pExtension = new CWixUtilBundleExtension(pEngine);
-    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension.");
-
-    hr = pExtension->Initialize(pArgs);
-    BextExitOnFailure(hr, "CWixUtilBundleExtension initialization failed.");
-
-    *ppBundleExtension = pExtension;
-    pExtension = NULL;
-
-LExit:
-    ReleaseObject(pExtension);
-    return hr;
-}
diff --git a/src/ext/Util/be/UtilBundleExtension.h b/src/ext/Util/be/UtilBundleExtension.h
deleted file mode 100644
index c55d6b85..00000000
--- a/src/ext/Util/be/UtilBundleExtension.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-// 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.
-
-
-// constants
-
-#define UTIL_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"UtilBundleExtension")
-
-
-// function declarations
-
-HRESULT UtilBundleExtensionCreate(
-    __in IBundleExtensionEngine* pEngine,
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __out IBundleExtension** ppBundleExtension
-    );
diff --git a/src/ext/Util/be/detectsha2support.cpp b/src/ext/Util/be/detectsha2support.cpp
index 4abfc63c..c7175a47 100644
--- a/src/ext/Util/be/detectsha2support.cpp
+++ b/src/ext/Util/be/detectsha2support.cpp
@@ -41,7 +41,7 @@ LExit:
 HRESULT UtilPerformDetectSHA2CodeSigning(
     __in LPCWSTR wzVariable,
     __in UTIL_SEARCH* /*pSearch*/,
-    __in IBundleExtensionEngine* pEngine
+    __in IBootstrapperExtensionEngine* pEngine
     )
 {
     HRESULT hr = S_OK;
diff --git a/src/ext/Util/be/detectsha2support.h b/src/ext/Util/be/detectsha2support.h
index c38a3d59..b387a3ea 100644
--- a/src/ext/Util/be/detectsha2support.h
+++ b/src/ext/Util/be/detectsha2support.h
@@ -4,5 +4,5 @@
 HRESULT UtilPerformDetectSHA2CodeSigning(
     __in LPCWSTR wzVariable,
     __in UTIL_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine
-    );
\ No newline at end of file
+    __in IBootstrapperExtensionEngine* pEngine
+    );
diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h
index d04bf305..0cf0c761 100644
--- a/src/ext/Util/be/precomp.h
+++ b/src/ext/Util/be/precomp.h
@@ -24,9 +24,9 @@
 #include <xmlutil.h>
 
 #include <bextutil.h>
-#include <BextBundleExtensionEngine.h>
+#include <BextBootstrapperExtensionEngine.h>
 
 #include "..\..\beDecor.h"
 #include "utilsearch.h"
 #include "detectsha2support.h"
-#include "UtilBundleExtension.h"
+#include "UtilBootstrapperExtension.h"
diff --git a/src/ext/Util/be/utilbe.cpp b/src/ext/Util/be/utilbe.cpp
index d9816dc7..b4e6fda3 100644
--- a/src/ext/Util/be/utilbe.cpp
+++ b/src/ext/Util/be/utilbe.cpp
@@ -1,19 +1,19 @@
 // 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 "precomp.h"
-#include "BextBaseBundleExtensionProc.h"
+#include "BextBaseBootstrapperExtensionProc.h"
 
-static IBundleExtension* vpBundleExtension = NULL;
+static IBootstrapperExtension* vpBootstrapperExtension = NULL;
 
 // function definitions
 
-extern "C" HRESULT WINAPI BundleExtensionCreate(
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults
+extern "C" HRESULT WINAPI BootstrapperExtensionCreate(
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __inout BOOTSTRAPPER_EXTENSION_CREATE_RESULTS* pResults
     )
 {
     HRESULT hr = S_OK;
-    IBundleExtensionEngine* pEngine = NULL;
+    IBootstrapperExtensionEngine* pEngine = NULL;
 
     hr = XmlInitialize();
     ExitOnFailure(hr, "Failed to initialize XML.");
@@ -21,11 +21,11 @@ extern "C" HRESULT WINAPI BundleExtensionCreate(
     hr = BextInitializeFromCreateArgs(pArgs, &pEngine);
     ExitOnFailure(hr, "Failed to initialize bext");
 
-    hr = UtilBundleExtensionCreate(pEngine, pArgs, &vpBundleExtension);
-    BextExitOnFailure(hr, "Failed to create WixUtilBundleExtension");
+    hr = UtilBootstrapperExtensionCreate(pEngine, pArgs, &vpBootstrapperExtension);
+    BextExitOnFailure(hr, "Failed to create WixUtilBootstrapperExtension");
 
-    pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc;
-    pResults->pvBundleExtensionProcContext = vpBundleExtension;
+    pResults->pfnBootstrapperExtensionProc = BextBaseBootstrapperExtensionProc;
+    pResults->pvBootstrapperExtensionProcContext = vpBootstrapperExtension;
 
 LExit:
     ReleaseObject(pEngine);
@@ -33,9 +33,9 @@ LExit:
     return hr;
 }
 
-extern "C" void WINAPI BundleExtensionDestroy()
+extern "C" void WINAPI BootstrapperExtensionDestroy()
 {
     BextUninitialize();
-    ReleaseNullObject(vpBundleExtension);
+    ReleaseNullObject(vpBootstrapperExtension);
     XmlUninitialize();
-}
\ No newline at end of file
+}
diff --git a/src/ext/Util/be/utilbe.def b/src/ext/Util/be/utilbe.def
index 711b1a5c..b4e7e893 100644
--- a/src/ext/Util/be/utilbe.def
+++ b/src/ext/Util/be/utilbe.def
@@ -4,5 +4,5 @@
 LIBRARY      "utilbe"
 
 EXPORTS
-    BundleExtensionCreate
-    BundleExtensionDestroy
+    BootstrapperExtensionCreate
+    BootstrapperExtensionDestroy
diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj
index d2697bbd..df06cb46 100644
--- a/src/ext/Util/be/utilbe.vcxproj
+++ b/src/ext/Util/be/utilbe.vcxproj
@@ -35,7 +35,7 @@
     <TargetName>utilbe</TargetName>
     <CharacterSet>Unicode</CharacterSet>
     <ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile>
-    <Description>WiX Toolset Util BundleExtension</Description>
+    <Description>WiX Toolset Util BootstrapperExtension</Description>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,14 +51,14 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="utilbe.cpp" />
-    <ClCompile Include="UtilBundleExtension.cpp" />
+    <ClCompile Include="UtilBootstrapperExtension.cpp" />
     <ClCompile Include="utilsearch.cpp" />
   </ItemGroup>
 
   <ItemGroup>
     <ClInclude Include="detectsha2support.h" />
     <ClInclude Include="precomp.h" />
-    <ClInclude Include="UtilBundleExtension.h" />
+    <ClInclude Include="UtilBootstrapperExtension.h" />
     <ClInclude Include="utilsearch.h" />
   </ItemGroup>
 
@@ -67,7 +67,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BextUtil" />
+    <PackageReference Include="WixToolset.BootstrapperExtensionApi" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/ext/Util/be/utilsearch.cpp b/src/ext/Util/be/utilsearch.cpp
index 20a514d8..59c497e3 100644
--- a/src/ext/Util/be/utilsearch.cpp
+++ b/src/ext/Util/be/utilsearch.cpp
@@ -5,7 +5,7 @@
 
 STDMETHODIMP UtilSearchParseFromXml(
     __in UTIL_SEARCHES* pSearches,
-    __in IXMLDOMNode* pixnBundleExtension
+    __in IXMLDOMNode* pixnBootstrapperExtension
     )
 {
     HRESULT hr = S_OK;
@@ -16,7 +16,7 @@ STDMETHODIMP UtilSearchParseFromXml(
     LPWSTR scz = NULL;
 
     // Select Util search nodes.
-    hr = XmlSelectNodes(pixnBundleExtension, L"WixWindowsFeatureSearch", &pixnNodes);
+    hr = XmlSelectNodes(pixnBootstrapperExtension, L"WixWindowsFeatureSearch", &pixnNodes);
     BextExitOnFailure(hr, "Failed to select Util search nodes.");
 
     // Get Util search node count.
@@ -103,7 +103,7 @@ STDMETHODIMP UtilSearchExecute(
     __in UTIL_SEARCHES* pSearches,
     __in LPCWSTR wzSearchId,
     __in LPCWSTR wzVariable,
-    __in IBundleExtensionEngine* pEngine
+    __in IBootstrapperExtensionEngine* pEngine
     )
 {
     HRESULT hr = S_OK;
diff --git a/src/ext/Util/be/utilsearch.h b/src/ext/Util/be/utilsearch.h
index deeab1f7..d19e240f 100644
--- a/src/ext/Util/be/utilsearch.h
+++ b/src/ext/Util/be/utilsearch.h
@@ -44,7 +44,7 @@ typedef struct _UTIL_SEARCHES
 
 STDMETHODIMP UtilSearchParseFromXml(
     __in UTIL_SEARCHES* pSearches,
-    __in IXMLDOMNode* pixnBundleExtension
+    __in IXMLDOMNode* pixnBootstrapperExtension
     );
 
 void UtilSearchUninitialize(
@@ -55,7 +55,7 @@ STDMETHODIMP UtilSearchExecute(
     __in UTIL_SEARCHES* pSearches,
     __in LPCWSTR wzSearchId,
     __in LPCWSTR wzVariable,
-    __in IBundleExtensionEngine* pEngine
+    __in IBootstrapperExtensionEngine* pEngine
     );
 
 STDMETHODIMP UtilSearchFindById(