Add Netfx bundle extension and netfx:DotNetCoreSearch.

Remove built-in .NET Core packages since they update too quickly.

Fixes 6257

1 files changed, 6 insertions, 6 deletions

diff --git a/src/ext/Util/be/UtilBundleExtension.cpp b/src/ext/Util/be/UtilBundleExtension.cpp
index 110599fa..23f5d94f 100644
--- a/src/ext/Util/be/UtilBundleExtension.cpp
+++ b/src/ext/Util/be/UtilBundleExtension.cpp
@@ -28,16 +28,16 @@ public: //CBextBaseBundleExtension
         IXMLDOMNode* pixnBundleExtension = NULL;
 
         hr = __super::Initialize(pCreateArgs);
-        ExitOnFailure(hr, "CBextBaseBundleExtension initialization failed.");
+        BextExitOnFailure(hr, "CBextBaseBundleExtension initialization failed.");
 
         hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest);
-        ExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath);
+        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath);
 
         hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension);
-        ExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID);
+        BextExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID);
 
         hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension);
-        ExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
+        BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
 
     LExit:
         ReleaseObject(pixnBundleExtension);
@@ -73,10 +73,10 @@ HRESULT UtilBundleExtensionCreate(
     CWixUtilBundleExtension* pExtension = NULL;
 
     pExtension = new CWixUtilBundleExtension(pEngine);
-    ExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension.");
+    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension.");
 
     hr = pExtension->Initialize(pArgs);
-    ExitOnFailure(hr, "CWixUtilBundleExtension initialization failed.");
+    BextExitOnFailure(hr, "CWixUtilBundleExtension initialization failed.");
 
     *ppBundleExtension = pExtension;
     pExtension = NULL;