Add Netfx bundle extension and netfx:DotNetCoreSearch.

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

Fixes 6257

2 files changed, 4 insertions, 2 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
index 6a641a5b..e7e91705 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
@@ -62,6 +62,7 @@ HRESULT DAPI ProcExec(
     __out HANDLE *phProcess
     );
 HRESULT DAPI ProcExecute(
+    __in_z_opt LPCWSTR wzApplicationName,
     __in_z LPWSTR wzCommand,
     __out HANDLE *phProcess,
     __out_opt HANDLE *phChildStdIn,
@@ -73,7 +74,7 @@ HRESULT DAPI ProcWaitForCompletion(
     __out_opt DWORD* pdwReturnCode
     );
 HRESULT DAPI ProcWaitForIds(
-    __in_ecount(cProcessIds) const DWORD* pdwProcessIds,
+    __in_ecount(cProcessIds) const DWORD rgdwProcessIds[],
     __in DWORD cProcessIds,
     __in DWORD dwMilliseconds
     );
diff --git a/src/libs/dutil/WixToolset.DUtil/procutil.cpp b/src/libs/dutil/WixToolset.DUtil/procutil.cpp
index 376aec6d..f96a1999 100644
--- a/src/libs/dutil/WixToolset.DUtil/procutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/procutil.cpp
@@ -375,6 +375,7 @@ LExit:
 
 *******************************************************************/
 extern "C" HRESULT DAPI ProcExecute(
+    __in_z_opt LPCWSTR wzApplicationName,
     __in_z LPWSTR wzCommand,
     __out HANDLE *phProcess,
     __out_opt HANDLE *phChildStdIn,
@@ -405,7 +406,7 @@ extern "C" HRESULT DAPI ProcExecute(
 
 #pragma prefast(push)
 #pragma prefast(disable:25028)
-    if (::CreateProcessW(NULL,
+    if (::CreateProcessW(wzApplicationName,
         wzCommand, // command line
         NULL, // security info
         NULL, // thread info