Add Netfx bundle extension and netfx:DotNetCoreSearch.

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

Fixes 6257

11 files changed, 676 insertions, 0 deletions

diff --git a/src/ext/NetFx/be/NetfxBundleExtension.cpp b/src/ext/NetFx/be/NetfxBundleExtension.cpp
new file mode 100644
index 00000000..838a97c1
--- /dev/null
+++ b/src/ext/NetFx/be/NetfxBundleExtension.cpp
@@ -0,0 +1,102 @@
+// 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 CWixNetfxBundleExtension : public CBextBaseBundleExtension
+{
+public: // IBundleExtension
+    virtual STDMETHODIMP Search(
+        __in LPCWSTR wzId,
+        __in LPCWSTR wzVariable
+        )
+    {
+        HRESULT hr = S_OK;
+
+        hr = NetfxSearchExecute(&m_searches, wzId, wzVariable, m_pEngine, m_sczBaseDirectory);
+
+        return hr;
+    }
+
+public: //CBextBaseBundleExtension
+    virtual STDMETHODIMP Initialize(
+        __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs
+        )
+    {
+        HRESULT hr = S_OK;
+        LPWSTR sczModulePath = NULL;
+        IXMLDOMDocument* pixdManifest = NULL;
+        IXMLDOMNode* pixnBundleExtension = NULL;
+
+        hr = __super::Initialize(pCreateArgs);
+        BextExitOnFailure(hr, "CBextBaseBundleExtension initialization failed.");
+
+        hr = PathForCurrentProcess(&sczModulePath, m_hInstance);
+        BextExitOnFailure(hr, "Failed to get bundle extension path.");
+
+        hr = PathGetDirectory(sczModulePath, &m_sczBaseDirectory);
+        BextExitOnFailure(hr, "Failed to get bundle extension base directory.");
+
+        hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest);
+        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath);
+
+        hr = BextGetBundleExtensionDataNode(pixdManifest, NETFX_BUNDLE_EXTENSION_ID, &pixnBundleExtension);
+        BextExitOnFailure(hr, "Failed to get BundleExtension '%ls'", NETFX_BUNDLE_EXTENSION_ID);
+
+        hr = NetfxSearchParseFromXml(&m_searches, pixnBundleExtension);
+        BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
+
+    LExit:
+        ReleaseObject(pixnBundleExtension);
+        ReleaseObject(pixdManifest);
+        ReleaseStr(sczModulePath);
+
+        return hr;
+    }
+
+public:
+    CWixNetfxBundleExtension(
+        __in HINSTANCE hInstance,
+        __in IBundleExtensionEngine* pEngine
+        ) : CBextBaseBundleExtension(pEngine)
+    {
+        m_searches = { };
+        m_hInstance = hInstance;
+        m_sczBaseDirectory = NULL;
+    }
+
+    ~CWixNetfxBundleExtension()
+    {
+        NetfxSearchUninitialize(&m_searches);
+        ReleaseStr(m_sczBaseDirectory);
+    }
+
+private:
+    NETFX_SEARCHES m_searches;
+    HINSTANCE m_hInstance;
+    LPWSTR m_sczBaseDirectory;
+};
+
+HRESULT NetfxBundleExtensionCreate(
+    __in HINSTANCE hInstance,
+    __in IBundleExtensionEngine* pEngine,
+    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBundleExtension** ppBundleExtension
+    )
+{
+    HRESULT hr = S_OK;
+    CWixNetfxBundleExtension* pExtension = NULL;
+
+    pExtension = new CWixNetfxBundleExtension(hInstance, pEngine);
+    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixNetfxBundleExtension.");
+
+    hr = pExtension->Initialize(pArgs);
+    BextExitOnFailure(hr, "CWixNetfxBundleExtension initialization failed.");
+
+    *ppBundleExtension = pExtension;
+    pExtension = NULL;
+
+LExit:
+    ReleaseObject(pExtension);
+    return hr;
+}
diff --git a/src/ext/NetFx/be/NetfxBundleExtension.h b/src/ext/NetFx/be/NetfxBundleExtension.h
new file mode 100644
index 00000000..0746dbed
--- /dev/null
+++ b/src/ext/NetFx/be/NetfxBundleExtension.h
@@ -0,0 +1,17 @@
+#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 NETFX_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"NetfxBundleExtension")
+
+
+// function declarations
+
+HRESULT NetfxBundleExtensionCreate(
+    __in HINSTANCE hInstance,
+    __in IBundleExtensionEngine* pEngine,
+    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBundleExtension** ppBundleExtension
+    );
diff --git a/src/ext/NetFx/be/detectnetcore.cpp b/src/ext/NetFx/be/detectnetcore.cpp
new file mode 100644
index 00000000..42156692
--- /dev/null
+++ b/src/ext/NetFx/be/detectnetcore.cpp
@@ -0,0 +1,140 @@
+// 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"
+
+HRESULT DetectNetCore(
+    __in NETFX_NET_CORE_PLATFORM platform,
+    __in NETFX_NET_CORE_RUNTIME_TYPE runtimeType,
+    __in LPCWSTR wzMajorVersion,
+    __in LPCWSTR wzBaseDirectory,
+    __inout LPWSTR* psczLatestVersion
+    )
+{
+    HRESULT hr = S_OK;
+    LPCWSTR wzRuntimeType = NULL;
+    LPCWSTR wzPlatformName = NULL;
+    LPWSTR sczExePath = NULL;
+    LPWSTR sczCommandLine = NULL;
+    HANDLE hProcess = NULL;
+    HANDLE hStdOutErr = INVALID_HANDLE_VALUE;
+    BYTE* rgbOutput = NULL;
+    DWORD cbOutput = 0;
+    DWORD cbTotalRead = 0;
+    DWORD cbRead = 0;
+    DWORD dwExitCode = 0;
+
+    ReleaseNullStr(*psczLatestVersion);
+
+    switch (runtimeType)
+    {
+    case NETFX_NET_CORE_RUNTIME_TYPE_ASPNET:
+        wzRuntimeType = L"Microsoft.AspNetCore.App";
+        break;
+    case NETFX_NET_CORE_RUNTIME_TYPE_CORE:
+        wzRuntimeType = L"Microsoft.NETCore.App";
+        break;
+    case NETFX_NET_CORE_RUNTIME_TYPE_DESKTOP:
+        wzRuntimeType = L"Microsoft.WindowsDesktop.App";
+        break;
+    default:
+        BextExitWithRootFailure(hr, E_INVALIDARG, "Unknown runtime type: %u", runtimeType);
+        break;
+    }
+
+    switch (platform)
+    {
+    case NETFX_NET_CORE_PLATFORM_ARM64:
+        wzPlatformName = L"arm64";
+        break;
+    case NETFX_NET_CORE_PLATFORM_X64:
+        wzPlatformName = L"x64";
+        break;
+    case NETFX_NET_CORE_PLATFORM_X86:
+        wzPlatformName = L"x86";
+        break;
+    default:
+        BextExitWithRootFailure(hr, E_INVALIDARG, "Unknown platform: %u", platform);
+        break;
+    }
+
+    hr = StrAllocFormatted(&sczExePath, L"%ls%ls\\netcoresearch.exe", wzBaseDirectory, wzPlatformName);
+    BextExitOnFailure(hr, "Failed to build netcoresearch.exe path.");
+
+    hr = StrAllocFormatted(&sczCommandLine, L"\"%ls\" %ls %ls", sczExePath, wzMajorVersion, wzRuntimeType);
+    BextExitOnFailure(hr, "Failed to build netcoresearch.exe command line.");
+
+    hr = ProcExecute(sczExePath, sczCommandLine, &hProcess, NULL, &hStdOutErr);
+    if (HRESULT_FROM_WIN32(ERROR_EXE_MACHINE_TYPE_MISMATCH) == hr)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    BextExitOnFailure(hr, "Failed to run: %ls", sczCommandLine);
+
+    cbOutput = 64;
+
+    rgbOutput = reinterpret_cast<BYTE*>(MemAlloc(cbOutput, TRUE));
+    BextExitOnNull(rgbOutput, hr, E_OUTOFMEMORY, "Failed to alloc output string.");
+
+    while (::ReadFile(hStdOutErr, rgbOutput + cbTotalRead, cbOutput - cbTotalRead, &cbRead, NULL))
+    {
+        cbTotalRead += cbRead;
+
+        if (cbTotalRead == cbOutput)
+        {
+            cbOutput *= 2;
+
+            LPVOID pvNew = MemReAlloc(rgbOutput, cbOutput, TRUE);
+            BextExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to realloc output string.");
+
+            rgbOutput = reinterpret_cast<BYTE*>(pvNew);
+        }
+    }
+
+    if (ERROR_BROKEN_PIPE != ::GetLastError())
+    {
+        BextExitWithLastError(hr, "Failed to read netcoresearch.exe output.");
+    }
+
+    hr = ProcWaitForCompletion(hProcess, INFINITE, &dwExitCode);
+    BextExitOnFailure(hr, "Failed to wait for netcoresearch.exe to exit.");
+
+    if (0 != dwExitCode)
+    {
+        BextExitWithRootFailure(hr, E_UNEXPECTED, "netcoresearch.exe failed with exit code: 0x%x\r\nOutput:\r\n%hs", dwExitCode, rgbOutput);
+    }
+
+    if (*rgbOutput)
+    {
+        hr = StrAllocStringAnsi(psczLatestVersion, reinterpret_cast<LPSTR>(rgbOutput), 0, CP_UTF8);
+        BextExitOnFailure(hr, "Failed to widen output string: %hs", rgbOutput);
+    }
+
+LExit:
+    ReleaseFileHandle(hStdOutErr);
+    ReleaseHandle(hProcess);
+    ReleaseMem(rgbOutput);
+    ReleaseStr(sczCommandLine);
+    ReleaseStr(sczExePath);
+
+    return hr;
+}
+
+HRESULT NetfxPerformDetectNetCore(
+    __in LPCWSTR wzVariable,
+    __in NETFX_SEARCH* pSearch,
+    __in IBundleExtensionEngine* pEngine,
+    __in LPCWSTR wzBaseDirectory
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczLatestVersion = FALSE;
+
+    hr = DetectNetCore(pSearch->NetCoreSearch.platform, pSearch->NetCoreSearch.runtimeType, pSearch->NetCoreSearch.sczMajorVersion, wzBaseDirectory, &sczLatestVersion);
+    BextExitOnFailure(hr, "DetectNetCore failed.");
+
+    hr = pEngine->SetVariableVersion(wzVariable, sczLatestVersion);
+    BextExitOnFailure(hr, "Failed to set variable '%ls' to '%ls'", wzVariable, sczLatestVersion);
+
+LExit:
+    return hr;
+}
diff --git a/src/ext/NetFx/be/detectnetcore.h b/src/ext/NetFx/be/detectnetcore.h
new file mode 100644
index 00000000..ef93b39b
--- /dev/null
+++ b/src/ext/NetFx/be/detectnetcore.h
@@ -0,0 +1,9 @@
+#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.
+
+HRESULT NetfxPerformDetectNetCore(
+    __in LPCWSTR wzVariable,
+    __in NETFX_SEARCH* pSearch,
+    __in IBundleExtensionEngine* pEngine,
+    __in LPCWSTR wzBaseDirectory
+    );
diff --git a/src/ext/NetFx/be/netfxbe.cpp b/src/ext/NetFx/be/netfxbe.cpp
new file mode 100644
index 00000000..3a34cea3
--- /dev/null
+++ b/src/ext/NetFx/be/netfxbe.cpp
@@ -0,0 +1,62 @@
+// 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"
+
+static HINSTANCE vhInstance = NULL;
+static IBundleExtension* vpBundleExtension = NULL;
+
+// function definitions
+
+extern "C" BOOL WINAPI DllMain(
+    __in HINSTANCE hInstance,
+    __in DWORD dwReason,
+    __in LPVOID /*pvReserved*/
+    )
+{
+    switch(dwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        vhInstance = hInstance;
+        break;
+
+    case DLL_PROCESS_DETACH:
+        vhInstance = NULL;
+        break;
+    }
+
+    return TRUE;
+}
+
+extern "C" HRESULT WINAPI BundleExtensionCreate(
+    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
+    __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults
+    )
+{
+    HRESULT hr = S_OK;
+    IBundleExtensionEngine* pEngine = NULL;
+
+    hr = XmlInitialize();
+    ExitOnFailure(hr, "Failed to initialize XML.");
+
+    hr = BextInitializeFromCreateArgs(pArgs, &pEngine);
+    ExitOnFailure(hr, "Failed to initialize bext");
+
+    hr = NetfxBundleExtensionCreate(vhInstance, pEngine, pArgs, &vpBundleExtension);
+    BextExitOnFailure(hr, "Failed to create WixNetfxBundleExtension");
+
+    pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc;
+    pResults->pvBundleExtensionProcContext = vpBundleExtension;
+
+LExit:
+    ReleaseObject(pEngine);
+
+    return hr;
+}
+
+extern "C" void WINAPI BundleExtensionDestroy()
+{
+    BextUninitialize();
+    ReleaseNullObject(vpBundleExtension);
+    XmlUninitialize();
+}
diff --git a/src/ext/NetFx/be/netfxbe.def b/src/ext/NetFx/be/netfxbe.def
new file mode 100644
index 00000000..c6605241
--- /dev/null
+++ b/src/ext/NetFx/be/netfxbe.def
@@ -0,0 +1,8 @@
+; 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.
+
+
+LIBRARY      "netfxbe"
+
+EXPORTS
+    BundleExtensionCreate
+    BundleExtensionDestroy
diff --git a/src/ext/NetFx/be/netfxbe.vcxproj b/src/ext/NetFx/be/netfxbe.vcxproj
new file mode 100644
index 00000000..00588764
--- /dev/null
+++ b/src/ext/NetFx/be/netfxbe.vcxproj
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|X64">
+      <Configuration>Debug</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|X64">
+      <Configuration>Release</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B65719C0-B2CC-45F9-AF33-6F147F741ADB}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <TargetName>netfxbe</TargetName>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectModuleDefinitionFile>netfxbe.def</ProjectModuleDefinitionFile>
+    <Description>WiX Toolset Netfx BundleExtension</Description>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="detectnetcore.cpp" />
+    <ClCompile Include="netfxbe.cpp" />
+    <ClCompile Include="NetfxBundleExtension.cpp" />
+    <ClCompile Include="netfxsearch.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="detectnetcore.h" />
+    <ClInclude Include="NetfxBundleExtension.h" />
+    <ClInclude Include="netfxsearch.h" />
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="netfxbe.def" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BextUtil" />
+
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/ext/NetFx/be/netfxsearch.cpp b/src/ext/NetFx/be/netfxsearch.cpp
new file mode 100644
index 00000000..3c12161d
--- /dev/null
+++ b/src/ext/NetFx/be/netfxsearch.cpp
@@ -0,0 +1,149 @@
+// 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"
+
+
+STDMETHODIMP NetfxSearchParseFromXml(
+    __in NETFX_SEARCHES* pSearches,
+    __in IXMLDOMNode* pixnBundleExtension
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList* pixnNodes = NULL;
+    IXMLDOMNode* pixnNode = NULL;
+    DWORD cNodes = 0;
+    BSTR bstrNodeName = NULL;
+
+    // Select Netfx search nodes.
+    hr = XmlSelectNodes(pixnBundleExtension, L"NetFxNetCoreSearch", &pixnNodes);
+    BextExitOnFailure(hr, "Failed to select Netfx search nodes.");
+
+    // Get Netfx search node count.
+    hr = pixnNodes->get_length((long*)&cNodes);
+    BextExitOnFailure(hr, "Failed to get Netfx search node count.");
+
+    if (!cNodes)
+    {
+        ExitFunction();
+    }
+
+    // Allocate memory for searches.
+    pSearches->rgSearches = (NETFX_SEARCH*)MemAlloc(sizeof(NETFX_SEARCH) * cNodes, TRUE);
+    BextExitOnNull(pSearches->rgSearches, hr, E_OUTOFMEMORY, "Failed to allocate memory for search structs.");
+
+    pSearches->cSearches = cNodes;
+
+    // Parse search elements.
+    for (DWORD i = 0; i < cNodes; ++i)
+    {
+        NETFX_SEARCH* pSearch = &pSearches->rgSearches[i];
+
+        hr = XmlNextElement(pixnNodes, &pixnNode, &bstrNodeName);
+        BextExitOnFailure(hr, "Failed to get next node.");
+
+        // @Id
+        hr = XmlGetAttributeEx(pixnNode, L"Id", &pSearch->sczId);
+        BextExitOnFailure(hr, "Failed to get @Id.");
+
+        // Read type specific attributes.
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSearch", -1))
+        {
+            pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SEARCH;
+
+            // @RuntimeType
+            hr = XmlGetAttributeUInt32(pixnNode, L"RuntimeType", reinterpret_cast<DWORD*>(&pSearch->NetCoreSearch.runtimeType));
+            BextExitOnFailure(hr, "Failed to get @RuntimeType.");
+
+            // @Platform
+            hr = XmlGetAttributeUInt32(pixnNode, L"Platform", reinterpret_cast<DWORD*>(&pSearch->NetCoreSearch.platform));
+            BextExitOnFailure(hr, "Failed to get @Platform.");
+
+            // @MajorVersion
+            hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &pSearch->NetCoreSearch.sczMajorVersion);
+            BextExitOnFailure(hr, "Failed to get @MajorVersion.");
+        }
+        else
+        {
+            BextExitWithRootFailure(hr, E_UNEXPECTED, "Unexpected element name: %ls", bstrNodeName);
+        }
+
+        // prepare next iteration
+        ReleaseNullObject(pixnNode);
+        ReleaseNullBSTR(bstrNodeName);
+    }
+
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pixnNode);
+    ReleaseObject(pixnNodes);
+
+    return hr;
+}
+
+void NetfxSearchUninitialize(
+    __in NETFX_SEARCHES* pSearches
+    )
+{
+    if (pSearches->rgSearches)
+    {
+        for (DWORD i = 0; i < pSearches->cSearches; ++i)
+        {
+            NETFX_SEARCH* pSearch = &pSearches->rgSearches[i];
+
+            ReleaseStr(pSearch->sczId);
+        }
+        MemFree(pSearches->rgSearches);
+    }
+}
+
+STDMETHODIMP NetfxSearchExecute(
+    __in NETFX_SEARCHES* pSearches,
+    __in LPCWSTR wzSearchId,
+    __in LPCWSTR wzVariable,
+    __in IBundleExtensionEngine* pEngine,
+    __in LPCWSTR wzBaseDirectory
+    )
+{
+    HRESULT hr = S_OK;
+    NETFX_SEARCH* pSearch = NULL;
+
+    hr = NetfxSearchFindById(pSearches, wzSearchId, &pSearch);
+    BextExitOnFailure(hr, "Search id '%ls' is unknown to the util extension.", wzSearchId);
+
+    switch (pSearch->Type)
+    {
+    case NETFX_SEARCH_TYPE_NET_CORE_SEARCH:
+        hr = NetfxPerformDetectNetCore(wzVariable, pSearch, pEngine, wzBaseDirectory);
+        break;
+    default:
+        hr = E_UNEXPECTED;
+    }
+
+LExit:
+    return hr;
+}
+
+STDMETHODIMP NetfxSearchFindById(
+    __in NETFX_SEARCHES* pSearches,
+    __in LPCWSTR wzId,
+    __out NETFX_SEARCH** ppSearch
+    )
+{
+    HRESULT hr = S_OK;
+
+    for (DWORD i = 0; i < pSearches->cSearches; ++i)
+    {
+        NETFX_SEARCH* pSearch = &pSearches->rgSearches[i];
+
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pSearch->sczId, -1, wzId, -1))
+        {
+            *ppSearch = pSearch;
+            ExitFunction1(hr = S_OK);
+        }
+    }
+
+    hr = E_NOTFOUND;
+
+LExit:
+    return hr;
+}
diff --git a/src/ext/NetFx/be/netfxsearch.h b/src/ext/NetFx/be/netfxsearch.h
new file mode 100644
index 00000000..ae250690
--- /dev/null
+++ b/src/ext/NetFx/be/netfxsearch.h
@@ -0,0 +1,76 @@
+#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
+
+enum NETFX_SEARCH_TYPE
+{
+    NETFX_SEARCH_TYPE_NONE,
+    NETFX_SEARCH_TYPE_NET_CORE_SEARCH,
+};
+
+enum NETFX_NET_CORE_RUNTIME_TYPE
+{
+    NETFX_NET_CORE_RUNTIME_TYPE_CORE,
+    NETFX_NET_CORE_RUNTIME_TYPE_ASPNET,
+    NETFX_NET_CORE_RUNTIME_TYPE_DESKTOP,
+};
+
+enum NETFX_NET_CORE_PLATFORM
+{
+    NETFX_NET_CORE_PLATFORM_X86,
+    NETFX_NET_CORE_PLATFORM_X64,
+    NETFX_NET_CORE_PLATFORM_ARM64,
+};
+
+
+// structs
+
+typedef struct _NETFX_SEARCH
+{
+    LPWSTR sczId;
+
+    NETFX_SEARCH_TYPE Type;
+    union
+    {
+        struct
+        {
+            NETFX_NET_CORE_RUNTIME_TYPE runtimeType;
+            NETFX_NET_CORE_PLATFORM platform;
+            LPWSTR sczMajorVersion;
+        } NetCoreSearch;
+    };
+} NETFX_SEARCH;
+
+typedef struct _NETFX_SEARCHES
+{
+    NETFX_SEARCH* rgSearches;
+    DWORD cSearches;
+} NETFX_SEARCHES;
+
+
+// function declarations
+
+STDMETHODIMP NetfxSearchParseFromXml(
+    __in NETFX_SEARCHES* pSearches,
+    __in IXMLDOMNode* pixnBundleExtension
+    );
+
+void NetfxSearchUninitialize(
+    __in NETFX_SEARCHES* pSearches
+    );
+
+STDMETHODIMP NetfxSearchExecute(
+    __in NETFX_SEARCHES* pSearches,
+    __in LPCWSTR wzSearchId,
+    __in LPCWSTR wzVariable,
+    __in IBundleExtensionEngine* pEngine,
+    __in LPCWSTR wzBaseDirectory
+    );
+
+STDMETHODIMP NetfxSearchFindById(
+    __in NETFX_SEARCHES* pSearches,
+    __in LPCWSTR wzId,
+    __out NETFX_SEARCH** ppSearch
+    );
diff --git a/src/ext/NetFx/be/precomp.cpp b/src/ext/NetFx/be/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/ext/NetFx/be/precomp.cpp
@@ -0,0 +1,3 @@
+// 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"
diff --git a/src/ext/NetFx/be/precomp.h b/src/ext/NetFx/be/precomp.h
new file mode 100644
index 00000000..33aea9bc
--- /dev/null
+++ b/src/ext/NetFx/be/precomp.h
@@ -0,0 +1,33 @@
+#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.
+
+
+#include <windows.h>
+#include <msiquery.h>
+#include <msidefs.h>
+#include <stierr.h>
+
+#include <strsafe.h>
+
+#include <msxml2.h>
+
+#include <dutil.h>
+#include <fileutil.h>
+#include <memutil.h>
+#include <strutil.h>
+#include <pathutil.h>
+#include <procutil.h>
+#include <xmlutil.h>
+
+#include <BundleExtensionEngine.h>
+#include <BundleExtension.h>
+
+#include <IBundleExtensionEngine.h>
+#include <IBundleExtension.h>
+#include <bextutil.h>
+#include <BextBundleExtensionEngine.h>
+
+#include "..\..\beDecor.h"
+#include "netfxsearch.h"
+#include "detectnetcore.h"
+#include "NetfxBundleExtension.h"