1 files changed, 12 insertions, 87 deletions

diff --git a/src/ext/NetFx/be/detectnetcoresdk.cpp b/src/ext/NetFx/be/detectnetcoresdk.cpp
index 08b18334..332d8712 100644
--- a/src/ext/NetFx/be/detectnetcoresdk.cpp
+++ b/src/ext/NetFx/be/detectnetcoresdk.cpp
@@ -4,99 +4,22 @@
 
 HRESULT DetectNetCoreSdk(
     __in NETFX_NET_CORE_PLATFORM platform,
-    __in LPCWSTR wzVersion,
+    __in LPCWSTR wzMajorVersion,
     __in LPCWSTR wzBaseDirectory,
     __inout LPWSTR* psczLatestVersion
     )
 {
     HRESULT hr = S_OK;
-    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;
+    LPWSTR sczArguments = NULL;
 
-    ReleaseNullStr(*psczLatestVersion);
+    hr = StrAllocFormatted(&sczArguments, L"sdk %ls", wzMajorVersion);
+    BextExitOnFailure(hr, "Failed to build sdk netcoresearch.exe arguments.");
 
-    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\" sdk %ls", sczExePath, wzVersion);
-    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 = static_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;
-
-            const LPVOID pvNew = MemReAlloc(rgbOutput, cbOutput, TRUE);
-            BextExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to realloc output string.");
-
-            rgbOutput = static_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);
-    }
+    hr = RunNetCoreSearch(platform, wzBaseDirectory, sczArguments, psczLatestVersion);
+    BextExitOnFailure(hr, "Failed to run netcoresearch.exe for sdk.");
 
 LExit:
-    ReleaseFileHandle(hStdOutErr);
-    ReleaseHandle(hProcess);
-    ReleaseMem(rgbOutput);
-    ReleaseStr(sczCommandLine);
-    ReleaseStr(sczExePath);
+    ReleaseStr(sczArguments);
 
     return hr;
 }
@@ -109,14 +32,16 @@ HRESULT NetfxPerformDetectNetCoreSdk(
     )
 {
     HRESULT hr = S_OK;
-    LPWSTR sczLatestVersion = nullptr;
-    const auto& searchParams = pSearch->NetCoreSdkSearch;
-    hr = DetectNetCoreSdk(searchParams.platform, searchParams.sczVersion, wzBaseDirectory, &sczLatestVersion);
+    LPWSTR sczLatestVersion = NULL;
+
+    hr = DetectNetCoreSdk(pSearch->NetCoreSdkSearch.platform, pSearch->NetCoreSdkSearch.sczMajorVersion, wzBaseDirectory, &sczLatestVersion);
     BextExitOnFailure(hr, "DetectNetCoreSdk failed.");
 
     hr = pEngine->SetVariableVersion(wzVariable, sczLatestVersion);
     BextExitOnFailure(hr, "Failed to set variable '%ls' to '%ls'", wzVariable, sczLatestVersion);
 
 LExit:
+    ReleaseStr(sczLatestVersion);
+
     return hr;
 }