Add Netfx bundle extension and netfx:DotNetCoreSearch.

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

Fixes 6257

6 files changed, 271 insertions, 0 deletions

diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.cpp b/src/ext/NetFx/netcoresearch/netcoresearch.cpp
new file mode 100644
index 00000000..b2dad9a8
--- /dev/null
+++ b/src/ext/NetFx/netcoresearch/netcoresearch.cpp
@@ -0,0 +1,158 @@
+// 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"
+
+struct NETCORESEARCH_STATE
+{
+    LPCWSTR wzTargetName;
+    DWORD dwMajorVersion;
+    VERUTIL_VERSION* pVersion;
+};
+
+static HRESULT GetDotnetEnvironmentInfo(
+    __in DWORD dwMajorVersion,
+    __in_z LPCWSTR wzTargetName,
+    __inout VERUTIL_VERSION** ppVersion
+    );
+static void HOSTFXR_CALLTYPE GetDotnetEnvironmentInfoResult(
+    __in const hostfxr_dotnet_environment_info* pInfo,
+    __in LPVOID pvContext
+    );
+
+int __cdecl wmain(int argc, LPWSTR argv[])
+{
+    HRESULT hr = S_OK;
+    DWORD dwMajorVersion = 0;
+    VERUTIL_VERSION* pVersion = NULL;
+    LPSTR pszVersion = NULL;
+
+    ::SetConsoleCP(CP_UTF8);
+
+    ConsoleInitialize();
+
+    if (argc != 3)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+
+    hr = StrStringToUInt32(argv[1], 0, reinterpret_cast<UINT*>(&dwMajorVersion));
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get target version from: %ls", argv[1]);
+
+    hr = GetDotnetEnvironmentInfo(dwMajorVersion, argv[2], &pVersion);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to search for .NET Core.");
+
+    if (pVersion)
+    {
+        hr = StrAnsiAllocString(&pszVersion, pVersion->sczVersion, 0, CP_UTF8);
+        ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to convert version to UTF-8.");
+
+        ConsoleWrite(CONSOLE_COLOR_NORMAL, "%hs", pszVersion);
+    }
+
+LExit:
+    ReleaseStr(pszVersion);
+    ReleaseVerutilVersion(pVersion);
+    ConsoleUninitialize();
+    return hr;
+}
+
+static HRESULT GetDotnetEnvironmentInfo(
+    __in DWORD dwMajorVersion,
+    __in_z LPCWSTR wzTargetName,
+    __inout VERUTIL_VERSION** ppVersion
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczProcessPath = NULL;
+    LPWSTR sczHostfxrPath = NULL;
+    HMODULE hModule = NULL;
+    hostfxr_get_dotnet_environment_info_fn pfnGetDotnetEnvironmentInfo = NULL;
+    NETCORESEARCH_STATE state = { };
+
+    state.dwMajorVersion = dwMajorVersion;
+    state.wzTargetName = wzTargetName;
+
+    hr = PathForCurrentProcess(&sczProcessPath, NULL);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get process path.");
+
+    hr = PathGetDirectory(sczProcessPath, &sczHostfxrPath);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get process directory.");
+
+    hr = StrAllocConcat(&sczHostfxrPath, L"hostfxr.dll", 0);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to build hostfxr path.");
+
+    hModule = ::LoadLibraryExW(sczHostfxrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    ConsoleExitOnNullWithLastError(hModule, hr, CONSOLE_COLOR_RED, "Failed to load hostfxr.");
+
+    pfnGetDotnetEnvironmentInfo = (hostfxr_get_dotnet_environment_info_fn)::GetProcAddress(hModule, "hostfxr_get_dotnet_environment_info");
+    ConsoleExitOnNullWithLastError(pfnGetDotnetEnvironmentInfo, hr, CONSOLE_COLOR_RED, "Failed to get address for hostfxr_get_dotnet_environment_info.");
+
+    hr = pfnGetDotnetEnvironmentInfo(NULL, NULL, GetDotnetEnvironmentInfoResult, &state);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get .NET Core environment info.");
+
+    if (state.pVersion)
+    {
+        *ppVersion = state.pVersion;
+        state.pVersion = NULL;
+    }
+
+LExit:
+    ReleaseVerutilVersion(state.pVersion);
+    ReleaseStr(sczHostfxrPath);
+    ReleaseStr(sczProcessPath);
+
+    if (hModule)
+    {
+        ::FreeLibrary(hModule);
+    }
+
+    return hr;
+}
+
+static void HOSTFXR_CALLTYPE GetDotnetEnvironmentInfoResult(
+    __in const hostfxr_dotnet_environment_info* pInfo,
+    __in LPVOID pvContext
+    )
+{
+    NETCORESEARCH_STATE* pState = reinterpret_cast<NETCORESEARCH_STATE*>(pvContext);
+    HRESULT hr = S_OK;
+    VERUTIL_VERSION* pFrameworkVersion = NULL;
+    int nCompare = 0;
+
+    for (size_t i = 0; i < pInfo->framework_count; ++i)
+    {
+        const hostfxr_dotnet_environment_framework_info* pFrameworkInfo = pInfo->frameworks + i;
+        ReleaseVerutilVersion(pFrameworkVersion);
+
+        if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pState->wzTargetName, -1, pFrameworkInfo->name, -1))
+        {
+            continue;
+        }
+
+        hr = VerParseVersion(pFrameworkInfo->version, 0, FALSE, &pFrameworkVersion);
+        ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to parse framework version: %ls", pFrameworkInfo->version);
+
+        if (pFrameworkVersion->dwMajor != pState->dwMajorVersion)
+        {
+            continue;
+        }
+
+        if (pState->pVersion)
+        {
+            hr = VerCompareParsedVersions(pState->pVersion, pFrameworkVersion, &nCompare);
+            ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to compare versions.");
+
+            if (nCompare > -1)
+            {
+                continue;
+            }
+        }
+
+        ReleaseVerutilVersion(pState->pVersion);
+        pState->pVersion = pFrameworkVersion;
+        pFrameworkVersion = NULL;
+    }
+
+LExit:
+    ReleaseVerutilVersion(pFrameworkVersion);
+}
diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.h b/src/ext/NetFx/netcoresearch/netcoresearch.h
new file mode 100644
index 00000000..d25b13f9
--- /dev/null
+++ b/src/ext/NetFx/netcoresearch/netcoresearch.h
@@ -0,0 +1,10 @@
+#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.
+
+// TODO: remove when definition is provided in hostfxr.h.
+typedef int32_t(HOSTFXR_CALLTYPE* hostfxr_get_dotnet_environment_info_fn)(
+    const char_t* dotnet_root,
+    void* reserved,
+    hostfxr_get_dotnet_environment_info_result_fn result,
+    void* result_context
+    );
diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
new file mode 100644
index 00000000..b5f12f07
--- /dev/null
+++ b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
@@ -0,0 +1,73 @@
+<?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" ToolsVersion="15.0" xmlns="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|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A7FD9EF2-68CF-4C8E-AD81-3E8A6C7E1937}</ProjectGuid>
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectSubSystem>Console</ProjectSubSystem>
+    <TargetName>netcoresearch</TargetName>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup>
+    <NetHostPlatform>$(Platform)</NetHostPlatform>
+    <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform>
+    <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
+    <HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.6.0.4\runtimes\win-$(NetHostPlatform)\native\</HostfxrPath>
+    <ProjectAdditionalIncludeDirectories>$(NetHostPath)</ProjectAdditionalIncludeDirectories>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="netcoresearch.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="netcoresearch.h" />
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dutil" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+
+  <Target Name="CopyHostfxr" AfterTargets="Build">
+    <Copy SourceFiles="$(HostfxrPath)hostfxr.dll" DestinationFolder="$(OutputPath)" />
+  </Target>
+</Project>
diff --git a/src/ext/NetFx/netcoresearch/packages.config b/src/ext/NetFx/netcoresearch/packages.config
new file mode 100644
index 00000000..ad26db1c
--- /dev/null
+++ b/src/ext/NetFx/netcoresearch/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
+  <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
+  <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
+  <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
+  <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
+  <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/ext/NetFx/netcoresearch/precomp.cpp b/src/ext/NetFx/netcoresearch/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/ext/NetFx/netcoresearch/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/netcoresearch/precomp.h b/src/ext/NetFx/netcoresearch/precomp.h
new file mode 100644
index 00000000..24023ec2
--- /dev/null
+++ b/src/ext/NetFx/netcoresearch/precomp.h
@@ -0,0 +1,18 @@
+#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 <corerror.h>
+
+#include <dutil.h>
+#include <conutil.h>
+#include <memutil.h>
+#include <pathutil.h>
+#include <strutil.h>
+#include <verutil.h>
+#include <xmlutil.h>
+
+#include <hostfxr.h>
+
+#include "netcoresearch.h"