48 files changed, 4343 insertions, 148 deletions

diff --git a/src/dtf/SfxCA/ClrHost.cpp b/src/dtf/SfxCA/ClrHost.cpp
new file mode 100644
index 00000000..1988fb2a
--- /dev/null
+++ b/src/dtf/SfxCA/ClrHost.cpp
@@ -0,0 +1,262 @@
+// 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"
+
+void Log(MSIHANDLE hSession, const wchar_t* szMessage, ...);
+
+//---------------------------------------------------------------------
+// CLR HOSTING
+//---------------------------------------------------------------------
+
+/// <summary>
+/// Binds to the CLR after determining the appropriate version.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging.</param>
+/// <param name="version">Specific version of the CLR to load.
+/// If null, then the config file and/or primary assembly are
+/// used to determine the version.</param>
+/// <param name="szConfigFile">XML .config file which may contain
+/// a startup section to direct which version of the CLR to use.
+/// May be NULL.</param>
+/// <param name="szPrimaryAssembly">Assembly to be used to determine
+/// the version of the CLR in the absence of other configuration.
+/// May be NULL.</param>
+/// <param name="ppHost">Returned runtime host interface.</param>
+/// <returns>True if the CLR was loaded successfully, false if
+/// there was some error.</returns>
+/// <remarks>
+/// If szPrimaryAssembly is NULL and szConfigFile is also NULL or
+/// does not contain any version configuration, the CLR will not be loaded.
+/// </remarks>
+bool LoadCLR(MSIHANDLE hSession, const wchar_t* szVersion, const wchar_t* szConfigFile,
+        const wchar_t* szPrimaryAssembly, ICorRuntimeHost** ppHost)
+{
+        typedef HRESULT (__stdcall *PGetRequestedRuntimeInfo)(LPCWSTR pExe, LPCWSTR pwszVersion,
+                LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags,
+                LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength,
+                LPWSTR pVersion, DWORD cchBuffer, DWORD* dwlength);
+        typedef HRESULT (__stdcall *PCorBindToRuntimeEx)(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor,
+                DWORD startupFlags, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv);
+
+        HMODULE hmodMscoree = LoadLibrary(L"mscoree.dll");
+        if (hmodMscoree == NULL)
+        {
+                Log(hSession, L"Failed to load mscoree.dll (Error code %d). This custom action "
+                        L"requires the .NET Framework to be installed.", GetLastError());
+                return false;
+        }
+        PGetRequestedRuntimeInfo pGetRequestedRuntimeInfo = (PGetRequestedRuntimeInfo)
+                GetProcAddress(hmodMscoree, "GetRequestedRuntimeInfo");
+        PCorBindToRuntimeEx pCorBindToRuntimeEx = (PCorBindToRuntimeEx)
+                GetProcAddress(hmodMscoree, "CorBindToRuntimeEx");
+        if (pGetRequestedRuntimeInfo == NULL || pCorBindToRuntimeEx == NULL)
+        {
+                Log(hSession, L"Failed to locate functions in mscoree.dll (Error code %d). This custom action "
+                        L"requires the .NET Framework to be installed.", GetLastError());
+                FreeLibrary(hmodMscoree);
+                return false;
+        }
+
+        wchar_t szClrVersion[20];
+        HRESULT hr;
+
+        if (szVersion != NULL && szVersion[0] != L'\0')
+        {
+                wcsncpy_s(szClrVersion, 20, szVersion, 20);
+        }
+        else
+        {
+                wchar_t szVersionDir[MAX_PATH];
+                hr = pGetRequestedRuntimeInfo(szPrimaryAssembly, NULL,
+                        szConfigFile, 0, 0, szVersionDir, MAX_PATH, NULL, szClrVersion, 20, NULL);
+                if (FAILED(hr))
+                {
+                        Log(hSession, L"Failed to get requested CLR info. Error code 0x%x", hr);
+                        Log(hSession, L"Ensure that the proper version of the .NET Framework is installed, or "
+                                L"that there is a matching supportedRuntime element in CustomAction.config. "
+                                L"If you are binding to .NET 4 or greater add "
+                                L"useLegacyV2RuntimeActivationPolicy=true to the <startup> element.");
+                        FreeLibrary(hmodMscoree);
+                        return false;
+                }
+        }
+
+        Log(hSession, L"Binding to CLR version %s", szClrVersion);
+
+        ICorRuntimeHost* pHost;
+        hr = pCorBindToRuntimeEx(szClrVersion, NULL,
+                STARTUP_LOADER_OPTIMIZATION_SINGLE_DOMAIN,
+                CLSID_CorRuntimeHost, IID_ICorRuntimeHost, (void**) &pHost);
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to bind to the CLR. Error code 0x%X", hr);
+                FreeLibrary(hmodMscoree);
+                return false;
+        }
+        hr = pHost->Start();
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to start the CLR. Error code 0x%X", hr);
+                pHost->Release();
+                FreeLibrary(hmodMscoree);
+                return false;
+        }
+        *ppHost = pHost;
+        FreeLibrary(hmodMscoree);
+        return true;
+}
+
+/// <summary>
+/// Creates a new CLR application domain.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging</param>
+/// <param name="pHost">Interface to the runtime host where the
+/// app domain will be created.</param>
+/// <param name="szName">Name of the app domain to create.</param>
+/// <param name="szAppBase">Application base directory path, where
+/// the app domain will look first to load its assemblies.</param>
+/// <param name="szConfigFile">Optional XML .config file containing any
+/// configuration for thae app domain.</param>
+/// <param name="ppAppDomain">Returned app domain interface.</param>
+/// <returns>True if the app domain was created successfully, false if
+/// there was some error.</returns>
+bool CreateAppDomain(MSIHANDLE hSession, ICorRuntimeHost* pHost,
+        const wchar_t* szName, const wchar_t* szAppBase,
+        const wchar_t* szConfigFile, _AppDomain** ppAppDomain)
+{
+        IUnknown* punkAppDomainSetup = NULL;
+        IAppDomainSetup* pAppDomainSetup = NULL;
+        HRESULT hr = pHost->CreateDomainSetup(&punkAppDomainSetup);
+        if (SUCCEEDED(hr))
+        {
+                hr = punkAppDomainSetup->QueryInterface(__uuidof(IAppDomainSetup), (void**) &pAppDomainSetup);
+                punkAppDomainSetup->Release();
+        }
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to create app domain setup. Error code 0x%X", hr);
+                return false;
+        }
+
+        const wchar_t* szUrlPrefix = L"file:///";
+        size_t cchApplicationBase = wcslen(szUrlPrefix) + wcslen(szAppBase);
+        wchar_t* szApplicationBase = (wchar_t*) _alloca((cchApplicationBase + 1) * sizeof(wchar_t));
+        if (szApplicationBase == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                StringCchCopy(szApplicationBase, cchApplicationBase + 1, szUrlPrefix);
+                StringCchCat(szApplicationBase, cchApplicationBase + 1, szAppBase);
+                BSTR bstrApplicationBase = SysAllocString(szApplicationBase);
+                if (bstrApplicationBase == NULL) hr = E_OUTOFMEMORY;
+                else
+                {
+                        hr = pAppDomainSetup->put_ApplicationBase(bstrApplicationBase);
+                        SysFreeString(bstrApplicationBase);
+                }
+        }
+
+        if (SUCCEEDED(hr) && szConfigFile != NULL)
+        {
+                BSTR bstrConfigFile = SysAllocString(szConfigFile);
+                if (bstrConfigFile == NULL) hr = E_OUTOFMEMORY;
+                else
+                {
+                        hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigFile);
+                        SysFreeString(bstrConfigFile);
+                }
+        }
+
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to configure app domain setup. Error code 0x%X", hr);
+                pAppDomainSetup->Release();
+                return false;
+        }
+
+        IUnknown* punkAppDomain;
+        hr = pHost->CreateDomainEx(szName, pAppDomainSetup, NULL, &punkAppDomain);
+        pAppDomainSetup->Release();
+        if (SUCCEEDED(hr))
+        {
+                hr = punkAppDomain->QueryInterface(__uuidof(_AppDomain), (void**) ppAppDomain);
+                punkAppDomain->Release();
+        }
+
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to create app domain. Error code 0x%X", hr);
+                return false;
+        }
+
+        return true;
+}
+
+/// <summary>
+/// Locates a specific method in a specific class and assembly.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging</param>
+/// <param name="pAppDomain">Application domain in which to
+/// load assemblies.</param>
+/// <param name="szAssembly">Display name of the assembly
+/// containing the method.</param>
+/// <param name="szClass">Fully-qualified name of the class
+/// containing the method.</param>
+/// <param name="szMethod">Name of the method.</param>
+/// <param name="ppMethod">Returned method interface.</param>
+/// <returns>True if the method was located, otherwise false.</returns>
+/// <remarks>Only public static methods are searched. Method
+/// parameter types are not considered; if there are multiple
+/// matching methods with different parameters, an error results.</remarks>
+bool GetMethod(MSIHANDLE hSession, _AppDomain* pAppDomain,
+        const wchar_t* szAssembly, const wchar_t* szClass,
+        const wchar_t* szMethod, _MethodInfo** ppMethod)
+{
+        HRESULT hr;
+        _Assembly* pAssembly = NULL;
+        BSTR bstrAssemblyName = SysAllocString(szAssembly);
+        if (bstrAssemblyName == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                hr = pAppDomain->Load_2(bstrAssemblyName, &pAssembly);
+                SysFreeString(bstrAssemblyName);
+        }
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to load assembly %s. Error code 0x%X", szAssembly, hr);
+                return false;
+        }
+
+        _Type* pType = NULL;
+        BSTR bstrClass = SysAllocString(szClass);
+        if (bstrClass == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                hr = pAssembly->GetType_2(bstrClass, &pType);
+                SysFreeString(bstrClass);
+        }
+        pAssembly->Release();
+        if (FAILED(hr) || pType == NULL)
+        {
+                Log(hSession, L"Failed to load class %s. Error code 0x%X", szClass, hr);
+                return false;
+        }
+
+        BSTR bstrMethod = SysAllocString(szMethod);
+        if (bstrMethod == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                hr = pType->GetMethod_2(bstrMethod,
+                        (BindingFlags) (BindingFlags_Public | BindingFlags_Static), ppMethod);
+                SysFreeString(bstrMethod);
+        }
+        pType->Release();
+        if (FAILED(hr) || *ppMethod == NULL)
+        {
+                Log(hSession, L"Failed to get method %s. Error code 0x%X", szMethod, hr);
+                return false;
+        }
+        return true;
+}
diff --git a/src/dtf/SfxCA/EmbeddedUI.cpp b/src/dtf/SfxCA/EmbeddedUI.cpp
new file mode 100644
index 00000000..a49cdeec
--- /dev/null
+++ b/src/dtf/SfxCA/EmbeddedUI.cpp
@@ -0,0 +1,281 @@
+// 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 "SfxUtil.h"
+
+// Globals for keeping track of things across UI messages.
+static const wchar_t* g_szWorkingDir;
+static ICorRuntimeHost* g_pClrHost;
+static _AppDomain* g_pAppDomain;
+static _MethodInfo* g_pProcessMessageMethod;
+static _MethodInfo* g_pShutdownMethod;
+
+// Reserve extra space for strings to be replaced at build time.
+#define NULLSPACE \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+
+// Prototypes for local functions.
+// See the function definitions for comments.
+
+bool InvokeInitializeMethod(_MethodInfo* pInitMethod, MSIHANDLE hSession,
+        const wchar_t* szClassName, LPDWORD pdwInternalUILevel, UINT* puiResult);
+
+/// <summary>
+/// First entry-point for the UI DLL when loaded and called by MSI.
+/// Extracts the payload, hosts the CLR, and invokes the managed
+/// initialize method.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used for logging errors and to be passed on to the managed initialize method.</param>
+/// <param name="szResourcePath">Path the directory where resources from the MsiEmbeddedUI table
+/// have been extracted, and where additional payload from this package will be extracted.</param>
+/// <param name="pdwInternalUILevel">MSI install UI level passed to and returned from
+/// the managed initialize method.</param>
+extern "C"
+UINT __stdcall InitializeEmbeddedUI(MSIHANDLE hSession, LPCWSTR szResourcePath, LPDWORD pdwInternalUILevel)
+{
+        // If the managed initialize method cannot be called, continue the installation in BASIC UI mode.
+        UINT uiResult = INSTALLUILEVEL_BASIC;
+
+        const wchar_t* szClassName = L"InitializeEmbeddedUI_FullClassName" NULLSPACE;
+
+        g_szWorkingDir = szResourcePath;
+
+        wchar_t szModule[MAX_PATH];
+        DWORD cchCopied = GetModuleFileName(g_hModule, szModule, MAX_PATH - 1);
+        if (cchCopied == 0)
+        {
+                Log(hSession, L"Failed to get module path. Error code %d.", GetLastError());
+                return uiResult;
+        }
+        else if (cchCopied == MAX_PATH - 1)
+        {
+                Log(hSession, L"Failed to get module path -- path is too long.");
+                return uiResult;
+        }
+
+        Log(hSession, L"Extracting embedded UI to temporary directory: %s", g_szWorkingDir);
+        int err = ExtractCabinet(szModule, g_szWorkingDir);
+        if (err != 0)
+        {
+                Log(hSession, L"Failed to extract to temporary directory. Cabinet error code %d.", err);
+                Log(hSession, L"Ensure that no MsiEmbeddedUI.FileName values are the same as "
+                                          L"any file contained in the embedded UI package.");
+                return uiResult;
+        }
+
+        wchar_t szConfigFilePath[MAX_PATH + 20];
+        StringCchCopy(szConfigFilePath, MAX_PATH + 20, g_szWorkingDir);
+        StringCchCat(szConfigFilePath, MAX_PATH + 20, L"\\EmbeddedUI.config");
+
+        const wchar_t* szConfigFile = szConfigFilePath;
+        if (!PathFileExists(szConfigFilePath))
+        {
+                szConfigFile = NULL;
+        }
+
+        wchar_t szWIAssembly[MAX_PATH + 50];
+        StringCchCopy(szWIAssembly, MAX_PATH + 50, g_szWorkingDir);
+        StringCchCat(szWIAssembly, MAX_PATH + 50, L"\\WixToolset.Dtf.WindowsInstaller.dll");
+
+        if (LoadCLR(hSession, NULL, szConfigFile, szWIAssembly, &g_pClrHost))
+        {
+                if (CreateAppDomain(hSession, g_pClrHost, L"EmbeddedUI", g_szWorkingDir,
+                        szConfigFile, &g_pAppDomain))
+                {
+                        const wchar_t* szMsiAssemblyName  = L"WixToolset.Dtf.WindowsInstaller";
+                        const wchar_t* szProxyClass = L"WixToolset.Dtf.WindowsInstaller.EmbeddedUIProxy";
+                        const wchar_t* szInitMethod = L"Initialize";
+                        const wchar_t* szProcessMessageMethod = L"ProcessMessage";
+                        const wchar_t* szShutdownMethod = L"Shutdown";
+        
+                        if (GetMethod(hSession, g_pAppDomain, szMsiAssemblyName,
+                                          szProxyClass, szProcessMessageMethod, &g_pProcessMessageMethod) &&
+                                GetMethod(hSession, g_pAppDomain, szMsiAssemblyName,
+                                          szProxyClass, szShutdownMethod, &g_pShutdownMethod))
+                        {
+                                _MethodInfo* pInitMethod;
+                                if (GetMethod(hSession, g_pAppDomain, szMsiAssemblyName,
+                                                          szProxyClass, szInitMethod, &pInitMethod))
+                                {
+                                        bool invokeSuccess = InvokeInitializeMethod(pInitMethod, hSession, szClassName, pdwInternalUILevel, &uiResult);
+                                        pInitMethod->Release();
+                                        if (invokeSuccess)
+                                        {
+                                                if (uiResult == 0)
+                                                {
+                                                        return ERROR_SUCCESS;
+                                                }
+                                                else if (uiResult == ERROR_INSTALL_USEREXIT)
+                                                {
+                                                        // InitializeEmbeddedUI is not allowed to return ERROR_INSTALL_USEREXIT.
+                                                        // So return success here and then IDCANCEL on the next progress message.
+                                                        uiResult = 0;
+                                                        *pdwInternalUILevel = INSTALLUILEVEL_NONE;
+                                                        Log(hSession, L"Initialization canceled by user.");
+                                                }
+                                        }
+                                }
+                        }
+
+                        g_pProcessMessageMethod->Release();
+                        g_pProcessMessageMethod = NULL;
+                        g_pShutdownMethod->Release();
+                        g_pShutdownMethod = NULL;
+
+                        g_pClrHost->UnloadDomain(g_pAppDomain);
+                        g_pAppDomain->Release();
+                        g_pAppDomain = NULL;
+                }
+                g_pClrHost->Stop();
+                g_pClrHost->Release();
+                g_pClrHost = NULL;
+        }
+
+        return uiResult;
+}
+
+/// <summary>
+/// Entry-point for UI progress messages received from the MSI engine during an active installation.
+/// Forwards the progress messages to the managed handler method and returns its result.
+/// </summary>
+extern "C"
+INT __stdcall EmbeddedUIHandler(UINT uiMessageType, MSIHANDLE hRecord)
+{
+        if (g_pProcessMessageMethod == NULL)
+        {
+                // Initialization was canceled. 
+                return IDCANCEL;
+        }
+
+        VARIANT vResult;
+        VariantInit(&vResult);
+
+        VARIANT vNull;
+        vNull.vt = VT_EMPTY;
+
+        SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 2);
+        VARIANT vMessageType;
+        vMessageType.vt = VT_I4;
+        vMessageType.lVal = (LONG) uiMessageType;
+        LONG index = 0;
+        HRESULT hr = SafeArrayPutElement(saArgs, &index, &vMessageType);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vRecord;
+        vRecord.vt = VT_I4;
+        vRecord.lVal = (LONG) hRecord;
+        index = 1;
+        hr = SafeArrayPutElement(saArgs, &index, &vRecord);
+        if (FAILED(hr)) goto LExit;
+        
+        hr = g_pProcessMessageMethod->Invoke_3(vNull, saArgs, &vResult);
+
+LExit:
+        SafeArrayDestroy(saArgs);
+        if (SUCCEEDED(hr))
+        {
+                return vResult.intVal;
+        }
+        else
+        {
+                return -1;
+        }
+}
+
+/// <summary>
+/// Entry-point for the UI shutdown message received from the MSI engine after installation has completed.
+/// Forwards the shutdown message to the managed shutdown method, then shuts down the CLR.
+/// </summary>
+extern "C"
+DWORD __stdcall ShutdownEmbeddedUI()
+{
+        if (g_pShutdownMethod != NULL)
+        {
+                VARIANT vNull;
+                vNull.vt = VT_EMPTY;
+                SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 0);
+                g_pShutdownMethod->Invoke_3(vNull, saArgs, NULL);
+                SafeArrayDestroy(saArgs);
+
+                g_pClrHost->UnloadDomain(g_pAppDomain);
+                g_pAppDomain->Release();
+                g_pClrHost->Stop();
+                g_pClrHost->Release();
+        }
+
+        return 0;
+}
+
+/// <summary>
+/// Loads and invokes the managed portion of the proxy.
+/// </summary>
+/// <param name="pInitMethod">Managed initialize method to be invoked.</param>
+/// <param name="hSession">Handle to the installer session,
+/// used for logging errors and to be passed on to the managed initialize method.</param>
+/// <param name="szClassName">Name of the UI class to be loaded.
+/// This must be of the form: AssemblyName!Namespace.Class</param>
+/// <param name="pdwInternalUILevel">MSI install UI level passed to and returned from
+/// the managed initialize method.</param>
+/// <param name="puiResult">Return value of the invoked initialize method.</param>
+/// <returns>True if the managed proxy was invoked successfully, or an
+/// error code if there was some error. Note the initialize method itself may
+/// return an error via puiResult while this method still returns true
+/// since the invocation was successful.</returns>
+bool InvokeInitializeMethod(_MethodInfo* pInitMethod, MSIHANDLE hSession, const wchar_t* szClassName, LPDWORD pdwInternalUILevel, UINT* puiResult)
+{
+        VARIANT vResult;
+        VariantInit(&vResult);
+
+        VARIANT vNull;
+        vNull.vt = VT_EMPTY;
+
+        SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 3);
+        VARIANT vSessionHandle;
+        vSessionHandle.vt = VT_I4;
+        vSessionHandle.lVal = (LONG) hSession;
+        LONG index = 0;
+        HRESULT hr = SafeArrayPutElement(saArgs, &index, &vSessionHandle);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vEntryPoint;
+        vEntryPoint.vt = VT_BSTR;
+        vEntryPoint.bstrVal = SysAllocString(szClassName);
+        if (vEntryPoint.bstrVal == NULL)
+        {
+                hr = E_OUTOFMEMORY;
+                goto LExit;
+        }
+        index = 1;
+        hr = SafeArrayPutElement(saArgs, &index, &vEntryPoint);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vUILevel;
+        vUILevel.vt = VT_I4;
+        vUILevel.ulVal = *pdwInternalUILevel;
+        index = 2;
+        hr = SafeArrayPutElement(saArgs, &index, &vUILevel);
+        if (FAILED(hr)) goto LExit;
+        
+        hr = pInitMethod->Invoke_3(vNull, saArgs, &vResult);
+        
+LExit:
+        SafeArrayDestroy(saArgs);
+        if (SUCCEEDED(hr))
+        {
+                *puiResult = (UINT) vResult.lVal;
+                if ((*puiResult & 0xFFFF) == 0)
+                {
+                        // Due to interop limitations, the successful resulting UILevel is returned
+                        // as the high-word of the return value instead of via a ref parameter.
+                        *pdwInternalUILevel = *puiResult >> 16;
+                        *puiResult = 0;
+                }
+                return true;
+        }
+        else
+        {
+                Log(hSession, L"Failed to invoke EmbeddedUI Initialize method. Error code 0x%X", hr);
+                return false;
+        }
+}
diff --git a/src/dtf/SfxCA/EntryPoints.def b/src/dtf/SfxCA/EntryPoints.def
new file mode 100644
index 00000000..dd28b920
--- /dev/null
+++ b/src/dtf/SfxCA/EntryPoints.def
@@ -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.
+
+
+LIBRARY "SfxCA"
+
+EXPORTS
+
+CustomActionEntryPoint000________________________________________________=CustomActionEntryPoint000
+CustomActionEntryPoint001________________________________________________=CustomActionEntryPoint001
+CustomActionEntryPoint002________________________________________________=CustomActionEntryPoint002
+CustomActionEntryPoint003________________________________________________=CustomActionEntryPoint003
+CustomActionEntryPoint004________________________________________________=CustomActionEntryPoint004
+CustomActionEntryPoint005________________________________________________=CustomActionEntryPoint005
+CustomActionEntryPoint006________________________________________________=CustomActionEntryPoint006
+CustomActionEntryPoint007________________________________________________=CustomActionEntryPoint007
+CustomActionEntryPoint008________________________________________________=CustomActionEntryPoint008
+CustomActionEntryPoint009________________________________________________=CustomActionEntryPoint009
+CustomActionEntryPoint010________________________________________________=CustomActionEntryPoint010
+CustomActionEntryPoint011________________________________________________=CustomActionEntryPoint011
+CustomActionEntryPoint012________________________________________________=CustomActionEntryPoint012
+CustomActionEntryPoint013________________________________________________=CustomActionEntryPoint013
+CustomActionEntryPoint014________________________________________________=CustomActionEntryPoint014
+CustomActionEntryPoint015________________________________________________=CustomActionEntryPoint015
+CustomActionEntryPoint016________________________________________________=CustomActionEntryPoint016
+CustomActionEntryPoint017________________________________________________=CustomActionEntryPoint017
+CustomActionEntryPoint018________________________________________________=CustomActionEntryPoint018
+CustomActionEntryPoint019________________________________________________=CustomActionEntryPoint019
+CustomActionEntryPoint020________________________________________________=CustomActionEntryPoint020
+CustomActionEntryPoint021________________________________________________=CustomActionEntryPoint021
+CustomActionEntryPoint022________________________________________________=CustomActionEntryPoint022
+CustomActionEntryPoint023________________________________________________=CustomActionEntryPoint023
+CustomActionEntryPoint024________________________________________________=CustomActionEntryPoint024
+CustomActionEntryPoint025________________________________________________=CustomActionEntryPoint025
+CustomActionEntryPoint026________________________________________________=CustomActionEntryPoint026
+CustomActionEntryPoint027________________________________________________=CustomActionEntryPoint027
+CustomActionEntryPoint028________________________________________________=CustomActionEntryPoint028
+CustomActionEntryPoint029________________________________________________=CustomActionEntryPoint029
+CustomActionEntryPoint030________________________________________________=CustomActionEntryPoint030
+CustomActionEntryPoint031________________________________________________=CustomActionEntryPoint031
+CustomActionEntryPoint032________________________________________________=CustomActionEntryPoint032
+CustomActionEntryPoint033________________________________________________=CustomActionEntryPoint033
+CustomActionEntryPoint034________________________________________________=CustomActionEntryPoint034
+CustomActionEntryPoint035________________________________________________=CustomActionEntryPoint035
+CustomActionEntryPoint036________________________________________________=CustomActionEntryPoint036
+CustomActionEntryPoint037________________________________________________=CustomActionEntryPoint037
+CustomActionEntryPoint038________________________________________________=CustomActionEntryPoint038
+CustomActionEntryPoint039________________________________________________=CustomActionEntryPoint039
+CustomActionEntryPoint040________________________________________________=CustomActionEntryPoint040
+CustomActionEntryPoint041________________________________________________=CustomActionEntryPoint041
+CustomActionEntryPoint042________________________________________________=CustomActionEntryPoint042
+CustomActionEntryPoint043________________________________________________=CustomActionEntryPoint043
+CustomActionEntryPoint044________________________________________________=CustomActionEntryPoint044
+CustomActionEntryPoint045________________________________________________=CustomActionEntryPoint045
+CustomActionEntryPoint046________________________________________________=CustomActionEntryPoint046
+CustomActionEntryPoint047________________________________________________=CustomActionEntryPoint047
+CustomActionEntryPoint048________________________________________________=CustomActionEntryPoint048
+CustomActionEntryPoint049________________________________________________=CustomActionEntryPoint049
+CustomActionEntryPoint050________________________________________________=CustomActionEntryPoint050
+CustomActionEntryPoint051________________________________________________=CustomActionEntryPoint051
+CustomActionEntryPoint052________________________________________________=CustomActionEntryPoint052
+CustomActionEntryPoint053________________________________________________=CustomActionEntryPoint053
+CustomActionEntryPoint054________________________________________________=CustomActionEntryPoint054
+CustomActionEntryPoint055________________________________________________=CustomActionEntryPoint055
+CustomActionEntryPoint056________________________________________________=CustomActionEntryPoint056
+CustomActionEntryPoint057________________________________________________=CustomActionEntryPoint057
+CustomActionEntryPoint058________________________________________________=CustomActionEntryPoint058
+CustomActionEntryPoint059________________________________________________=CustomActionEntryPoint059
+CustomActionEntryPoint060________________________________________________=CustomActionEntryPoint060
+CustomActionEntryPoint061________________________________________________=CustomActionEntryPoint061
+CustomActionEntryPoint062________________________________________________=CustomActionEntryPoint062
+CustomActionEntryPoint063________________________________________________=CustomActionEntryPoint063
+CustomActionEntryPoint064________________________________________________=CustomActionEntryPoint064
+CustomActionEntryPoint065________________________________________________=CustomActionEntryPoint065
+CustomActionEntryPoint066________________________________________________=CustomActionEntryPoint066
+CustomActionEntryPoint067________________________________________________=CustomActionEntryPoint067
+CustomActionEntryPoint068________________________________________________=CustomActionEntryPoint068
+CustomActionEntryPoint069________________________________________________=CustomActionEntryPoint069
+CustomActionEntryPoint070________________________________________________=CustomActionEntryPoint070
+CustomActionEntryPoint071________________________________________________=CustomActionEntryPoint071
+CustomActionEntryPoint072________________________________________________=CustomActionEntryPoint072
+CustomActionEntryPoint073________________________________________________=CustomActionEntryPoint073
+CustomActionEntryPoint074________________________________________________=CustomActionEntryPoint074
+CustomActionEntryPoint075________________________________________________=CustomActionEntryPoint075
+CustomActionEntryPoint076________________________________________________=CustomActionEntryPoint076
+CustomActionEntryPoint077________________________________________________=CustomActionEntryPoint077
+CustomActionEntryPoint078________________________________________________=CustomActionEntryPoint078
+CustomActionEntryPoint079________________________________________________=CustomActionEntryPoint079
+CustomActionEntryPoint080________________________________________________=CustomActionEntryPoint080
+CustomActionEntryPoint081________________________________________________=CustomActionEntryPoint081
+CustomActionEntryPoint082________________________________________________=CustomActionEntryPoint082
+CustomActionEntryPoint083________________________________________________=CustomActionEntryPoint083
+CustomActionEntryPoint084________________________________________________=CustomActionEntryPoint084
+CustomActionEntryPoint085________________________________________________=CustomActionEntryPoint085
+CustomActionEntryPoint086________________________________________________=CustomActionEntryPoint086
+CustomActionEntryPoint087________________________________________________=CustomActionEntryPoint087
+CustomActionEntryPoint088________________________________________________=CustomActionEntryPoint088
+CustomActionEntryPoint089________________________________________________=CustomActionEntryPoint089
+CustomActionEntryPoint090________________________________________________=CustomActionEntryPoint090
+CustomActionEntryPoint091________________________________________________=CustomActionEntryPoint091
+CustomActionEntryPoint092________________________________________________=CustomActionEntryPoint092
+CustomActionEntryPoint093________________________________________________=CustomActionEntryPoint093
+CustomActionEntryPoint094________________________________________________=CustomActionEntryPoint094
+CustomActionEntryPoint095________________________________________________=CustomActionEntryPoint095
+CustomActionEntryPoint096________________________________________________=CustomActionEntryPoint096
+CustomActionEntryPoint097________________________________________________=CustomActionEntryPoint097
+CustomActionEntryPoint098________________________________________________=CustomActionEntryPoint098
+CustomActionEntryPoint099________________________________________________=CustomActionEntryPoint099
+CustomActionEntryPoint100________________________________________________=CustomActionEntryPoint100
+CustomActionEntryPoint101________________________________________________=CustomActionEntryPoint101
+CustomActionEntryPoint102________________________________________________=CustomActionEntryPoint102
+CustomActionEntryPoint103________________________________________________=CustomActionEntryPoint103
+CustomActionEntryPoint104________________________________________________=CustomActionEntryPoint104
+CustomActionEntryPoint105________________________________________________=CustomActionEntryPoint105
+CustomActionEntryPoint106________________________________________________=CustomActionEntryPoint106
+CustomActionEntryPoint107________________________________________________=CustomActionEntryPoint107
+CustomActionEntryPoint108________________________________________________=CustomActionEntryPoint108
+CustomActionEntryPoint109________________________________________________=CustomActionEntryPoint109
+CustomActionEntryPoint110________________________________________________=CustomActionEntryPoint110
+CustomActionEntryPoint111________________________________________________=CustomActionEntryPoint111
+CustomActionEntryPoint112________________________________________________=CustomActionEntryPoint112
+CustomActionEntryPoint113________________________________________________=CustomActionEntryPoint113
+CustomActionEntryPoint114________________________________________________=CustomActionEntryPoint114
+CustomActionEntryPoint115________________________________________________=CustomActionEntryPoint115
+CustomActionEntryPoint116________________________________________________=CustomActionEntryPoint116
+CustomActionEntryPoint117________________________________________________=CustomActionEntryPoint117
+CustomActionEntryPoint118________________________________________________=CustomActionEntryPoint118
+CustomActionEntryPoint119________________________________________________=CustomActionEntryPoint119
+CustomActionEntryPoint120________________________________________________=CustomActionEntryPoint120
+CustomActionEntryPoint121________________________________________________=CustomActionEntryPoint121
+CustomActionEntryPoint122________________________________________________=CustomActionEntryPoint122
+CustomActionEntryPoint123________________________________________________=CustomActionEntryPoint123
+CustomActionEntryPoint124________________________________________________=CustomActionEntryPoint124
+CustomActionEntryPoint125________________________________________________=CustomActionEntryPoint125
+CustomActionEntryPoint126________________________________________________=CustomActionEntryPoint126
+CustomActionEntryPoint127________________________________________________=CustomActionEntryPoint127
+
+zzzzInvokeManagedCustomActionOutOfProcW=InvokeManagedCustomActionOutOfProc
+zzzInitializeEmbeddedUI=InitializeEmbeddedUI
+zzzEmbeddedUIHandler=EmbeddedUIHandler
+zzzShutdownEmbeddedUI=ShutdownEmbeddedUI
diff --git a/src/dtf/SfxCA/EntryPoints.h b/src/dtf/SfxCA/EntryPoints.h
new file mode 100644
index 00000000..bd2fa970
--- /dev/null
+++ b/src/dtf/SfxCA/EntryPoints.h
@@ -0,0 +1,162 @@
+// 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.
+
+int InvokeCustomAction(MSIHANDLE hSession,
+        const wchar_t* szWorkingDir, const wchar_t* szEntryPoint);
+
+/// <summary>
+/// Macro for defining and exporting a custom action entrypoint.
+/// </summary>
+/// <param name="name">Name of the entrypoint as exported from
+/// the DLL.</param>
+/// <param name="method">Path to the managed custom action method,
+/// in the form: "AssemblyName!Namespace.Class.Method"</param>
+/// <remarks>
+/// To prevent the exported name from being decorated, add
+/// /EXPORT:name to the linker options for every entrypoint.
+/// </remarks>
+#define CUSTOMACTION_ENTRYPOINT(name,method) extern "C" int __stdcall \
+        name(MSIHANDLE hSession) { return InvokeCustomAction(hSession, NULL, method); }
+
+// TEMPLATE ENTRYPOINTS
+// To be edited by the MakeSfxCA tool.
+
+#define NULLSPACE \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+
+#define TEMPLATE_CA_ENTRYPOINT(id,sid) CUSTOMACTION_ENTRYPOINT( \
+        CustomActionEntryPoint##id##, \
+        L"CustomActionEntryPoint" sid NULLSPACE)
+
+TEMPLATE_CA_ENTRYPOINT(000,L"000");
+TEMPLATE_CA_ENTRYPOINT(001,L"001");
+TEMPLATE_CA_ENTRYPOINT(002,L"002");
+TEMPLATE_CA_ENTRYPOINT(003,L"003");
+TEMPLATE_CA_ENTRYPOINT(004,L"004");
+TEMPLATE_CA_ENTRYPOINT(005,L"005");
+TEMPLATE_CA_ENTRYPOINT(006,L"006");
+TEMPLATE_CA_ENTRYPOINT(007,L"007");
+TEMPLATE_CA_ENTRYPOINT(008,L"008");
+TEMPLATE_CA_ENTRYPOINT(009,L"009");
+TEMPLATE_CA_ENTRYPOINT(010,L"010");
+TEMPLATE_CA_ENTRYPOINT(011,L"011");
+TEMPLATE_CA_ENTRYPOINT(012,L"012");
+TEMPLATE_CA_ENTRYPOINT(013,L"013");
+TEMPLATE_CA_ENTRYPOINT(014,L"014");
+TEMPLATE_CA_ENTRYPOINT(015,L"015");
+TEMPLATE_CA_ENTRYPOINT(016,L"016");
+TEMPLATE_CA_ENTRYPOINT(017,L"017");
+TEMPLATE_CA_ENTRYPOINT(018,L"018");
+TEMPLATE_CA_ENTRYPOINT(019,L"019");
+TEMPLATE_CA_ENTRYPOINT(020,L"020");
+TEMPLATE_CA_ENTRYPOINT(021,L"021");
+TEMPLATE_CA_ENTRYPOINT(022,L"022");
+TEMPLATE_CA_ENTRYPOINT(023,L"023");
+TEMPLATE_CA_ENTRYPOINT(024,L"024");
+TEMPLATE_CA_ENTRYPOINT(025,L"025");
+TEMPLATE_CA_ENTRYPOINT(026,L"026");
+TEMPLATE_CA_ENTRYPOINT(027,L"027");
+TEMPLATE_CA_ENTRYPOINT(028,L"028");
+TEMPLATE_CA_ENTRYPOINT(029,L"029");
+TEMPLATE_CA_ENTRYPOINT(030,L"030");
+TEMPLATE_CA_ENTRYPOINT(031,L"031");
+TEMPLATE_CA_ENTRYPOINT(032,L"032");
+TEMPLATE_CA_ENTRYPOINT(033,L"033");
+TEMPLATE_CA_ENTRYPOINT(034,L"034");
+TEMPLATE_CA_ENTRYPOINT(035,L"035");
+TEMPLATE_CA_ENTRYPOINT(036,L"036");
+TEMPLATE_CA_ENTRYPOINT(037,L"037");
+TEMPLATE_CA_ENTRYPOINT(038,L"038");
+TEMPLATE_CA_ENTRYPOINT(039,L"039");
+TEMPLATE_CA_ENTRYPOINT(040,L"040");
+TEMPLATE_CA_ENTRYPOINT(041,L"041");
+TEMPLATE_CA_ENTRYPOINT(042,L"042");
+TEMPLATE_CA_ENTRYPOINT(043,L"043");
+TEMPLATE_CA_ENTRYPOINT(044,L"044");
+TEMPLATE_CA_ENTRYPOINT(045,L"045");
+TEMPLATE_CA_ENTRYPOINT(046,L"046");
+TEMPLATE_CA_ENTRYPOINT(047,L"047");
+TEMPLATE_CA_ENTRYPOINT(048,L"048");
+TEMPLATE_CA_ENTRYPOINT(049,L"049");
+TEMPLATE_CA_ENTRYPOINT(050,L"050");
+TEMPLATE_CA_ENTRYPOINT(051,L"051");
+TEMPLATE_CA_ENTRYPOINT(052,L"052");
+TEMPLATE_CA_ENTRYPOINT(053,L"053");
+TEMPLATE_CA_ENTRYPOINT(054,L"054");
+TEMPLATE_CA_ENTRYPOINT(055,L"055");
+TEMPLATE_CA_ENTRYPOINT(056,L"056");
+TEMPLATE_CA_ENTRYPOINT(057,L"057");
+TEMPLATE_CA_ENTRYPOINT(058,L"058");
+TEMPLATE_CA_ENTRYPOINT(059,L"059");
+TEMPLATE_CA_ENTRYPOINT(060,L"060");
+TEMPLATE_CA_ENTRYPOINT(061,L"061");
+TEMPLATE_CA_ENTRYPOINT(062,L"062");
+TEMPLATE_CA_ENTRYPOINT(063,L"063");
+TEMPLATE_CA_ENTRYPOINT(064,L"064");
+TEMPLATE_CA_ENTRYPOINT(065,L"065");
+TEMPLATE_CA_ENTRYPOINT(066,L"066");
+TEMPLATE_CA_ENTRYPOINT(067,L"067");
+TEMPLATE_CA_ENTRYPOINT(068,L"068");
+TEMPLATE_CA_ENTRYPOINT(069,L"069");
+TEMPLATE_CA_ENTRYPOINT(070,L"070");
+TEMPLATE_CA_ENTRYPOINT(071,L"071");
+TEMPLATE_CA_ENTRYPOINT(072,L"072");
+TEMPLATE_CA_ENTRYPOINT(073,L"073");
+TEMPLATE_CA_ENTRYPOINT(074,L"074");
+TEMPLATE_CA_ENTRYPOINT(075,L"075");
+TEMPLATE_CA_ENTRYPOINT(076,L"076");
+TEMPLATE_CA_ENTRYPOINT(077,L"077");
+TEMPLATE_CA_ENTRYPOINT(078,L"078");
+TEMPLATE_CA_ENTRYPOINT(079,L"079");
+TEMPLATE_CA_ENTRYPOINT(080,L"080");
+TEMPLATE_CA_ENTRYPOINT(081,L"081");
+TEMPLATE_CA_ENTRYPOINT(082,L"082");
+TEMPLATE_CA_ENTRYPOINT(083,L"083");
+TEMPLATE_CA_ENTRYPOINT(084,L"084");
+TEMPLATE_CA_ENTRYPOINT(085,L"085");
+TEMPLATE_CA_ENTRYPOINT(086,L"086");
+TEMPLATE_CA_ENTRYPOINT(087,L"087");
+TEMPLATE_CA_ENTRYPOINT(088,L"088");
+TEMPLATE_CA_ENTRYPOINT(089,L"089");
+TEMPLATE_CA_ENTRYPOINT(090,L"090");
+TEMPLATE_CA_ENTRYPOINT(091,L"091");
+TEMPLATE_CA_ENTRYPOINT(092,L"092");
+TEMPLATE_CA_ENTRYPOINT(093,L"093");
+TEMPLATE_CA_ENTRYPOINT(094,L"094");
+TEMPLATE_CA_ENTRYPOINT(095,L"095");
+TEMPLATE_CA_ENTRYPOINT(096,L"096");
+TEMPLATE_CA_ENTRYPOINT(097,L"097");
+TEMPLATE_CA_ENTRYPOINT(098,L"098");
+TEMPLATE_CA_ENTRYPOINT(099,L"099");
+TEMPLATE_CA_ENTRYPOINT(100,L"100");
+TEMPLATE_CA_ENTRYPOINT(101,L"101");
+TEMPLATE_CA_ENTRYPOINT(102,L"102");
+TEMPLATE_CA_ENTRYPOINT(103,L"103");
+TEMPLATE_CA_ENTRYPOINT(104,L"104");
+TEMPLATE_CA_ENTRYPOINT(105,L"105");
+TEMPLATE_CA_ENTRYPOINT(106,L"106");
+TEMPLATE_CA_ENTRYPOINT(107,L"107");
+TEMPLATE_CA_ENTRYPOINT(108,L"108");
+TEMPLATE_CA_ENTRYPOINT(109,L"109");
+TEMPLATE_CA_ENTRYPOINT(110,L"110");
+TEMPLATE_CA_ENTRYPOINT(111,L"111");
+TEMPLATE_CA_ENTRYPOINT(112,L"112");
+TEMPLATE_CA_ENTRYPOINT(113,L"113");
+TEMPLATE_CA_ENTRYPOINT(114,L"114");
+TEMPLATE_CA_ENTRYPOINT(115,L"115");
+TEMPLATE_CA_ENTRYPOINT(116,L"116");
+TEMPLATE_CA_ENTRYPOINT(117,L"117");
+TEMPLATE_CA_ENTRYPOINT(118,L"118");
+TEMPLATE_CA_ENTRYPOINT(119,L"119");
+TEMPLATE_CA_ENTRYPOINT(120,L"120");
+TEMPLATE_CA_ENTRYPOINT(121,L"121");
+TEMPLATE_CA_ENTRYPOINT(122,L"122");
+TEMPLATE_CA_ENTRYPOINT(123,L"123");
+TEMPLATE_CA_ENTRYPOINT(124,L"124");
+TEMPLATE_CA_ENTRYPOINT(125,L"125");
+TEMPLATE_CA_ENTRYPOINT(126,L"126");
+TEMPLATE_CA_ENTRYPOINT(127,L"127");
+
+// Note: Keep in sync with EntryPoints.def
diff --git a/src/dtf/SfxCA/Extract.cpp b/src/dtf/SfxCA/Extract.cpp
new file mode 100644
index 00000000..171cf52f
--- /dev/null
+++ b/src/dtf/SfxCA/Extract.cpp
@@ -0,0 +1,282 @@
+// 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"
+
+//---------------------------------------------------------------------
+// CABINET EXTRACTION
+//---------------------------------------------------------------------
+
+// Globals make this code unsuited for multhreaded use,
+// but FDI doesn't provide any other way to pass context.
+
+// Handle to the FDI (cab extraction) engine. Need access to this in a callback.
+static HFDI g_hfdi;
+
+// FDI is not unicode-aware, so avoid passing these paths through the callbacks.
+static const wchar_t* g_szExtractDir;
+static const wchar_t* g_szCabFile;
+
+// Offset into the source file where the cabinet really starts.
+// Used to trick FDI into extracting from a concatenated cabinet.
+static int g_lCabOffset;
+
+// Use the secure CRT version of _wsopen if available.
+#ifdef __GOT_SECURE_LIB__
+#define _wsopen__s(hf,file,oflag,shflag,pmode) _wsopen_s(&hf,file,oflag,shflag,pmode)
+#else
+#define _wsopen__s(hf,file,oflag,shflag,pmode) hf = _wsopen(file,oflag,shflag,pmode)
+#endif
+
+/// <summary>
+/// FDI callback to open a cabinet file.
+/// </summary>
+/// <param name="pszFile">Name of the file to be opened. This parameter
+/// is ignored since with our limited use this method is only ever called
+/// to open the main cabinet file.</param>
+/// <param name="oflag">Type of operations allowed.</param>
+/// <param name="pmode">Permission setting.</param>
+/// <returns>Integer file handle, or -1 if the file could not be opened.</returns>
+/// <remarks>
+/// To support reading from a cabinet that is concatenated onto
+/// another file, this function first searches for the offset of the cabinet,
+/// then saves that offset for use in recalculating later seeks.
+/// </remarks>
+static FNOPEN(CabOpen)
+{
+        UNREFERENCED_PARAMETER(pszFile);
+        int hf;
+        _wsopen__s(hf, g_szCabFile, oflag, _SH_DENYWR, pmode);
+        if (hf != -1)
+        {
+                FDICABINETINFO cabInfo;
+                int length = _lseek(hf, 0, SEEK_END);
+                for(int offset = 0; offset < length; offset += 256)
+                {
+                        if (_lseek(hf, offset, SEEK_SET) != offset) break;
+                        if (FDIIsCabinet(g_hfdi, hf, &cabInfo))
+                        {
+                                g_lCabOffset = offset;
+                                _lseek(hf, offset, SEEK_SET);
+                                return hf;
+                        }
+                }
+                _close(hf);
+        }
+        return -1;
+}
+
+/// <summary>
+/// FDI callback to seek within a file.
+/// </summary>
+/// <param name="hf">File handle.</param>
+/// <param name="dist">Seek distance</param>
+/// <param name="seektype">Whether to seek relative to the
+/// beginning, current position, or end of the file.</param>
+/// <returns>Resultant position within the cabinet.</returns>
+/// <remarks>
+/// To support reading from a cabinet that is concatenated onto
+/// another file, this function recalculates seeks based on the
+/// offset that was determined when the cabinet was opened.
+/// </remarks>
+static FNSEEK(CabSeek)
+{
+        if (seektype == SEEK_SET) dist += g_lCabOffset;
+        int pos = _lseek((int) hf, dist, seektype);
+        pos -= g_lCabOffset;
+        return pos;
+}
+
+/// <summary>
+/// Ensures a directory and its parent directory path exists.
+/// </summary>
+/// <param name="szDirPath">Directory path, not including file name.</param>
+/// <returns>0 if the directory exists or was successfully created, else nonzero.</returns>
+/// <remarks>
+/// This function modifies characters in szDirPath, but always restores them
+/// regardless of error condition.
+/// </remarks>
+static int EnsureDirectoryExists(__inout_z wchar_t* szDirPath)
+{
+        int ret = 0;
+        if (!::CreateDirectoryW(szDirPath, NULL))
+        {
+                UINT err = ::GetLastError();
+                if (err != ERROR_ALREADY_EXISTS)
+                {
+                        // Directory creation failed for some reason other than already existing.
+                        // Try to create the parent directory first.
+                        wchar_t* szLastSlash = NULL;
+                        for (wchar_t* sz = szDirPath; *sz; sz++)
+                        {
+                                if (*sz == L'\\')
+                                {
+                                        szLastSlash = sz;
+                                }
+                        }
+                        if (szLastSlash)
+                        {
+                                // Temporarily take one directory off the path and recurse.
+                                *szLastSlash = L'\0';
+                                ret = EnsureDirectoryExists(szDirPath);
+                                *szLastSlash = L'\\';
+
+                                // Try to create the directory if all parents are created.
+                                if (ret == 0 && !::CreateDirectoryW(szDirPath, NULL))
+                                {
+                                        err = ::GetLastError();
+                                        if (err != ERROR_ALREADY_EXISTS)
+                                        {
+                                                ret = -1;
+                                        }
+                                }
+                        }
+                        else
+                        {
+                                ret = -1;
+                        }
+                }
+        }
+        return ret;
+}
+
+/// <summary>
+/// Ensures a file's directory and its parent directory path exists.
+/// </summary>
+/// <param name="szDirPath">Path including file name.</param>
+/// <returns>0 if the file's directory exists or was successfully created, else nonzero.</returns>
+/// <remarks>
+/// This function modifies characters in szFilePath, but always restores them
+/// regardless of error condition.
+/// </remarks>
+static int EnsureFileDirectoryExists(__inout_z wchar_t* szFilePath)
+{
+        int ret = 0;
+        wchar_t* szLastSlash = NULL;
+        for (wchar_t* sz = szFilePath; *sz; sz++)
+        {
+                if (*sz == L'\\')
+                {
+                        szLastSlash = sz;
+                }
+        }
+        if (szLastSlash)
+        {
+                *szLastSlash = L'\0';
+                ret = EnsureDirectoryExists(szFilePath);
+                *szLastSlash = L'\\';
+        }
+        return ret;
+}
+
+/// <summary>
+/// FDI callback for handling files in the cabinet.
+/// </summary>
+/// <param name="fdint">Type of notification.</param>
+/// <param name="pfdin">Structure containing data about the notification.</param>
+/// <remarks>
+/// Refer to fdi.h for more comments on this notification callback.
+/// </remarks>
+static FNFDINOTIFY(CabNotification)
+{
+        // fdintCOPY_FILE:
+        //     Called for each file that *starts* in the current cabinet, giving
+        //     the client the opportunity to request that the file be copied or
+        //     skipped.
+        //   Entry:
+        //     pfdin->psz1    = file name in cabinet
+        //     pfdin->cb      = uncompressed size of file
+        //     pfdin->date    = file date
+        //     pfdin->time    = file time
+        //     pfdin->attribs = file attributes
+        //     pfdin->iFolder = file's folder index
+        //   Exit-Success:
+        //     Return non-zero file handle for destination file; FDI writes
+        //     data to this file use the PFNWRITE function supplied to FDICreate,
+        //     and then calls fdintCLOSE_FILE_INFO to close the file and set
+        //     the date, time, and attributes.
+        //   Exit-Failure:
+        //     Returns 0  => Skip file, do not copy
+        //     Returns -1 => Abort FDICopy() call
+        if (fdint == fdintCOPY_FILE)
+        {
+                size_t cchFile = MultiByteToWideChar(CP_UTF8, 0, pfdin->psz1, -1, NULL, 0);
+                size_t cchFilePath = wcslen(g_szExtractDir) + 1 + cchFile;
+                wchar_t* szFilePath = (wchar_t*) _alloca((cchFilePath + 1) * sizeof(wchar_t));
+                if (szFilePath == NULL) return -1;
+                StringCchCopyW(szFilePath, cchFilePath + 1, g_szExtractDir);
+                StringCchCatW(szFilePath, cchFilePath + 1, L"\\");
+                MultiByteToWideChar(CP_UTF8, 0, pfdin->psz1, -1,
+                        szFilePath + cchFilePath - cchFile, (int) cchFile + 1);
+                int hf = -1;
+                if (EnsureFileDirectoryExists(szFilePath) == 0)
+                {
+                        _wsopen__s(hf, szFilePath,
+                                _O_BINARY | _O_CREAT | _O_WRONLY | _O_SEQUENTIAL,
+                                _SH_DENYWR, _S_IREAD | _S_IWRITE);
+                }
+                return hf;
+        }
+
+        // fdintCLOSE_FILE_INFO:
+        //     Called after all of the data has been written to a target file.
+        //     This function must close the file and set the file date, time,
+        //     and attributes.
+        //   Entry:
+        //     pfdin->psz1    = file name in cabinet
+        //     pfdin->hf      = file handle
+        //     pfdin->date    = file date
+        //     pfdin->time    = file time
+        //     pfdin->attribs = file attributes
+        //     pfdin->iFolder = file's folder index
+        //     pfdin->cb      = Run After Extract (0 - don't run, 1 Run)
+        //   Exit-Success:
+        //     Returns TRUE
+        //   Exit-Failure:
+        //     Returns FALSE, or -1 to abort
+        else if (fdint == fdintCLOSE_FILE_INFO)
+        {
+                _close((int) pfdin->hf);
+                return TRUE;
+        }
+        return 0;
+}
+
+/// <summary>
+/// Extracts all contents of a cabinet file to a directory.
+/// </summary>
+/// <param name="szCabFile">Path to the cabinet file to be extracted.
+/// The cabinet may actually start at some offset within the file,
+/// as long as that offset is a multiple of 256.</param>
+/// <param name="szExtractDir">Directory where files are to be extracted.
+/// This directory must already exist, but should be empty.</param>
+/// <returns>0 if the cabinet was extracted successfully,
+/// or an error code if any error occurred.</returns>
+/// <remarks>
+/// The extraction will not overwrite any files in the destination
+/// directory; extraction will be interrupted and fail if any files
+/// with the same name already exist.
+/// </remarks>
+int ExtractCabinet(const wchar_t* szCabFile, const wchar_t* szExtractDir)
+{
+        ERF erf;
+        // Most of the FDI callbacks can be handled by existing CRT I/O functions.
+        // For our functionality we only need to handle the open and seek callbacks.
+        HFDI hfdi = FDICreate((PFNALLOC) malloc, (PFNFREE) free, CabOpen,
+                (PFNREAD) _read, (PFNWRITE) _write, (PFNCLOSE) _close,
+                CabSeek, cpu80386, &erf);
+        if (hfdi != NULL)
+        {
+                g_hfdi = hfdi;
+                g_szCabFile = szCabFile;
+                g_szExtractDir = szExtractDir;
+                char szEmpty[1] = {0};
+                if (FDICopy(hfdi, szEmpty, szEmpty, 0, CabNotification, NULL, NULL))
+                {
+                        FDIDestroy(hfdi);
+                        return 0;
+                }
+                FDIDestroy(hfdi);
+        }
+
+        return erf.erfOper;
+}
diff --git a/src/dtf/SfxCA/RemoteMsi.cpp b/src/dtf/SfxCA/RemoteMsi.cpp
new file mode 100644
index 00000000..ba59fdf7
--- /dev/null
+++ b/src/dtf/SfxCA/RemoteMsi.cpp
@@ -0,0 +1,629 @@
+// 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 "RemoteMsiSession.h"
+
+
+//
+// Ensures that the request buffer is large enough to hold a request,
+// reallocating the buffer if necessary.
+// It will also reduce the buffer size if the previous allocation was very large.
+//
+static __success(return == 0) UINT EnsureBufSize(__deref_out_ecount(*pcchBuf) wchar_t** pszBuf, __deref_inout DWORD* pcchBuf, DWORD cchRequired)
+{
+    // It will also reduce the buffer size if the previous allocation was very large.
+    if (*pcchBuf < cchRequired || (LARGE_BUFFER_THRESHOLD/2 < *pcchBuf && cchRequired < *pcchBuf))
+    {
+        if (*pszBuf != NULL)
+        {
+            SecureZeroMemory(*pszBuf, *pcchBuf);
+            delete[] *pszBuf;
+        }
+
+        *pcchBuf = max(MIN_BUFFER_STRING_SIZE, cchRequired);
+        *pszBuf = new wchar_t[*pcchBuf];
+
+        if (*pszBuf == NULL)
+        {
+            return ERROR_OUTOFMEMORY;
+        }
+    }
+
+    return ERROR_SUCCESS;
+}
+
+typedef int (WINAPI *PMsiFunc_I_I)(int in1, __out int* out1);
+typedef int (WINAPI *PMsiFunc_II_I)(int in1, int in2, __out int* out1);
+typedef int (WINAPI *PMsiFunc_IS_I)(int in1, __in_z wchar_t* in2, __out int* out1);
+typedef int (WINAPI *PMsiFunc_ISI_I)(int in1, __in_z wchar_t* in2, int in3, __out int* out1);
+typedef int (WINAPI *PMsiFunc_ISII_I)(int in1, __in_z wchar_t* in2, int in3, int in4, __out int* out1);
+typedef int (WINAPI *PMsiFunc_IS_II)(int in1, __in_z wchar_t* in2, __out int* out1, __out int* out2);
+typedef MSIDBERROR (WINAPI *PMsiEFunc_I_S)(int in1, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_I_S)(int in1, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_II_S)(int in1, int in2, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_IS_S)(int in1, __in_z wchar_t* in2, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_ISII_SII)(int in1, __in_z wchar_t* in2, int in3, int in4, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1, __out int* out2, __out int* out3);
+
+UINT MsiFunc_I_I(PMsiFunc_I_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+
+UINT MsiFunc_II_I(PMsiFunc_II_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    int in2 = pReq->fields[1].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+
+UINT MsiFunc_IS_I(PMsiFunc_IS_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+
+UINT MsiFunc_ISI_I(PMsiFunc_ISI_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int in3 = pReq->fields[2].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, in3, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+
+UINT MsiFunc_ISII_I(PMsiFunc_ISII_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int in3 = pReq->fields[2].iValue;
+    int in4 = pReq->fields[3].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, in3, in4, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+
+UINT MsiFunc_IS_II(PMsiFunc_IS_II func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int out1, out2;
+    UINT ret = (UINT) func(in1, in2, &out1, &out2);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+        pResp->fields[2].vt = VT_I4;
+        pResp->fields[2].iValue = out2;
+    }
+    return ret;
+}
+
+UINT MsiFunc_I_S(PMsiFunc_I_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    UINT ret = (UINT) func(in1, szBuf, &cchValue);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, szBuf, &cchValue);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+
+MSIDBERROR MsiEFunc_I_S(PMsiEFunc_I_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    MSIDBERROR ret = func(in1, szBuf, &cchValue);
+    if (ret == MSIDBERROR_MOREDATA)
+    {
+        if (0 == EnsureBufSize(&szBuf, &cchBuf, ++cchValue))
+        {
+            ret = func(in1, szBuf, &cchValue);
+        }
+    }
+    if (ret != MSIDBERROR_MOREDATA)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+
+UINT MsiFunc_II_S(PMsiFunc_II_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    int in2 = pReq->fields[1].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    UINT ret = (UINT) func(in1, in2, szBuf, &cchValue);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, in2, szBuf, &cchValue);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+
+UINT MsiFunc_IS_S(PMsiFunc_IS_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    UINT ret = (UINT) func(in1, in2, szBuf, &cchValue);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, in2, szBuf, &cchValue);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+
+UINT MsiFunc_ISII_SII(PMsiFunc_ISII_SII func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int in3 = pReq->fields[2].iValue;
+    int in4 = pReq->fields[3].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    int out2, out3;
+    UINT ret = (UINT) func(in1, in2, in3, in4, szBuf, &cchValue, &out2, &out3);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, in2, in3, in4, szBuf, &cchValue, &out2, &out3);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+        pResp->fields[2].vt = VT_I4;
+        pResp->fields[2].iValue = out2;
+        pResp->fields[3].vt = VT_I4;
+        pResp->fields[3].iValue = out3;
+    }
+    return ret;
+}
+
+void RemoteMsiSession::ProcessRequest(RequestId id, const RequestData* pReq, RequestData* pResp)
+{
+    SecureZeroMemory(pResp, sizeof(RequestData));
+
+    UINT ret = EnsureBufSize(&m_pBufSend, &m_cbBufSend, 1024);
+
+    if (0 == ret)
+    {
+        switch (id)
+        {
+            case RemoteMsiSession::EndSession:
+            {
+                this->ExitCode = pReq->fields[0].iValue;
+            }
+            break;
+            case RemoteMsiSession::MsiCloseHandle:
+            {
+                MSIHANDLE h = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiCloseHandle(h);
+            }
+            break;
+            case RemoteMsiSession::MsiProcessMessage:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                INSTALLMESSAGE eMessageType = (INSTALLMESSAGE) pReq->fields[1].iValue;
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[2].iValue;
+                ret = ::MsiProcessMessage(hInstall, eMessageType, hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiGetProperty:
+            {
+                ret = MsiFunc_IS_S((PMsiFunc_IS_S) ::MsiGetProperty, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiSetProperty:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szName = pReq->fields[1].szValue;
+                const wchar_t* szValue = pReq->fields[2].szValue;
+                ret = ::MsiSetProperty(hInstall, szName, szValue);
+            }
+            break;
+            case RemoteMsiSession::MsiCreateRecord:
+            {
+                UINT cParams = pReq->fields[0].uiValue;
+                ret = ::MsiCreateRecord(cParams);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordGetFieldCount:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiRecordGetFieldCount(hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordGetInteger:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                ret = ::MsiRecordGetInteger(hRecord, iField);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordSetInteger:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                int iValue = pReq->fields[2].iValue;
+                ret = ::MsiRecordSetInteger(hRecord, iField, iValue);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordGetString:
+            {
+                ret = MsiFunc_II_S((PMsiFunc_II_S) ::MsiRecordGetString, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordSetString:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                const wchar_t* szValue = pReq->fields[2].szValue;
+                ret = ::MsiRecordSetString(hRecord, iField, szValue);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordClearData:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiRecordClearData(hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordIsNull:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                ret = ::MsiRecordIsNull(hRecord, iField);
+            }
+            break;
+            case RemoteMsiSession::MsiFormatRecord:
+            {
+                ret = MsiFunc_II_S((PMsiFunc_II_S) ::MsiFormatRecord, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiGetActiveDatabase:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = (UINT) ::MsiGetActiveDatabase(hInstall);
+            }
+            break;
+            case RemoteMsiSession::MsiDatabaseOpenView:
+            {
+                ret = MsiFunc_IS_I((PMsiFunc_IS_I) ::MsiDatabaseOpenView, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiViewExecute:
+            {
+                MSIHANDLE hView = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[1].iValue;
+                ret = ::MsiViewExecute(hView, hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiViewFetch:
+            {
+                ret = MsiFunc_I_I((PMsiFunc_I_I) ::MsiViewFetch, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiViewModify:
+            {
+                MSIHANDLE hView = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIMODIFY eModifyMode = (MSIMODIFY) pReq->fields[1].iValue;
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[2].iValue;
+                ret = ::MsiViewModify(hView, eModifyMode, hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiViewGetError:
+            {
+                ret = MsiEFunc_I_S((PMsiEFunc_I_S) ::MsiViewGetError, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiViewGetColumnInfo:
+            {
+                ret = MsiFunc_II_I((PMsiFunc_II_I) ::MsiViewGetColumnInfo, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiDatabaseGetPrimaryKeys:
+            {
+                ret = MsiFunc_IS_I((PMsiFunc_IS_I) ::MsiDatabaseGetPrimaryKeys, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiDatabaseIsTablePersistent:
+            {
+                MSIHANDLE hDb = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szTable = pReq->fields[1].szValue;
+                ret = ::MsiDatabaseIsTablePersistent(hDb, szTable);
+            }
+            break;
+            case RemoteMsiSession::MsiDoAction:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szAction = pReq->fields[1].szValue;
+                ret = ::MsiDoAction(hInstall, szAction);
+            }
+            break;
+            case RemoteMsiSession::MsiEnumComponentCosts:
+            {
+                ret = MsiFunc_ISII_SII((PMsiFunc_ISII_SII) ::MsiEnumComponentCosts, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiEvaluateCondition:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szCondition = pReq->fields[1].szValue;
+                ret = ::MsiEvaluateCondition(hInstall, szCondition);
+            }
+            break;
+            case RemoteMsiSession::MsiGetComponentState:
+            {
+                ret = MsiFunc_IS_II((PMsiFunc_IS_II) ::MsiGetComponentState, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetFeatureCost:
+            {
+                ret = MsiFunc_ISII_I((PMsiFunc_ISII_I) ::MsiGetFeatureCost, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetFeatureState:
+            {
+                ret = MsiFunc_IS_II((PMsiFunc_IS_II) ::MsiGetFeatureState, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetFeatureValidStates:
+            {
+                ret = MsiFunc_IS_I((PMsiFunc_IS_I) ::MsiGetFeatureValidStates, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetLanguage:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiGetLanguage(hInstall);
+            }
+            break;
+            case RemoteMsiSession::MsiGetLastErrorRecord:
+            {
+                ret = ::MsiGetLastErrorRecord();
+            }
+            break;
+            case RemoteMsiSession::MsiGetMode:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIRUNMODE iRunMode = (MSIRUNMODE) pReq->fields[1].iValue;
+                ret = ::MsiGetMode(hInstall, iRunMode);
+            }
+            break;
+            case RemoteMsiSession::MsiGetSourcePath:
+            {
+                ret = MsiFunc_IS_S((PMsiFunc_IS_S) ::MsiGetSourcePath, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiGetSummaryInformation:
+            {
+                ret = MsiFunc_ISI_I((PMsiFunc_ISI_I) ::MsiGetSummaryInformation, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetTargetPath:
+            {
+                ret = MsiFunc_IS_S((PMsiFunc_IS_S) ::MsiGetTargetPath, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordDataSize:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                ret = ::MsiRecordDataSize(hRecord, iField);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordReadStream:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                DWORD cbRead = (DWORD) pReq->fields[2].uiValue;
+                ret = EnsureBufSize(&m_pBufSend, &m_cbBufSend, (cbRead + 1) / 2);
+                if (ret == 0)
+                {
+                    ret = ::MsiRecordReadStream(hRecord, iField, (char*) m_pBufSend, &cbRead);
+                    if (ret == 0)
+                    {
+                        pResp->fields[1].vt = VT_STREAM;
+                        pResp->fields[1].szValue = m_pBufSend;
+                        pResp->fields[2].vt = VT_I4;
+                        pResp->fields[2].uiValue = (UINT) cbRead;
+                    }
+                }
+            }
+            break;
+            case RemoteMsiSession::MsiRecordSetStream:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                const wchar_t* szFilePath = pReq->fields[2].szValue;
+                ret = ::MsiRecordSetStream(hRecord, iField, szFilePath);
+            }
+            break;
+            case RemoteMsiSession::MsiSequence:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szTable = pReq->fields[1].szValue;
+                UINT iSequenceMode = pReq->fields[2].uiValue;
+                ret = ::MsiSequence(hRecord, szTable, iSequenceMode);
+            }
+            break;
+            case RemoteMsiSession::MsiSetComponentState:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szComponent = pReq->fields[1].szValue;
+                INSTALLSTATE iState = (INSTALLSTATE) pReq->fields[2].iValue;
+                ret = ::MsiSetComponentState(hInstall, szComponent, iState);
+            }
+            break;
+            case RemoteMsiSession::MsiSetFeatureAttributes:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szFeature = pReq->fields[1].szValue;
+                DWORD dwAttrs = (DWORD) pReq->fields[2].uiValue;
+                ret = ::MsiSetFeatureAttributes(hInstall, szFeature, dwAttrs);
+            }
+            break;
+            case RemoteMsiSession::MsiSetFeatureState:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szFeature = pReq->fields[1].szValue;
+                INSTALLSTATE iState = (INSTALLSTATE) pReq->fields[2].iValue;
+                ret = ::MsiSetFeatureState(hInstall, szFeature, iState);
+            }
+            break;
+            case RemoteMsiSession::MsiSetInstallLevel:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                int iInstallLevel = pReq->fields[1].iValue;
+                ret = ::MsiSetInstallLevel(hInstall, iInstallLevel);
+            }
+            break;
+            case RemoteMsiSession::MsiSetMode:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIRUNMODE iRunMode = (MSIRUNMODE) pReq->fields[1].uiValue;
+                BOOL fState = (BOOL) pReq->fields[2].iValue;
+                ret = ::MsiSetMode(hInstall, iRunMode, fState);
+            }
+            break;
+            case RemoteMsiSession::MsiSetTargetPath:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szFolder = pReq->fields[1].szValue;
+                const wchar_t* szFolderPath = pReq->fields[2].szValue;
+                ret = ::MsiSetTargetPath(hInstall, szFolder, szFolderPath);
+            }
+            break;
+            case RemoteMsiSession::MsiSummaryInfoGetProperty:
+            {
+                MSIHANDLE hSummaryInfo = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT uiProperty = pReq->fields[1].uiValue;
+                UINT uiDataType;
+                int iValue;
+                FILETIME ftValue;
+                m_pBufSend[0] = L'\0';
+                DWORD cchValue = m_cbBufSend;
+                ret = ::MsiSummaryInfoGetProperty(hSummaryInfo, uiProperty, &uiDataType, &iValue, &ftValue, m_pBufSend, &cchValue);
+                if (ret == ERROR_MORE_DATA)
+                {
+                    ret = EnsureBufSize(&m_pBufSend, &m_cbBufSend, ++cchValue);
+                    if (ret == 0)
+                    {
+                        ret = ::MsiSummaryInfoGetProperty(hSummaryInfo, uiProperty, &uiDataType, &iValue, &ftValue, m_pBufSend, &cchValue);
+                    }
+                }
+                if (ret == 0)
+                {
+                    pResp->fields[1].vt = VT_UI4;
+                    pResp->fields[1].uiValue = uiDataType;
+
+                    switch (uiDataType)
+                    {
+                    case VT_I2:
+                    case VT_I4:
+                        pResp->fields[2].vt = VT_I4;
+                        pResp->fields[2].iValue = iValue;
+                        break;
+                    case VT_FILETIME:
+                        pResp->fields[2].vt = VT_UI4;
+                        pResp->fields[2].iValue = ftValue.dwHighDateTime;
+                        pResp->fields[3].vt = VT_UI4;
+                        pResp->fields[3].iValue = ftValue.dwLowDateTime;
+                        break;
+                    case VT_LPSTR:
+                        pResp->fields[2].vt = VT_LPWSTR;
+                        pResp->fields[2].szValue = m_pBufSend;
+                        break;
+                    }
+                }
+            }
+            break;
+            case RemoteMsiSession::MsiVerifyDiskSpace:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiVerifyDiskSpace(hInstall);
+            }
+            break;
+            
+            default:
+            {
+                ret = ERROR_INVALID_FUNCTION;
+            }
+            break;
+        }
+    }
+
+    pResp->fields[0].vt = VT_UI4;
+    pResp->fields[0].uiValue = ret;
+}
diff --git a/src/dtf/SfxCA/RemoteMsiSession.h b/src/dtf/SfxCA/RemoteMsiSession.h
new file mode 100644
index 00000000..90c7c01f
--- /dev/null
+++ b/src/dtf/SfxCA/RemoteMsiSession.h
@@ -0,0 +1,898 @@
+// 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.
+
+#define LARGE_BUFFER_THRESHOLD 65536 // bytes
+#define MIN_BUFFER_STRING_SIZE 1024 // wchar_ts
+
+///////////////////////////////////////////////////////////////////////////////////////
+// RemoteMsiSession //
+//////////////////////
+//
+// Allows accessing MSI APIs from another process using named pipes.
+//
+class RemoteMsiSession
+{
+public:
+
+    // This enumeration MUST stay in sync with the
+    // managed equivalent in RemotableNativeMethods.cs!
+    enum RequestId
+    {
+        EndSession = 0,
+        MsiCloseHandle,
+        MsiCreateRecord,
+        MsiDatabaseGetPrimaryKeys,
+        MsiDatabaseIsTablePersistent,
+        MsiDatabaseOpenView,
+        MsiDoAction,
+        MsiEnumComponentCosts,
+        MsiEvaluateCondition,
+        MsiFormatRecord,
+        MsiGetActiveDatabase,
+        MsiGetComponentState,
+        MsiGetFeatureCost,
+        MsiGetFeatureState,
+        MsiGetFeatureValidStates,
+        MsiGetLanguage,
+        MsiGetLastErrorRecord,
+        MsiGetMode,
+        MsiGetProperty,
+        MsiGetSourcePath,
+        MsiGetSummaryInformation,
+        MsiGetTargetPath,
+        MsiProcessMessage,
+        MsiRecordClearData,
+        MsiRecordDataSize,
+        MsiRecordGetFieldCount,
+        MsiRecordGetInteger,
+        MsiRecordGetString,
+        MsiRecordIsNull,
+        MsiRecordReadStream,
+        MsiRecordSetInteger,
+        MsiRecordSetStream,
+        MsiRecordSetString,
+        MsiSequence,
+        MsiSetComponentState,
+        MsiSetFeatureAttributes,
+        MsiSetFeatureState,
+        MsiSetInstallLevel,
+        MsiSetMode,
+        MsiSetProperty,
+        MsiSetTargetPath,
+        MsiSummaryInfoGetProperty,
+        MsiVerifyDiskSpace,
+        MsiViewExecute,
+        MsiViewFetch,
+        MsiViewGetError,
+        MsiViewGetColumnInfo,
+        MsiViewModify,
+    };
+
+    static const int MAX_REQUEST_FIELDS = 4;
+
+    // Used to pass data back and forth for remote API calls,
+    // including in & out params & return values.
+    // Only strings and ints are supported.
+    struct RequestData
+    {
+        struct
+        {
+            VARENUM  vt;
+            union {
+              int    iValue;
+              UINT   uiValue;
+              DWORD  cchValue;
+              LPWSTR szValue;
+              BYTE*  sValue;
+              DWORD  cbValue;
+            };
+        } fields[MAX_REQUEST_FIELDS];
+    };
+
+public:
+
+    // This value is set from the single data parameter in the EndSession request.
+    // It saves the exit code of the out-of-proc custom action.
+    int ExitCode;
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession constructor
+    //
+    // Creates a new remote session instance, for use either by the server
+    // or client process.
+    //
+    // szName  - Identifies the session instance being remoted. The server and
+    //         the client must use the same name. The name should be unique
+    //         enough to avoid conflicting with other instances on the system.
+    //
+    // fServer - True if the calling process is the server process, false if the
+    //         calling process is the client process.
+    //
+    RemoteMsiSession(const wchar_t* szName, bool fServer=true)
+        : m_fServer(fServer),
+          m_szName(szName != NULL && szName[0] != L'\0' ? szName : L"RemoteMsiSession"),
+          m_szPipeName(NULL),
+          m_hPipe(NULL),
+          m_fConnecting(false),
+          m_fConnected(false),
+          m_hReceiveThread(NULL),
+          m_hReceiveStopEvent(NULL),
+          m_pBufReceive(NULL),
+          m_cbBufReceive(0),
+          m_pBufSend(NULL),
+          m_cbBufSend(0),
+          ExitCode(ERROR_INSTALL_FAILURE)
+    {   
+        SecureZeroMemory(&m_overlapped, sizeof(OVERLAPPED));
+        m_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession destructor
+    //
+    // Closes any open handles and frees any allocated memory.
+    //
+    ~RemoteMsiSession()
+    {
+        WaitExitCode();
+        if (m_hPipe != NULL)
+        {
+            CloseHandle(m_hPipe);
+            m_hPipe = NULL;
+        }
+        if (m_overlapped.hEvent != NULL)
+        {
+            CloseHandle(m_overlapped.hEvent);
+            m_overlapped.hEvent = NULL;
+        }
+        if (m_szPipeName != NULL)
+        {
+            delete[] m_szPipeName;
+            m_szPipeName = NULL;
+        }
+        if (m_pBufReceive != NULL)
+        {
+            SecureZeroMemory(m_pBufReceive, m_cbBufReceive);
+            delete[] m_pBufReceive;
+            m_pBufReceive = NULL;
+        }
+        if (m_pBufSend != NULL)
+        {
+            SecureZeroMemory(m_pBufSend, m_cbBufSend);
+            delete[] m_pBufSend;
+            m_pBufSend = NULL;
+        }
+        m_fConnecting = false;
+        m_fConnected = false;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::WaitExitCode()
+    //
+    // Waits for the server processing thread to complete.
+    //
+    void WaitExitCode()
+    {
+        if (m_hReceiveThread != NULL)
+        {
+            SetEvent(m_hReceiveStopEvent);
+            WaitForSingleObject(m_hReceiveThread, INFINITE);
+            CloseHandle(m_hReceiveThread);
+            m_hReceiveThread = NULL;
+        }
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::Connect()
+    //
+    // Connects the inter-process communication channel.
+    // (Currently implemented as a named pipe.)
+    //
+    // This method must be called first by the server process, then by the client
+    // process. The method does not block; the server will asynchronously wait
+    // for the client process to make the connection.
+    //
+    // Returns: 0 on success, Win32 error code on failure.
+    //
+    virtual DWORD Connect()
+    {
+        const wchar_t* szPipePrefix = L"\\\\.\\pipe\\";
+        size_t cchPipeNameBuf = wcslen(szPipePrefix) + wcslen(m_szName) + 1;
+        m_szPipeName = new wchar_t[cchPipeNameBuf];
+
+        if (m_szPipeName == NULL)
+        {
+            return ERROR_OUTOFMEMORY;
+        }
+        else
+        {
+            wcscpy_s(m_szPipeName, cchPipeNameBuf, szPipePrefix);
+            wcscat_s(m_szPipeName, cchPipeNameBuf, m_szName);
+
+            if (m_fServer)
+            {
+                return this->ConnectPipeServer();
+            }
+            else
+            {
+                return this->ConnectPipeClient();
+            }
+        }
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::IsConnected()
+    //
+    // Checks if the server process and client process are currently connected.
+    //
+    virtual bool IsConnected() const
+    {
+        return m_fConnected;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::ProcessRequests()
+    //
+    // For use by the service process. Watches for requests in the input buffer and calls
+    // the callback for each one.
+    //
+    // This method does not block; it spawns a separate thread to do the work.
+    //
+    // Returns: 0 on success, Win32 error code on failure.
+    //
+    virtual DWORD ProcessRequests()
+    {
+        return this->StartProcessingReqests();
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::SendRequest()
+    //
+    // For use by the client process. Sends a request to the server and
+    // synchronously waits on a response, up to the timeout value.
+    //
+    // id         - ID code of the MSI API call being requested.
+    //
+    // pRequest   - Pointer to a data structure containing request parameters.
+    //
+    // ppResponse - [OUT] Pointer to a location that receives the response parameters.
+    //
+    // Returns: 0 on success, Win32 error code on failure.
+    // Returns WAIT_TIMEOUT if no response was received in time.
+    //
+    virtual DWORD SendRequest(RequestId id, const RequestData* pRequest, RequestData** ppResponse)
+    {
+        if (m_fServer)
+        {
+            return ERROR_INVALID_OPERATION;
+        }
+
+        if (!m_fConnected)
+        {
+            *ppResponse = NULL;
+            return 0;
+        }
+
+        DWORD dwRet = this->SendRequest(id, pRequest);
+        if (dwRet != 0)
+        {
+            return dwRet;
+        }
+
+        if (id != EndSession)
+        {
+            static RequestData response;
+            if (ppResponse != NULL)
+            {
+                *ppResponse = &response;
+            }
+
+            return this->ReceiveResponse(id, &response);
+        }
+        else
+        {
+            CloseHandle(m_hPipe);
+            m_hPipe = NULL;
+            m_fConnected = false;
+            return 0;
+        }
+    }
+
+private:
+
+    //
+    // Do not allow assignment.
+    //
+    RemoteMsiSession& operator=(const RemoteMsiSession&);
+
+    //
+    // Called only by the server process.
+    // Create a new thread to handle receiving requests.
+    //
+    DWORD StartProcessingReqests()
+    {
+        if (!m_fServer || m_hReceiveStopEvent != NULL)
+        {
+            return ERROR_INVALID_OPERATION;
+        }
+
+        DWORD dwRet = 0;
+
+        m_hReceiveStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+        if (m_hReceiveStopEvent == NULL)
+        {
+            dwRet = GetLastError();
+        }
+        else
+        {
+            if (m_hReceiveThread != NULL)
+            {
+                CloseHandle(m_hReceiveThread);
+            }
+
+            m_hReceiveThread = CreateThread(NULL, 0,
+                RemoteMsiSession::ProcessRequestsThreadStatic, this, 0, NULL);
+            
+            if (m_hReceiveThread == NULL)
+            {
+                dwRet = GetLastError();
+                CloseHandle(m_hReceiveStopEvent);
+                m_hReceiveStopEvent = NULL;
+            }
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called only by the watcher process.
+    // First verify the connection is complete. Then continually read and parse messages,
+    // invoke the callback, and send the replies.
+    //
+    static DWORD WINAPI ProcessRequestsThreadStatic(void* pv)
+    {
+        return reinterpret_cast<RemoteMsiSession*>(pv)->ProcessRequestsThread();
+    }
+
+    DWORD ProcessRequestsThread()
+    {
+        DWORD dwRet;
+
+        dwRet = CompleteConnection();
+        if (dwRet != 0)
+        {
+            if (dwRet == ERROR_OPERATION_ABORTED) dwRet = 0;
+        }
+
+        while (m_fConnected)
+        {
+            RequestId id;
+            RequestData req;
+            dwRet = ReceiveRequest(&id, &req);
+            if (dwRet != 0)
+            {
+                if (dwRet == ERROR_OPERATION_ABORTED ||
+                    dwRet == ERROR_BROKEN_PIPE || dwRet == ERROR_NO_DATA)
+                {
+                    dwRet = 0;
+                }
+            }
+            else
+            {
+                RequestData resp;
+                ProcessRequest(id, &req, &resp);
+
+                if (id == EndSession)
+                {
+                    break;
+                }
+
+                dwRet = SendResponse(id, &resp);
+                if (dwRet != 0 && dwRet != ERROR_BROKEN_PIPE && dwRet != ERROR_NO_DATA)
+                {
+                    dwRet = 0;
+                }
+            }
+        }
+
+        CloseHandle(m_hReceiveStopEvent);
+        m_hReceiveStopEvent = NULL;
+        return dwRet;
+    }
+
+    //
+    // Called only by the server process's receive thread.
+    // Read one request into a RequestData object.
+    //
+    DWORD ReceiveRequest(RequestId* pId, RequestData* pReq)
+    {
+        DWORD dwRet = this->ReadPipe((BYTE*) pId, sizeof(RequestId));
+
+        if (dwRet == 0)
+        {
+            dwRet = this->ReadRequestData(pReq);
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called by the server process's receive thread or the client's request call
+    // to read the response. Read data from the pipe, allowing interruption by the
+    // stop event if on the server.
+    //
+    DWORD ReadPipe(__out_bcount(cbRead) BYTE* pBuf, DWORD cbRead)
+    {
+        DWORD dwRet = 0;
+        DWORD dwTotalBytesRead = 0;
+
+        while (dwRet == 0 && dwTotalBytesRead < cbRead)
+        {
+            DWORD dwBytesReadThisTime;
+            ResetEvent(m_overlapped.hEvent);
+            if (!ReadFile(m_hPipe, pBuf + dwTotalBytesRead, cbRead - dwTotalBytesRead, &dwBytesReadThisTime, &m_overlapped))
+            {
+                dwRet = GetLastError();
+                if (dwRet == ERROR_IO_PENDING)
+                {
+                    if (m_fServer)
+                    {
+                        HANDLE hWaitHandles[] = { m_overlapped.hEvent, m_hReceiveStopEvent };
+                        dwRet = WaitForMultipleObjects(2, hWaitHandles, FALSE, INFINITE);
+                    }
+                    else
+                    {
+                        dwRet = WaitForSingleObject(m_overlapped.hEvent, INFINITE);
+                    }
+
+                    if (dwRet == WAIT_OBJECT_0)
+                    {
+                        if (!GetOverlappedResult(m_hPipe, &m_overlapped, &dwBytesReadThisTime, FALSE))
+                        {
+                            dwRet = GetLastError();
+                        }
+                    }
+                    else if (dwRet == WAIT_FAILED)
+                    {
+                        dwRet = GetLastError();
+                    }
+                    else
+                    {
+                        dwRet = ERROR_OPERATION_ABORTED;
+                    }
+                }
+            }
+
+            dwTotalBytesRead += dwBytesReadThisTime;
+        }
+
+        if (dwRet != 0)
+        {
+            if (m_fServer)
+            {
+                CancelIo(m_hPipe);
+                DisconnectNamedPipe(m_hPipe);
+            }
+            else
+            {
+                CloseHandle(m_hPipe);
+                m_hPipe = NULL;
+            }
+            m_fConnected = false;
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called only by the server process.
+    // Given a request, invoke the MSI API and return the response.
+    // This is implemented in RemoteMsi.cpp.
+    //
+    void ProcessRequest(RequestId id, const RequestData* pReq, RequestData* pResp);
+
+    //
+    // Called only by the client process.
+    // Send request data over the pipe.
+    //
+    DWORD SendRequest(RequestId id, const RequestData* pRequest)
+    {
+        DWORD dwRet = WriteRequestData(id, pRequest);
+        
+        if (dwRet != 0)
+        {
+            m_fConnected = false;
+            CloseHandle(m_hPipe);
+            m_hPipe = NULL;
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called only by the server process.
+    // Just send a response over the pipe.
+    //
+    DWORD SendResponse(RequestId id, const RequestData* pResp)
+    {
+        DWORD dwRet = WriteRequestData(id, pResp);
+
+        if (dwRet != 0)
+        {
+            DisconnectNamedPipe(m_hPipe);
+            m_fConnected = false;
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called either by the client or server process.
+    // Writes data to the pipe for a request or response.
+    //
+    DWORD WriteRequestData(RequestId id, const RequestData* pReq)
+    {
+        DWORD dwRet = 0;
+
+        RequestData req = *pReq; // Make a copy because the const data can't be changed.
+
+        dwRet = this->WritePipe((const BYTE *)&id, sizeof(RequestId));
+        if (dwRet != 0)
+        {
+            return dwRet;
+        }
+
+        BYTE* sValues[MAX_REQUEST_FIELDS] = {0};
+        for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+        {
+            if (req.fields[i].vt == VT_LPWSTR)
+            {
+                sValues[i] = (BYTE*) req.fields[i].szValue;
+                req.fields[i].cchValue = (DWORD) wcslen(req.fields[i].szValue);
+            }
+            else if (req.fields[i].vt == VT_STREAM)
+            {
+                sValues[i] = req.fields[i].sValue;
+                req.fields[i].cbValue = (DWORD) req.fields[i + 1].uiValue;
+            }
+        }
+
+        dwRet = this->WritePipe((const BYTE *)&req, sizeof(RequestData));
+        if (dwRet != 0)
+        {
+            return dwRet;
+        }
+
+        for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+        {
+            if (sValues[i] != NULL)
+            {
+                DWORD cbValue;
+                if (req.fields[i].vt == VT_LPWSTR)
+                {
+                    cbValue = (req.fields[i].cchValue + 1) * sizeof(WCHAR);
+                }
+                else
+                {
+                    cbValue = req.fields[i].cbValue;
+                }
+
+                dwRet = this->WritePipe(const_cast<BYTE*> (sValues[i]), cbValue);
+                if (dwRet != 0)
+                {
+                    break;
+                }
+            }
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called when writing a request or response. Writes data to
+    // the pipe, allowing interruption by the stop event if on the server.
+    //
+    DWORD WritePipe(const BYTE* pBuf, DWORD cbWrite)
+    {
+        DWORD dwRet = 0;
+        DWORD dwTotalBytesWritten = 0;
+
+        while (dwRet == 0 && dwTotalBytesWritten < cbWrite)
+        {
+            DWORD dwBytesWrittenThisTime;
+            ResetEvent(m_overlapped.hEvent);
+            if (!WriteFile(m_hPipe, pBuf + dwTotalBytesWritten, cbWrite - dwTotalBytesWritten, &dwBytesWrittenThisTime, &m_overlapped))
+            {
+                dwRet = GetLastError();
+                if (dwRet == ERROR_IO_PENDING)
+                {
+                    if (m_fServer)
+                    {
+                        HANDLE hWaitHandles[] = { m_overlapped.hEvent, m_hReceiveStopEvent };
+                        dwRet = WaitForMultipleObjects(2, hWaitHandles, FALSE, INFINITE);
+                    }
+                    else
+                    {
+                        dwRet = WaitForSingleObject(m_overlapped.hEvent, INFINITE);
+                    }
+
+                    if (dwRet == WAIT_OBJECT_0)
+                    {
+                        if (!GetOverlappedResult(m_hPipe, &m_overlapped, &dwBytesWrittenThisTime, FALSE))
+                        {
+                            dwRet = GetLastError();
+                        }
+                    }
+                    else if (dwRet == WAIT_FAILED)
+                    {
+                        dwRet = GetLastError();
+                    }
+                    else
+                    {
+                        dwRet = ERROR_OPERATION_ABORTED;
+                    }
+                }
+            }
+
+            dwTotalBytesWritten += dwBytesWrittenThisTime;
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called either by the client or server process.
+    // Reads data from the pipe for a request or response.
+    //
+    DWORD ReadRequestData(RequestData* pReq)
+    {
+        DWORD dwRet = ReadPipe((BYTE*) pReq, sizeof(RequestData));
+
+        if (dwRet == 0)
+        {
+            DWORD cbData = 0;
+            for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+            {
+                if (pReq->fields[i].vt == VT_LPWSTR)
+                {
+                    cbData += (pReq->fields[i].cchValue + 1) * sizeof(WCHAR);
+                }
+                else if (pReq->fields[i].vt == VT_STREAM)
+                {
+                    cbData += pReq->fields[i].cbValue;
+                }
+            }
+            
+            if (cbData > 0)
+            {
+                if (!CheckRequestDataBuf(cbData))
+                {
+                    return ERROR_OUTOFMEMORY;
+                }
+
+                dwRet = this->ReadPipe((BYTE*) m_pBufReceive, cbData);
+                if (dwRet == 0)
+                {
+                    DWORD dwOffset = 0;
+                    for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+                    {
+                        if (pReq->fields[i].vt == VT_LPWSTR)
+                        {
+                            LPWSTR szTemp = (LPWSTR) (m_pBufReceive + dwOffset);
+                            dwOffset += (pReq->fields[i].cchValue + 1) * sizeof(WCHAR);
+                            pReq->fields[i].szValue = szTemp;
+                        }
+                        else if (pReq->fields[i].vt == VT_STREAM)
+                        {
+                            BYTE* sTemp = m_pBufReceive + dwOffset;
+                            dwOffset += pReq->fields[i].cbValue;
+                            pReq->fields[i].sValue = sTemp;
+                        }
+                    }
+                }
+            }
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called only by the client process.
+    // Wait for a response on the pipe. If no response is received before the timeout,
+    // then give up and close the connection.
+    //
+    DWORD ReceiveResponse(RequestId id, RequestData* pResp)
+    {
+        RequestId responseId;
+        DWORD dwRet = ReadPipe((BYTE*) &responseId, sizeof(RequestId));
+        if (dwRet == 0 && responseId != id)
+        {
+            dwRet = ERROR_OPERATION_ABORTED;
+        }
+
+        if (dwRet == 0)
+        {
+            dwRet = this->ReadRequestData(pResp);
+        }
+
+        return dwRet;
+    }
+
+    //
+    // Called only by the server process's receive thread.
+    // Try to complete and verify an asynchronous connection operation.
+    //
+    DWORD CompleteConnection()
+    {
+        DWORD dwRet = 0;
+        if (m_fConnecting)
+        {
+            HANDLE hWaitHandles[] = { m_overlapped.hEvent, m_hReceiveStopEvent };
+            DWORD dwWaitRes = WaitForMultipleObjects(2, hWaitHandles, FALSE, INFINITE);
+
+            if (dwWaitRes == WAIT_OBJECT_0)
+            {
+                m_fConnecting = false;
+
+                DWORD dwUnused;
+                if (GetOverlappedResult(m_hPipe, &m_overlapped, &dwUnused, FALSE))
+                {
+                    m_fConnected = true;
+                }
+                else
+                {
+                    dwRet = GetLastError();
+                }
+            }
+            else if (dwWaitRes == WAIT_FAILED)
+            {
+                CancelIo(m_hPipe);
+                dwRet = GetLastError();
+            }
+            else
+            {
+                CancelIo(m_hPipe);
+                dwRet = ERROR_OPERATION_ABORTED;
+            }
+        }
+        return dwRet;
+    }
+
+    //
+    // Called only by the server process.
+    // Creates a named pipe instance and begins asynchronously waiting
+    // for a connection from the client process.
+    //
+    DWORD ConnectPipeServer()
+    {
+        DWORD dwRet = 0;
+        const int BUFSIZE = 1024; // Suggested pipe I/O buffer sizes
+        m_hPipe = CreateNamedPipe(
+            m_szPipeName,
+            PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED | FILE_FLAG_FIRST_PIPE_INSTANCE,
+            PIPE_TYPE_BYTE | PIPE_READMODE_BYTE,
+            1, BUFSIZE, BUFSIZE, 0, NULL);
+        if (m_hPipe == INVALID_HANDLE_VALUE)
+        {
+            m_hPipe = NULL;
+            dwRet = GetLastError();
+        }
+        else if (ConnectNamedPipe(m_hPipe, &m_overlapped))
+        {
+            m_fConnected = true;
+        }
+        else
+        {
+            dwRet = GetLastError();
+
+            if (dwRet == ERROR_PIPE_BUSY)
+            {
+                // All pipe instances are busy, so wait for a maximum of 20 seconds 
+                dwRet = 0;
+                if (WaitNamedPipe(m_szPipeName, 20000))
+                {
+                    m_fConnected = true;
+                }
+                else
+                {
+                    dwRet = GetLastError();
+                }
+            }
+            
+            if (dwRet == ERROR_IO_PENDING)
+            {
+                dwRet = 0;
+                m_fConnecting = true;
+            }
+        }
+        return dwRet;
+    }
+
+    //
+    // Called only by the client process.
+    // Attemps to open a connection to an existing named pipe instance
+    // which should have already been created by the server process.
+    //
+    DWORD ConnectPipeClient()
+    {
+        DWORD dwRet = 0;
+        m_hPipe = CreateFile(
+            m_szPipeName, GENERIC_READ | GENERIC_WRITE, 
+            0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
+        if (m_hPipe != INVALID_HANDLE_VALUE)
+        {
+            m_fConnected = true;
+        }
+        else
+        {
+            m_hPipe = NULL;
+            dwRet = GetLastError();
+        }
+        return dwRet;
+    }
+
+    //
+    // Ensures that the request buffer is large enough to hold a request,
+    // reallocating the buffer if necessary.
+    // It will also reduce the buffer size if the previous allocation was very large.
+    //
+    BOOL CheckRequestDataBuf(DWORD cbBuf)
+    {
+        if (m_cbBufReceive < cbBuf || (LARGE_BUFFER_THRESHOLD < m_cbBufReceive && cbBuf < m_cbBufReceive))
+        {
+            if (m_pBufReceive != NULL)
+            {
+                SecureZeroMemory(m_pBufReceive, m_cbBufReceive);
+                delete[] m_pBufReceive;
+            }
+            m_cbBufReceive = max(MIN_BUFFER_STRING_SIZE*2, cbBuf);
+            m_pBufReceive = new BYTE[m_cbBufReceive];
+            if (m_pBufReceive == NULL)
+            {
+                m_cbBufReceive = 0;
+            }
+        }
+        return m_pBufReceive != NULL;
+    }
+
+private:
+
+    // Name of this instance. 
+    const wchar_t* m_szName;
+
+    // "\\.\pipe\name"
+    wchar_t* m_szPipeName;
+    
+    // Handle to the pipe instance.
+    HANDLE m_hPipe;
+
+    // Handle to the thread that receives requests.
+    HANDLE m_hReceiveThread;
+
+    // Handle to the event used to signal the receive thread to exit.
+    HANDLE m_hReceiveStopEvent;
+
+    // All pipe I/O is done in overlapped mode to avoid unintentional blocking.
+    OVERLAPPED m_overlapped;
+    
+    // Dynamically-resized buffer for receiving requests.
+    BYTE* m_pBufReceive;
+
+    // Current size of the receive request buffer.
+    DWORD m_cbBufReceive;
+
+    // Dynamically-resized buffer for sending requests.
+    wchar_t* m_pBufSend;
+
+    // Current size of the send request buffer.
+    DWORD m_cbBufSend;
+
+    // True if this is the server process, false if this is the client process.
+    const bool m_fServer;
+
+    // True if an asynchronous connection operation is currently in progress.
+    bool m_fConnecting;
+
+    // True if the pipe is currently connected.
+    bool m_fConnected;
+};
diff --git a/src/dtf/SfxCA/SfxCA.cpp b/src/dtf/SfxCA/SfxCA.cpp
new file mode 100644
index 00000000..06319f1e
--- /dev/null
+++ b/src/dtf/SfxCA/SfxCA.cpp
@@ -0,0 +1,363 @@
+// 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 "EntryPoints.h"
+#include "SfxUtil.h"
+
+#define MANAGED_CAs_OUT_OF_PROC 1
+
+HMODULE g_hModule;
+bool g_fRunningOutOfProc = false;
+
+RemoteMsiSession* g_pRemote = NULL;
+
+// Prototypes for local functions.
+// See the function definitions for comments.
+
+bool InvokeManagedCustomAction(MSIHANDLE hSession,
+        _AppDomain* pAppDomain, const wchar_t* szEntryPoint, int* piResult);
+
+/// <summary>
+/// Entry-point for the CA DLL when re-launched as a separate process;
+/// connects the comm channel for remote MSI APIs, then invokes the
+/// managed custom action entry-point.
+/// </summary>
+/// <remarks>
+/// Do not change the parameters or calling-convention: RUNDLL32
+/// requires this exact signature.
+/// </remarks>
+extern "C"
+void __stdcall InvokeManagedCustomActionOutOfProc(
+        __in HWND hwnd, __in HINSTANCE hinst, __in_z wchar_t* szCmdLine, int nCmdShow)
+{
+        UNREFERENCED_PARAMETER(hwnd);
+        UNREFERENCED_PARAMETER(hinst);
+        UNREFERENCED_PARAMETER(nCmdShow);
+
+        g_fRunningOutOfProc = true;
+
+        const wchar_t* szSessionName = szCmdLine;
+        MSIHANDLE hSession;
+        const wchar_t* szEntryPoint;
+
+        int i;
+        for (i = 0; szCmdLine[i] && szCmdLine[i] != L' '; i++);
+        if (szCmdLine[i] != L'\0') szCmdLine[i++] = L'\0';
+        hSession = _wtoi(szCmdLine + i);
+
+        for (; szCmdLine[i] && szCmdLine[i] != L' '; i++);
+        if (szCmdLine[i] != L'\0') szCmdLine[i++] = L'\0';
+        szEntryPoint = szCmdLine + i;
+
+        g_pRemote = new RemoteMsiSession(szSessionName, false);
+        g_pRemote->Connect();
+
+        int ret = InvokeCustomAction(hSession, NULL, szEntryPoint);
+
+        RemoteMsiSession::RequestData requestData;
+        SecureZeroMemory(&requestData, sizeof(RemoteMsiSession::RequestData));
+        requestData.fields[0].vt = VT_I4;
+        requestData.fields[0].iValue = ret;
+        g_pRemote->SendRequest(RemoteMsiSession::EndSession, &requestData, NULL);
+        delete g_pRemote;
+}
+
+/// <summary>
+/// Re-launch this CA DLL as a separate process, and setup a comm channel
+/// for remote MSI API calls back to this process.
+/// </summary>
+int InvokeOutOfProcManagedCustomAction(MSIHANDLE hSession, const wchar_t* szEntryPoint)
+{
+        wchar_t szSessionName[100] = {0};
+        swprintf_s(szSessionName, 100, L"SfxCA_%d", ::GetTickCount());
+        
+        RemoteMsiSession remote(szSessionName, true);
+
+        DWORD ret = remote.Connect();
+        if (ret != 0)
+        {
+                Log(hSession, L"Failed to create communication pipe for new CA process. Error code: %d", ret);
+                return ERROR_INSTALL_FAILURE;
+        }
+
+        ret = remote.ProcessRequests();
+        if (ret != 0)
+        {
+                Log(hSession, L"Failed to open communication pipe for new CA process. Error code: %d", ret);
+                return ERROR_INSTALL_FAILURE;
+        }
+
+        wchar_t szModule[MAX_PATH] = {0};
+        GetModuleFileName(g_hModule, szModule, MAX_PATH);
+
+        const wchar_t* rundll32 = L"rundll32.exe";
+        wchar_t szRunDll32Path[MAX_PATH] = {0};
+        GetSystemDirectory(szRunDll32Path, MAX_PATH);
+        wcscat_s(szRunDll32Path, MAX_PATH, L"\\");
+        wcscat_s(szRunDll32Path, MAX_PATH, rundll32);
+
+        const wchar_t* entry = L"zzzzInvokeManagedCustomActionOutOfProc";
+        wchar_t szCommandLine[1024] = {0};
+        swprintf_s(szCommandLine, 1024, L"%s \"%s\",%s %s %d %s",
+                rundll32, szModule, entry, szSessionName, hSession, szEntryPoint);
+
+        STARTUPINFO si;
+        SecureZeroMemory(&si, sizeof(STARTUPINFO));
+        si.cb = sizeof(STARTUPINFO);
+        
+        PROCESS_INFORMATION pi;
+        SecureZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
+
+        if (!CreateProcess(szRunDll32Path, szCommandLine, NULL, NULL, FALSE,
+                0, NULL, NULL, &si, &pi))
+        {
+                DWORD err = GetLastError();
+                Log(hSession, L"Failed to create new CA process via RUNDLL32. Error code: %d", err);
+                return ERROR_INSTALL_FAILURE;
+        }
+
+        DWORD dwWait = WaitForSingleObject(pi.hProcess, INFINITE);
+        if (dwWait != WAIT_OBJECT_0)
+        {
+                DWORD err = GetLastError();
+                Log(hSession, L"Failed to wait for CA process. Error code: %d", err);
+                return ERROR_INSTALL_FAILURE;
+        }
+
+        DWORD dwExitCode;
+        BOOL bRet = GetExitCodeProcess(pi.hProcess, &dwExitCode);
+        if (!bRet)
+        {
+                DWORD err = GetLastError();
+                Log(hSession, L"Failed to get exit code of CA process. Error code: %d", err);
+                return ERROR_INSTALL_FAILURE;
+        }
+        else if (dwExitCode != 0)
+        {
+                Log(hSession, L"RUNDLL32 returned error code: %d", dwExitCode);
+                return ERROR_INSTALL_FAILURE;
+        }
+
+        CloseHandle(pi.hThread);
+        CloseHandle(pi.hProcess);
+
+        remote.WaitExitCode();
+        return remote.ExitCode;
+}
+
+/// <summary>
+/// Entrypoint for the managed CA proxy (RemotableNativeMethods) to
+/// call MSI APIs remotely.
+/// </summary>
+void __stdcall MsiRemoteInvoke(RemoteMsiSession::RequestId id, RemoteMsiSession::RequestData* pRequest, RemoteMsiSession::RequestData** ppResponse)
+{
+        if (g_fRunningOutOfProc)
+        {
+                g_pRemote->SendRequest(id, pRequest, ppResponse);
+        }
+        else
+        {
+                *ppResponse = NULL;
+        }
+}
+
+/// <summary>
+/// Invokes a managed custom action from native code by
+/// extracting the package to a temporary working directory
+/// then hosting the CLR and locating and calling the entrypoint.
+/// </summary>
+/// <param name="hSession">Handle to the installation session.
+/// Passed to custom action entrypoints by the installer engine.</param>
+/// <param name="szWorkingDir">Directory containing the CA binaries
+/// and the CustomAction.config file defining the entrypoints.
+/// This may be NULL, in which case the current module must have
+/// a concatenated cabinet containing those files, which will be
+/// extracted to a temporary directory.</param>
+/// <param name="szEntryPoint">Name of the CA entrypoint to be invoked.
+/// This must be either an explicit &quot;AssemblyName!Namespace.Class.Method&quot;
+/// string, or a simple name that maps to a full entrypoint definition
+/// in CustomAction.config.</param>
+/// <returns>The value returned by the managed custom action method,
+/// or ERROR_INSTALL_FAILURE if the CA could not be invoked.</returns>
+int InvokeCustomAction(MSIHANDLE hSession,
+        const wchar_t* szWorkingDir, const wchar_t* szEntryPoint)
+{
+#ifdef MANAGED_CAs_OUT_OF_PROC
+        if (!g_fRunningOutOfProc && szWorkingDir == NULL)
+        {
+                return InvokeOutOfProcManagedCustomAction(hSession, szEntryPoint);
+        }
+#endif
+
+        wchar_t szTempDir[MAX_PATH];
+        bool fDeleteTemp = false;
+        if (szWorkingDir == NULL)
+        {
+                if (!ExtractToTempDirectory(hSession, g_hModule, szTempDir, MAX_PATH))
+                {
+                        return ERROR_INSTALL_FAILURE;
+                }
+                szWorkingDir = szTempDir;
+                fDeleteTemp = true;
+        }
+
+        wchar_t szConfigFilePath[MAX_PATH + 20];
+        StringCchCopy(szConfigFilePath, MAX_PATH + 20, szWorkingDir);
+        StringCchCat(szConfigFilePath, MAX_PATH + 20, L"\\CustomAction.config");
+
+        const wchar_t* szConfigFile = szConfigFilePath;
+        if (!::PathFileExists(szConfigFilePath))
+        {
+                szConfigFile = NULL;
+        }
+
+        wchar_t szWIAssembly[MAX_PATH + 50];
+        StringCchCopy(szWIAssembly, MAX_PATH + 50, szWorkingDir);
+        StringCchCat(szWIAssembly, MAX_PATH + 50, L"\\WixToolset.Dtf.WindowsInstaller.dll");
+
+        int iResult = ERROR_INSTALL_FAILURE;
+        ICorRuntimeHost* pHost;
+        if (LoadCLR(hSession, NULL, szConfigFile, szWIAssembly, &pHost))
+        {
+                _AppDomain* pAppDomain;
+                if (CreateAppDomain(hSession, pHost, L"CustomAction", szWorkingDir,
+                        szConfigFile, &pAppDomain))
+                {
+                        if (!InvokeManagedCustomAction(hSession, pAppDomain, szEntryPoint, &iResult))
+                        {
+                                iResult = ERROR_INSTALL_FAILURE;
+                        }
+                        HRESULT hr = pHost->UnloadDomain(pAppDomain);
+                        if (FAILED(hr))
+                        {
+                                Log(hSession, L"Failed to unload app domain. Error code 0x%X", hr);
+                        }
+                        pAppDomain->Release();
+                }
+
+                pHost->Stop();
+                pHost->Release();
+        }
+
+        if (fDeleteTemp)
+        {
+                DeleteDirectory(szTempDir);
+        }
+        return iResult;
+}
+
+/// <summary>
+/// Called by the system when the DLL is loaded.
+/// Saves the module handle for later use.
+/// </summary>
+BOOL WINAPI DllMain(HMODULE hModule, DWORD  dwReason, void* pReserved)
+{
+        UNREFERENCED_PARAMETER(pReserved);
+
+        switch (dwReason)
+        {
+                case DLL_PROCESS_ATTACH:
+                        g_hModule = hModule;
+                        break;
+                case DLL_THREAD_ATTACH:
+                case DLL_THREAD_DETACH:
+                case DLL_PROCESS_DETACH:
+                        break;
+        }
+        return TRUE;
+}
+
+/// <summary>
+/// Loads and invokes the managed portion of the proxy.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used for logging errors and to be passed on to the custom action.</param>
+/// <param name="pAppDomain">AppDomain which has its application
+/// base set to the CA working directory.</param>
+/// <param name="szEntryPoint">Name of the CA entrypoint to be invoked.
+/// This must be either an explicit &quot;AssemblyName!Namespace.Class.Method&quot;
+/// string, or a simple name that maps to a full entrypoint definition
+/// in CustomAction.config.</param>
+/// <param name="piResult">Return value of the invoked custom
+/// action method.</param>
+/// <returns>True if the managed proxy was invoked successfully,
+/// false if there was some error. Note the custom action itself may
+/// return an error via piResult while this method still returns true
+/// since the invocation was successful.</returns>
+bool InvokeManagedCustomAction(MSIHANDLE hSession, _AppDomain* pAppDomain,
+        const wchar_t* szEntryPoint, int* piResult)
+{
+        VARIANT vResult;
+        ::VariantInit(&vResult);
+
+        const bool f64bit = (sizeof(void*) == sizeof(LONGLONG));
+        const wchar_t* szMsiAssemblyName   = L"WixToolset.Dtf.WindowsInstaller";
+        const wchar_t* szMsiCAProxyClass   = L"WixToolset.Dtf.WindowsInstaller.CustomActionProxy";
+        const wchar_t* szMsiCAInvokeMethod = (f64bit ? L"InvokeCustomAction64" : L"InvokeCustomAction32");
+        
+        _MethodInfo* pCAInvokeMethod;
+        if (!GetMethod(hSession, pAppDomain, szMsiAssemblyName,
+                szMsiCAProxyClass, szMsiCAInvokeMethod, &pCAInvokeMethod))
+        {
+                return false;
+        }
+
+        HRESULT hr;
+        VARIANT vNull;
+        vNull.vt = VT_EMPTY;
+        SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 3);
+        VARIANT vSessionHandle;
+        vSessionHandle.vt = VT_I4;
+        vSessionHandle.intVal = hSession;
+        LONG index = 0;
+        hr = SafeArrayPutElement(saArgs, &index, &vSessionHandle);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vEntryPoint;
+        vEntryPoint.vt = VT_BSTR;
+        vEntryPoint.bstrVal = SysAllocString(szEntryPoint);
+        if (vEntryPoint.bstrVal == NULL)
+        {
+                hr = E_OUTOFMEMORY;
+                goto LExit;
+        }
+        index = 1;
+        hr = SafeArrayPutElement(saArgs, &index, &vEntryPoint);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vRemotingFunctionPtr;
+#pragma warning(push)
+#pragma warning(disable:4127) // conditional expression is constant
+        if (f64bit)
+#pragma warning(pop)
+        {
+                vRemotingFunctionPtr.vt =  VT_I8;
+                vRemotingFunctionPtr.llVal = (LONGLONG) (g_fRunningOutOfProc ? MsiRemoteInvoke : NULL);
+        }
+        else
+        {
+                vRemotingFunctionPtr.vt =  VT_I4;
+#pragma warning(push)
+#pragma warning(disable:4302) // truncation
+#pragma warning(disable:4311) // pointer truncation
+                vRemotingFunctionPtr.lVal = (LONG) (g_fRunningOutOfProc ? MsiRemoteInvoke : NULL);
+#pragma warning(pop)
+        }
+        index = 2;
+        hr = SafeArrayPutElement(saArgs, &index, &vRemotingFunctionPtr);
+        if (FAILED(hr)) goto LExit;
+        
+        hr = pCAInvokeMethod->Invoke_3(vNull, saArgs, &vResult);
+
+LExit:
+        SafeArrayDestroy(saArgs);
+        pCAInvokeMethod->Release();
+        
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to invoke custom action method. Error code 0x%X", hr);
+                return false;
+        }
+
+        *piResult = vResult.intVal;
+        return true;
+}
+
diff --git a/src/dtf/SfxCA/SfxCA.rc b/src/dtf/SfxCA/SfxCA.rc
new file mode 100644
index 00000000..4d78194b
--- /dev/null
+++ b/src/dtf/SfxCA/SfxCA.rc
@@ -0,0 +1,10 @@
+// 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.
+
+#define VER_DLL
+#define VER_LANG_NEUTRAL
+#define VER_ORIGINAL_FILENAME "SfxCA.dll"
+#define VER_INTERNAL_NAME "SfxCA"
+#define VER_FILE_DESCRIPTION "DTF Self-Extracting Custom Action"
+
+// Additional resources here
+
diff --git a/src/dtf/SfxCA/SfxCA.vcxproj b/src/dtf/SfxCA/SfxCA.vcxproj
new file mode 100644
index 00000000..96aa69e0
--- /dev/null
+++ b/src/dtf/SfxCA/SfxCA.vcxproj
@@ -0,0 +1,79 @@
+<?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="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{55D5BA28-D427-4F53-80C2-FE9EF23C1553}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <SignOutput>false</SignOutput>
+    <ProjectModuleDefinitionFile>EntryPoints.def</ProjectModuleDefinitionFile>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>msi.lib;cabinet.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="ClrHost.cpp" />
+    <ClCompile Include="Extract.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="RemoteMsi.cpp" />
+    <ClCompile Include="SfxCA.cpp" />
+    <ClCompile Include="SfxUtil.cpp" />
+    <ClCompile Include="EmbeddedUI.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="EntryPoints.h" />
+    <ClInclude Include="RemoteMsiSession.h" />
+    <ClInclude Include="SfxUtil.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="EntryPoints.def" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ResourceCompile Include="SfxCA.rc" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/dtf/SfxCA/SfxCA.vcxproj.filters b/src/dtf/SfxCA/SfxCA.vcxproj.filters
new file mode 100644
index 00000000..a5ebf693
--- /dev/null
+++ b/src/dtf/SfxCA/SfxCA.vcxproj.filters
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="ClrHost.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EmbeddedUI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Extract.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RemoteMsi.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SfxCA.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SfxUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="EntryPoints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RemoteMsiSession.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SfxUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{81c92f68-18c2-4cd4-a588-5c3616860dd9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6cdc30ee-e14d-4679-b92e-3e080535e53b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{1666a44e-4f2e-4f13-980e-d0c3dfa7cb6d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SfxCA.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="EntryPoints.def">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/dtf/SfxCA/SfxUtil.cpp b/src/dtf/SfxCA/SfxUtil.cpp
new file mode 100644
index 00000000..1bf2c5b2
--- /dev/null
+++ b/src/dtf/SfxCA/SfxUtil.cpp
@@ -0,0 +1,209 @@
+// 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 "SfxUtil.h"
+
+/// <summary>
+/// Writes a formatted message to the MSI log.
+/// Does out-of-proc MSI calls if necessary.
+/// </summary>
+void Log(MSIHANDLE hSession, const wchar_t* szMessage, ...)
+{
+        const int LOG_BUFSIZE = 4096;
+        wchar_t szBuf[LOG_BUFSIZE];
+        va_list args;
+        va_start(args, szMessage);
+        StringCchVPrintf(szBuf, LOG_BUFSIZE, szMessage, args);
+
+        if (!g_fRunningOutOfProc || NULL == g_pRemote)
+        {
+                MSIHANDLE hRec = MsiCreateRecord(1);
+                MsiRecordSetString(hRec, 0, L"SFXCA: [1]");
+                MsiRecordSetString(hRec, 1, szBuf);
+                MsiProcessMessage(hSession, INSTALLMESSAGE_INFO, hRec);
+                MsiCloseHandle(hRec);
+        }
+        else
+        {
+                // Logging is the only remote-MSI operation done from unmanaged code.
+                // It's not very convenient here because part of the infrastructure
+                // for remote MSI APIs is on the managed side.
+
+                RemoteMsiSession::RequestData req;
+                RemoteMsiSession::RequestData* pResp = NULL;
+                SecureZeroMemory(&req, sizeof(RemoteMsiSession::RequestData));
+
+                req.fields[0].vt = VT_UI4;
+                req.fields[0].uiValue = 1;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiCreateRecord, &req, &pResp);
+                MSIHANDLE hRec = (MSIHANDLE) pResp->fields[0].iValue;
+
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hRec;
+                req.fields[1].vt = VT_UI4;
+                req.fields[1].uiValue = 0;
+                req.fields[2].vt = VT_LPWSTR;
+                req.fields[2].szValue = L"SFXCA: [1]";
+                g_pRemote->SendRequest(RemoteMsiSession::MsiRecordSetString, &req, &pResp);
+
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hRec;
+                req.fields[1].vt = VT_UI4;
+                req.fields[1].uiValue = 1;
+                req.fields[2].vt = VT_LPWSTR;
+                req.fields[2].szValue = szBuf;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiRecordSetString, &req, &pResp);
+
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hSession;
+                req.fields[1].vt = VT_I4;
+                req.fields[1].iValue = (int) INSTALLMESSAGE_INFO;
+                req.fields[2].vt = VT_I4;
+                req.fields[2].iValue = (int) hRec;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiProcessMessage, &req, &pResp);
+
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hRec;
+                req.fields[1].vt = VT_EMPTY;
+                req.fields[2].vt = VT_EMPTY;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiCloseHandle, &req, &pResp);
+        }
+}
+
+/// <summary>
+/// Deletes a directory, including all files and subdirectories.
+/// </summary>
+/// <param name="szDir">Path to the directory to delete,
+/// not including a trailing backslash.</param>
+/// <returns>True if the directory was successfully deleted, or false
+/// if the deletion failed (most likely because some files were locked).
+/// </returns>
+bool DeleteDirectory(const wchar_t* szDir)
+{
+        size_t cchDir = wcslen(szDir);
+        size_t cchPathBuf = cchDir + 3 + MAX_PATH;
+        wchar_t* szPath = (wchar_t*) _alloca(cchPathBuf * sizeof(wchar_t));
+        if (szPath == NULL) return false;
+        StringCchCopy(szPath, cchPathBuf, szDir);
+        StringCchCat(szPath, cchPathBuf, L"\\*");
+        WIN32_FIND_DATA fd;
+        HANDLE hSearch = FindFirstFile(szPath, &fd);
+        while (hSearch != INVALID_HANDLE_VALUE)
+        {
+                StringCchCopy(szPath + cchDir + 1, cchPathBuf - (cchDir + 1), fd.cFileName);
+                if ((fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)
+                {
+                        if (wcscmp(fd.cFileName, L".") != 0 && wcscmp(fd.cFileName, L"..") != 0)
+                        {
+                                DeleteDirectory(szPath);
+                        }
+                }
+                else
+                {
+                        DeleteFile(szPath);
+                }
+                if (!FindNextFile(hSearch, &fd))
+                {
+                        FindClose(hSearch);
+                        hSearch = INVALID_HANDLE_VALUE;
+                }
+        }
+        return RemoveDirectory(szDir) != 0;
+}
+
+bool DirectoryExists(const wchar_t* szDir)
+{
+        if (szDir != NULL)
+        {
+                DWORD dwAttrs = GetFileAttributes(szDir);
+                if (dwAttrs != -1 && (dwAttrs & FILE_ATTRIBUTE_DIRECTORY) != 0)
+                {
+                        return true;
+                }
+        }
+        return false;
+}
+
+/// <summary>
+/// Extracts a cabinet that is concatenated to a module
+/// to a new temporary directory.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging.</param>
+/// <param name="hModule">Module that has the concatenated cabinet.</param>
+/// <param name="szTempDir">Buffer for returning the path of the
+/// created temp directory.</param>
+/// <param name="cchTempDirBuf">Size in characters of the buffer.
+/// <returns>True if the files were extracted, or false if the
+/// buffer was too small or the directory could not be created
+/// or the extraction failed for some other reason.</returns>
+__success(return != false)
+bool ExtractToTempDirectory(__in MSIHANDLE hSession, __in HMODULE hModule,
+        __out_ecount_z(cchTempDirBuf) wchar_t* szTempDir, DWORD cchTempDirBuf)
+{
+        wchar_t szModule[MAX_PATH];
+        DWORD cchCopied = GetModuleFileName(hModule, szModule, MAX_PATH - 1);
+        if (cchCopied == 0)
+        {
+                Log(hSession, L"Failed to get module path. Error code %d.", GetLastError());
+                return false;
+        }
+        else if (cchCopied == MAX_PATH - 1)
+        {
+                Log(hSession, L"Failed to get module path -- path is too long.");
+                return false;
+        }
+
+        if (szTempDir == NULL || cchTempDirBuf < wcslen(szModule) + 1)
+        {
+                Log(hSession, L"Temp directory buffer is NULL or too small.");
+                return false;
+        }
+        StringCchCopy(szTempDir, cchTempDirBuf, szModule);
+        StringCchCat(szTempDir, cchTempDirBuf, L"-");
+
+        DWORD cchTempDir = (DWORD) wcslen(szTempDir);
+        for (int i = 0; DirectoryExists(szTempDir); i++)
+        {
+                swprintf_s(szTempDir + cchTempDir, cchTempDirBuf - cchTempDir, L"%d", i);
+        }
+
+        if (!CreateDirectory(szTempDir, NULL))
+        {
+                cchCopied = GetTempPath(cchTempDirBuf, szTempDir);
+                if (cchCopied == 0 || cchCopied >= cchTempDirBuf)
+                {
+                        Log(hSession, L"Failed to get temp directory. Error code %d", GetLastError());
+                        return false;
+                }
+
+                wchar_t* szModuleName = wcsrchr(szModule, L'\\');
+                if (szModuleName == NULL) szModuleName = szModule;
+                else szModuleName = szModuleName + 1;
+                StringCchCat(szTempDir, cchTempDirBuf, szModuleName);
+                StringCchCat(szTempDir, cchTempDirBuf, L"-");
+
+                cchTempDir = (DWORD) wcslen(szTempDir);
+                for (int i = 0; DirectoryExists(szTempDir); i++)
+                {
+                        swprintf_s(szTempDir + cchTempDir, cchTempDirBuf - cchTempDir, L"%d", i);
+                }
+
+                if (!CreateDirectory(szTempDir, NULL))
+                {
+                        Log(hSession, L"Failed to create temp directory. Error code %d", GetLastError());
+                        return false;
+                }
+        }
+
+        Log(hSession, L"Extracting custom action to temporary directory: %s\\", szTempDir);
+        int err = ExtractCabinet(szModule, szTempDir);
+        if (err != 0)
+        {
+                Log(hSession, L"Failed to extract to temporary directory. Cabinet error code %d.", err);
+                DeleteDirectory(szTempDir);
+                return false;
+        }
+        return true;
+}
+
diff --git a/src/dtf/SfxCA/SfxUtil.h b/src/dtf/SfxCA/SfxUtil.h
new file mode 100644
index 00000000..af12d8dd
--- /dev/null
+++ b/src/dtf/SfxCA/SfxUtil.h
@@ -0,0 +1,31 @@
+// 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 "RemoteMsiSession.h"
+
+void Log(MSIHANDLE hSession, const wchar_t* szMessage, ...);
+
+int ExtractCabinet(const wchar_t* szCabFile, const wchar_t* szExtractDir);
+
+bool DeleteDirectory(const wchar_t* szDir);
+
+__success(return != false)
+bool ExtractToTempDirectory(__in MSIHANDLE hSession, __in HMODULE hModule,
+        __out_ecount_z(cchTempDirBuf) wchar_t* szTempDir, DWORD cchTempDirBuf);
+
+bool LoadCLR(MSIHANDLE hSession, const wchar_t* szVersion, const wchar_t* szConfigFile,
+        const wchar_t* szPrimaryAssembly, ICorRuntimeHost** ppHost);
+
+bool CreateAppDomain(MSIHANDLE hSession, ICorRuntimeHost* pHost,
+        const wchar_t* szName, const wchar_t* szAppBase,
+        const wchar_t* szConfigFile, _AppDomain** ppAppDomain);
+
+bool GetMethod(MSIHANDLE hSession, _AppDomain* pAppDomain,
+        const wchar_t* szAssembly, const wchar_t* szClass,
+        const wchar_t* szMethod, _MethodInfo** ppCAMethod);
+
+extern HMODULE g_hModule;
+extern bool g_fRunningOutOfProc;
+
+extern RemoteMsiSession* g_pRemote;
+
+
diff --git a/src/dtf/SfxCA/precomp.cpp b/src/dtf/SfxCA/precomp.cpp
new file mode 100644
index 00000000..ce82c1d7
--- /dev/null
+++ b/src/dtf/SfxCA/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"
\ No newline at end of file
diff --git a/src/dtf/SfxCA/precomp.h b/src/dtf/SfxCA/precomp.h
new file mode 100644
index 00000000..48d4f011
--- /dev/null
+++ b/src/dtf/SfxCA/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 <strsafe.h>
+#include <mscoree.h>
+#include <io.h>
+#include <fcntl.h>
+#include <share.h>
+#include <shlwapi.h>
+#include <sys/stat.h>
+#include <malloc.h>
+#include <fdi.h>
+#include <msiquery.h>
+#import <mscorlib.tlb> raw_interfaces_only rename("ReportEvent", "CorReportEvent")
+using namespace mscorlib;
diff --git a/src/dtf/SfxCA/sfxca_t.proj b/src/dtf/SfxCA/sfxca_t.proj
new file mode 100644
index 00000000..1e823be1
--- /dev/null
+++ b/src/dtf/SfxCA/sfxca_t.proj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="SfxCA.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="SfxCA.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="SfxCA.vcxproj" Properties="Platform=ARM64" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj
new file mode 100644
index 00000000..379aa194
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj
@@ -0,0 +1,17 @@
+<?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 Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <Title>The WiX Toolset Managed CustomAction Framework.</Title>
+    <Description>The WiX Toolset lets developers create managed custom actions for the Windows Installer. This package contains the tools necessary to convert your project into a managed custom action.</Description>
+
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.MakeSfxCA\WixToolset.Dtf.MakeSfxCA.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
new file mode 100644
index 00000000..4550e629
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <icon>wix-white-bg.png</icon>
+    <license type="expression">MS-RL</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+    <dependencies>
+      <dependency id="WixToolset.Dtf.WindowsInstaller" version="$version$" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$\$id$.targets" target="build" />
+    <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" />
+    <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" />
+    <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" />
+    <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" />
+    <file src="net472\WixToolset.Dtf.Compression.Cab.dll" target="tools" />
+    <file src="net472\WixToolset.Dtf.Resources.dll" target="tools" />
+    <file src="x64\SfxCA.dll" target="tools\x64" />
+    <file src="x86\SfxCA.dll" target="tools\x86" />
+    <file src="ARM64\SfxCA.dll" target="tools\arm64" />
+  </files>
+</package>
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/tools/wix.ca.targets b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets
index 4578c2d8..127bb29d 100644
--- a/src/dtf/WixToolset.Dtf.MSBuild/tools/wix.ca.targets
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" />
 
@@ -11,13 +10,12 @@
 
     <TargetCAFileName Condition=" '$(TargetCAFileName)' == '' ">$(TargetName).CA$(TargetExt)</TargetCAFileName>
 
-    <WixSdkPath Condition=" '$(WixSdkPath)' == '' ">$(MSBuildThisFileDirectory)</WixSdkPath>
-    <WixSdkX86Path Condition=" '$(WixSdkX86Path)' == '' ">$(WixSdkPath)x86\</WixSdkX86Path>
-    <WixSdkX64Path Condition=" '$(WixSdkX64Path)' == '' ">$(WixSdkPath)x64\</WixSdkX64Path>
+    <MakeSfxCAPath Condition=" '$(MakeSfxCAPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\</MakeSfxCAPath>
 
-    <MakeSfxCA Condition=" '$(MakeSfxCA)' == '' ">$(WixSdkPath)MakeSfxCA.exe</MakeSfxCA>
-    <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'x64' ">$(WixSdkX64Path)SfxCA.dll</SfxCADll>
-    <SfxCADll Condition=" '$(SfxCADll)' == '' ">$(WixSdkX86Path)SfxCA.dll</SfxCADll>
+    <MakeSfxCA Condition=" '$(MakeSfxCA)' == '' ">$(MakeSfxCAPath)WixToolset.Dtf.MakeSfxCA.exe</MakeSfxCA>
+    <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'ARM64' ">$(MakeSfxCAPath)arm64\SfxCA.dll</SfxCADll>
+    <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'x64' ">$(MakeSfxCAPath)x64\SfxCA.dll</SfxCADll>
+    <SfxCADll Condition=" '$(SfxCADll)' == '' ">$(MakeSfxCAPath)x86\SfxCA.dll</SfxCADll>
   </PropertyGroup>
 
   <!--
@@ -74,7 +72,7 @@
     <!-- Run the MakeSfxCA.exe CA packaging tool. -->
     <Exec Command='"$(MakeSfxCA)" "@(IntermediateCAPackage)" "$(SfxCADll)" "@(IntermediateCAAssembly)" "$(CustomActionContents)"'
           WorkingDirectory="$(ProjectDir)" />
-  
+
     <!-- Add modules to be copied to output dir. -->
     <ItemGroup>
       <AddModules Include="@(IntermediateCAPackage)" />
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.v3.ncrunchproject b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.v3.ncrunchproject
new file mode 100644
index 00000000..cf22dfa9
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <HiddenComponentWarnings />
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj
deleted file mode 100644
index 1c81b861..00000000
--- a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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 Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <Description>WiX Toolset Dtf MSBuild integration</Description>
-    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
-    <NuspecBasePath>$(OutputPath)publish\WixToolset.Dtf.MSBuild\</NuspecBasePath>
-    <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="build\WixToolset.Dtf.MSBuild.props" />
-    <None Remove="tools\wix.ca.targets" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="build\WixToolset.Dtf.MSBuild.props">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="tools\wix.ca.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn>
-  </PropertyGroup>
-
-  <Target Name="SetNuspecVersion">
-    <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
-
-    <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
-    </PropertyGroup>
-  </Target>
-</Project>
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.nuspec b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.nuspec
deleted file mode 100644
index 7f819cdb..00000000
--- a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <owners>$authors$</owners>
-        <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-  </metadata>
-
-  <files>
-    <file src="build\**\*" target="build" />
-    <file src="tools\**\*" target="tools" />
-  </files>
-</package>
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/build/WixToolset.Dtf.MSBuild.props b/src/dtf/WixToolset.Dtf.MSBuild/build/WixToolset.Dtf.MSBuild.props
deleted file mode 100644
index 06a98d6e..00000000
--- a/src/dtf/WixToolset.Dtf.MSBuild/build/WixToolset.Dtf.MSBuild.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.ca.targets'))</WixCATargetsPath>
-  </PropertyGroup>
-</Project>
diff --git a/src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.cs b/src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.cs
new file mode 100644
index 00000000..d701da20
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.cs
@@ -0,0 +1,710 @@
+// 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.
+
+namespace WixToolset.Dtf.MakeSfxCA
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+    using System.Security;
+    using System.Text;
+    using System.Reflection;
+    using WixToolset.Dtf.Compression;
+    using WixToolset.Dtf.Compression.Cab;
+    using WixToolset.Dtf.Resources;
+    using ResourceCollection = WixToolset.Dtf.Resources.ResourceCollection;
+
+    /// <summary>
+    /// Command-line tool for building self-extracting custom action packages.
+    /// Appends cabbed CA binaries to SfxCA.dll and fixes up the result's
+    /// entry-points and file version to look like the CA module.
+    /// </summary>
+    public static class MakeSfxCA
+    {
+        private const string REQUIRED_WI_ASSEMBLY = "WixToolset.Dtf.WindowsInstaller.dll";
+
+        private static TextWriter log;
+
+        /// <summary>
+        /// Prints usage text for the tool.
+        /// </summary>
+        /// <param name="w">Console text writer.</param>
+        public static void Usage(TextWriter w)
+        {
+            w.WriteLine("WiX Toolset custom action packager version {0}", Assembly.GetExecutingAssembly().GetName().Version);
+            w.WriteLine("Copyright (C) .NET Foundation and contributors. All rights reserved.");
+            w.WriteLine();
+            w.WriteLine("Usage: WixToolset.Dtf.MakeSfxCA <outputca.dll> SfxCA.dll <inputca.dll> [support files ...]");
+            w.WriteLine();
+            w.WriteLine("Makes a self-extracting managed MSI CA or UI DLL package.");
+            w.WriteLine("Support files must include " + MakeSfxCA.REQUIRED_WI_ASSEMBLY);
+            w.WriteLine("Support files optionally include CustomAction.config/EmbeddedUI.config");
+        }
+
+        /// <summary>
+        /// Runs the MakeSfxCA command-line tool.
+        /// </summary>
+        /// <param name="args">Command-line arguments.</param>
+        /// <returns>0 on success, nonzero on failure.</returns>
+        public static int Main(string[] args)
+        {
+            if (args.Length < 3)
+            {
+                Usage(Console.Out);
+                return 1;
+            }
+
+            var output = args[0];
+            var sfxDll = args[1];
+            var inputs = new string[args.Length - 2];
+            Array.Copy(args, 2, inputs, 0, inputs.Length);
+
+            try
+            {
+                Build(output, sfxDll, inputs, Console.Out);
+                return 0;
+            }
+            catch (ArgumentException ex)
+            {
+                Console.Error.WriteLine("Error: Invalid argument: " + ex.Message);
+                return 1;
+            }
+            catch (FileNotFoundException ex)
+            {
+                Console.Error.WriteLine("Error: Cannot find file: " + ex.Message);
+                return 1;
+            }
+            catch (Exception ex)
+            {
+                Console.Error.WriteLine("Error: Unexpected error: " + ex);
+                return 1;
+            }
+        }
+
+        /// <summary>
+        /// Packages up all the inputs to the output location.
+        /// </summary>
+        /// <exception cref="Exception">Various exceptions are thrown
+        /// if things go wrong.</exception>
+        public static void Build(string output, string sfxDll, IList<string> inputs, TextWriter log)
+        {
+            MakeSfxCA.log = log;
+
+            if (String.IsNullOrEmpty(output))
+            {
+                throw new ArgumentNullException("output");
+            }
+
+            if (String.IsNullOrEmpty(sfxDll))
+            {
+                throw new ArgumentNullException("sfxDll");
+            }
+
+            if (inputs == null || inputs.Count == 0)
+            {
+                throw new ArgumentNullException("inputs");
+            }
+
+            if (!File.Exists(sfxDll))
+            {
+                throw new FileNotFoundException(sfxDll);
+            }
+
+            var customActionAssembly = inputs[0];
+            if (!File.Exists(customActionAssembly))
+            {
+                throw new FileNotFoundException(customActionAssembly);
+            }
+
+            inputs = MakeSfxCA.SplitList(inputs);
+
+            var inputsMap = MakeSfxCA.GetPackFileMap(inputs);
+
+            var foundWIAssembly = false;
+            foreach (var input in inputsMap.Keys)
+            {
+                if (String.Compare(input, MakeSfxCA.REQUIRED_WI_ASSEMBLY,
+                    StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    foundWIAssembly = true;
+                }
+            }
+
+            if (!foundWIAssembly)
+            {
+                throw new ArgumentException(MakeSfxCA.REQUIRED_WI_ASSEMBLY +
+                    " must be included in the list of support files. " +
+                    "If using the MSBuild targets, make sure the assembly reference " +
+                    "has the Private (Copy Local) flag set.");
+            }
+
+            MakeSfxCA.ResolveDependentAssemblies(inputsMap, Path.GetDirectoryName(customActionAssembly));
+
+            var entryPoints = MakeSfxCA.FindEntryPoints(customActionAssembly);
+            var uiClass = MakeSfxCA.FindEmbeddedUIClass(customActionAssembly);
+
+            if (entryPoints.Count == 0 && uiClass == null)
+            {
+                throw new ArgumentException(
+                    "No CA or UI entry points found in module: " + customActionAssembly);
+            }
+            else if (entryPoints.Count > 0 && uiClass != null)
+            {
+                throw new NotSupportedException(
+                    "CA and UI entry points cannot be in the same assembly: " + customActionAssembly);
+            }
+
+            var dir = Path.GetDirectoryName(output);
+            if (dir.Length > 0 && !Directory.Exists(dir))
+            {
+                Directory.CreateDirectory(dir);
+            }
+
+            using (Stream outputStream = File.Create(output))
+            {
+                MakeSfxCA.WriteEntryModule(sfxDll, outputStream, entryPoints, uiClass);
+            }
+
+            MakeSfxCA.CopyVersionResource(customActionAssembly, output);
+
+            MakeSfxCA.PackInputFiles(output, inputsMap);
+
+            log.WriteLine("MakeSfxCA finished: " + new FileInfo(output).FullName);
+        }
+
+        /// <summary>
+        /// Splits any list items delimited by semicolons into separate items.
+        /// </summary>
+        /// <param name="list">Read-only input list.</param>
+        /// <returns>New list with resulting split items.</returns>
+        private static IList<string> SplitList(IList<string> list)
+        {
+            var newList = new List<string>(list.Count);
+
+            foreach (var item in list)
+            {
+                if (!String.IsNullOrEmpty(item))
+                {
+                    foreach (var splitItem in item.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        newList.Add(splitItem);
+                    }
+                }
+            }
+
+            return newList;
+        }
+
+        /// <summary>
+        /// Sets up a reflection-only assembly-resolve-handler to handle loading dependent assemblies during reflection.
+        /// </summary>
+        /// <param name="inputFiles">List of input files which include non-GAC dependent assemblies.</param>
+        /// <param name="inputDir">Directory to auto-locate additional dependent assemblies.</param>
+        /// <remarks>
+        /// Also searches the assembly's directory for unspecified dependent assemblies, and adds them
+        /// to the list of input files if found.
+        /// </remarks>
+        private static void ResolveDependentAssemblies(IDictionary<string, string> inputFiles, string inputDir)
+        {
+            AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += delegate(object sender, ResolveEventArgs args)
+            {
+                AssemblyName resolveName = new AssemblyName(args.Name);
+                Assembly assembly = null;
+
+                // First, try to find the assembly in the list of input files.
+                foreach (var inputFile in inputFiles.Values)
+                {
+                    var inputName = Path.GetFileNameWithoutExtension(inputFile);
+                    var inputExtension = Path.GetExtension(inputFile);
+                    if (String.Equals(inputName, resolveName.Name, StringComparison.OrdinalIgnoreCase) &&
+                        (String.Equals(inputExtension, ".dll", StringComparison.OrdinalIgnoreCase) ||
+                         String.Equals(inputExtension, ".exe", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        assembly = MakeSfxCA.TryLoadDependentAssembly(inputFile);
+
+                        if (assembly != null)
+                        {
+                            break;
+                        }
+                    }
+                }
+
+                // Second, try to find the assembly in the input directory.
+                if (assembly == null && inputDir != null)
+                {
+                    string assemblyPath = null;
+                    if (File.Exists(Path.Combine(inputDir, resolveName.Name) + ".dll"))
+                    {
+                        assemblyPath = Path.Combine(inputDir, resolveName.Name) + ".dll";
+                    }
+                    else if (File.Exists(Path.Combine(inputDir, resolveName.Name) + ".exe"))
+                    {
+                        assemblyPath = Path.Combine(inputDir, resolveName.Name) + ".exe";
+                    }
+
+                    if (assemblyPath != null)
+                    {
+                        assembly = MakeSfxCA.TryLoadDependentAssembly(assemblyPath);
+
+                        if (assembly != null)
+                        {
+                            // Add this detected dependency to the list of files to be packed.
+                            inputFiles.Add(Path.GetFileName(assemblyPath), assemblyPath);
+                        }
+                    }
+                }
+
+                // Third, try to load the assembly from the GAC.
+                if (assembly == null)
+                {
+                    try
+                    {
+                        assembly = Assembly.ReflectionOnlyLoad(args.Name);
+                    }
+                    catch (FileNotFoundException)
+                    {
+                    }
+                }
+
+                if (assembly != null)
+                {
+                    if (String.Equals(assembly.GetName().ToString(), resolveName.ToString()))
+                    {
+                        log.WriteLine("    Loaded dependent assembly: " + assembly.Location);
+                        return assembly;
+                    }
+
+                    log.WriteLine("    Warning: Loaded mismatched dependent assembly: " + assembly.Location);
+                    log.WriteLine("      Loaded assembly   : " + assembly.GetName());
+                    log.WriteLine("      Reference assembly: " + resolveName);
+                }
+                else
+                {
+                    log.WriteLine("    Error: Dependent assembly not supplied: " + resolveName);
+                }
+
+                return null;
+            };
+        }
+
+        /// <summary>
+        /// Attempts a reflection-only load of a dependent assembly, logging the error if the load fails.
+        /// </summary>
+        /// <param name="assemblyPath">Path of the assembly file to laod.</param>
+        /// <returns>Loaded assembly, or null if the load failed.</returns>
+        private static Assembly TryLoadDependentAssembly(string assemblyPath)
+        {
+            Assembly assembly = null;
+            try
+            {
+                assembly = Assembly.ReflectionOnlyLoadFrom(assemblyPath);
+            }
+            catch (IOException ex)
+            {
+                log.WriteLine("    Error: Failed to load dependent assembly: {0}. {1}", assemblyPath, ex.Message);
+            }
+            catch (BadImageFormatException ex)
+            {
+                log.WriteLine("    Error: Failed to load dependent assembly: {0}. {1}", assemblyPath, ex.Message);
+            }
+            catch (SecurityException ex)
+            {
+                log.WriteLine("    Error: Failed to load dependent assembly: {0}. {1}", assemblyPath, ex.Message);
+            }
+
+            return assembly;
+        }
+
+        /// <summary>
+        /// Searches the types in the input assembly for a type that implements IEmbeddedUI.
+        /// </summary>
+        /// <param name="module"></param>
+        /// <returns></returns>
+        private static string FindEmbeddedUIClass(string module)
+        {
+            log.WriteLine("Searching for an embedded UI class in {0}", Path.GetFileName(module));
+
+            string uiClass = null;
+
+            var assembly = Assembly.ReflectionOnlyLoadFrom(module);
+
+            foreach (var type in assembly.GetExportedTypes())
+            {
+                if (!type.IsAbstract)
+                {
+                    foreach (var interfaceType in type.GetInterfaces())
+                    {
+                        if (interfaceType.FullName == "WixToolset.Dtf.WindowsInstaller.IEmbeddedUI")
+                        {
+                            if (uiClass == null)
+                            {
+                                uiClass = assembly.GetName().Name + "!" + type.FullName;
+                            }
+                            else
+                            {
+                                throw new ArgumentException("Multiple IEmbeddedUI implementations found.");
+                            }
+                        }
+                    }
+                }
+            }
+
+            return uiClass;
+        }
+
+        /// <summary>
+        /// Reflects on an input CA module to locate custom action entry-points.
+        /// </summary>
+        /// <param name="module">Assembly module with CA entry-points.</param>
+        /// <returns>Mapping from entry-point names to assembly!class.method paths.</returns>
+        private static IDictionary<string, string> FindEntryPoints(string module)
+        {
+            log.WriteLine("Searching for custom action entry points " +
+                "in {0}", Path.GetFileName(module));
+
+            var entryPoints = new Dictionary<string, string>();
+
+            var assembly = Assembly.ReflectionOnlyLoadFrom(module);
+
+            foreach (var type in assembly.GetExportedTypes())
+            {
+                foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.Static))
+                {
+                    var entryPointName = MakeSfxCA.GetEntryPoint(method);
+                    if (entryPointName != null)
+                    {
+                        var entryPointPath = String.Format(
+                            "{0}!{1}.{2}",
+                            Path.GetFileNameWithoutExtension(module),
+                            type.FullName,
+                            method.Name);
+                        entryPoints.Add(entryPointName, entryPointPath);
+
+                        log.WriteLine("    {0}={1}", entryPointName, entryPointPath);
+                    }
+                }
+            }
+
+            return entryPoints;
+        }
+
+        /// <summary>
+        /// Check for a CustomActionAttribute and return the entrypoint name for the method if it is a CA method.
+        /// </summary>
+        /// <param name="method">A public static method.</param>
+        /// <returns>Entrypoint name for the method as specified by the custom action attribute or just the method name,
+        /// or null if the method is not a custom action method.</returns>
+        private static string GetEntryPoint(MethodInfo method)
+        {
+            IList<CustomAttributeData> attributes;
+            try
+            {
+                attributes = CustomAttributeData.GetCustomAttributes(method);
+            }
+            catch (FileLoadException)
+            {
+                // Already logged load failures in the assembly-resolve-handler.
+                return null;
+            }
+
+            foreach (CustomAttributeData attribute in attributes)
+            {
+                if (attribute.ToString().StartsWith(
+                    "[WixToolset.Dtf.WindowsInstaller.CustomActionAttribute(",
+                    StringComparison.Ordinal))
+                {
+                    string entryPointName = null;
+                    foreach (var argument in attribute.ConstructorArguments)
+                    {
+                        // The entry point name is the first positional argument, if specified.
+                        entryPointName = (string) argument.Value;
+                        break;
+                    }
+
+                    if (String.IsNullOrEmpty(entryPointName))
+                    {
+                        entryPointName = method.Name;
+                    }
+
+                    return entryPointName;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Counts the number of template entrypoints in SfxCA.dll.
+        /// </summary>
+        /// <remarks>
+        /// Depending on the requirements, SfxCA.dll might be built with
+        /// more entrypoints than the default.
+        /// </remarks>
+        private static int GetEntryPointSlotCount(byte[] fileBytes, string entryPointFormat)
+        {
+            for (var count = 0; ; count++)
+            {
+                var templateName = String.Format(entryPointFormat, count);
+                var templateAsciiBytes = Encoding.ASCII.GetBytes(templateName);
+
+                var nameOffset = FindBytes(fileBytes, templateAsciiBytes);
+                if (nameOffset < 0)
+                {
+                    return count;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Writes a modified version of SfxCA.dll to the output stream,
+        /// with the template entry-points mapped to the CA entry-points.
+        /// </summary>
+        /// <remarks>
+        /// To avoid having to recompile SfxCA.dll for every different set of CAs,
+        /// this method looks for a preset number of template entry-points in the
+        /// binary file and overwrites their entrypoint name and string data with
+        /// CA-specific values.
+        /// </remarks>
+        private static void WriteEntryModule(
+            string sfxDll, Stream outputStream, IDictionary<string, string> entryPoints, string uiClass)
+        {
+            log.WriteLine("Modifying SfxCA.dll stub");
+
+            byte[] fileBytes;
+            using (var readStream = File.OpenRead(sfxDll))
+            {
+                fileBytes = new byte[(int) readStream.Length];
+                readStream.Read(fileBytes, 0, fileBytes.Length);
+            }
+
+            const string ENTRYPOINT_FORMAT = "CustomActionEntryPoint{0:d03}";
+            const int MAX_ENTRYPOINT_NAME = 72;
+            const int MAX_ENTRYPOINT_PATH = 160;
+            //var emptyBytes = new byte[0];
+
+            var slotCount = MakeSfxCA.GetEntryPointSlotCount(fileBytes, ENTRYPOINT_FORMAT);
+
+            if (slotCount == 0)
+            {
+                throw new ArgumentException("Invalid SfxCA.dll file.");
+            }
+
+            if (entryPoints.Count > slotCount)
+            {
+                throw new ArgumentException(String.Format(
+                    "The custom action assembly has {0} entrypoints, which is more than the maximum ({1}). " +
+                    "Refactor the custom actions or add more entrypoint slots in SfxCA\\EntryPoints.h.",
+                    entryPoints.Count, slotCount));
+            }
+
+            var slotSort = new string[slotCount];
+            for (var i = 0; i < slotCount - entryPoints.Count; i++)
+            {
+                slotSort[i] = String.Empty;
+            }
+
+            entryPoints.Keys.CopyTo(slotSort, slotCount - entryPoints.Count);
+            Array.Sort<string>(slotSort, slotCount - entryPoints.Count, entryPoints.Count, StringComparer.Ordinal);
+
+            for (var i = 0; ; i++)
+            {
+                var templateName = String.Format(ENTRYPOINT_FORMAT, i);
+                var templateAsciiBytes = Encoding.ASCII.GetBytes(templateName);
+                var templateUniBytes = Encoding.Unicode.GetBytes(templateName);
+
+                var nameOffset = MakeSfxCA.FindBytes(fileBytes, templateAsciiBytes);
+                if (nameOffset < 0)
+                {
+                    break;
+                }
+
+                var pathOffset = MakeSfxCA.FindBytes(fileBytes, templateUniBytes);
+                if (pathOffset < 0)
+                {
+                    break;
+                }
+
+                var entryPointName = slotSort[i];
+                var entryPointPath = entryPointName.Length > 0 ?
+                    entryPoints[entryPointName] : String.Empty;
+
+                if (entryPointName.Length > MAX_ENTRYPOINT_NAME)
+                {
+                    throw new ArgumentException(String.Format(
+                        "Entry point name exceeds limit of {0} characters: {1}",
+                        MAX_ENTRYPOINT_NAME,
+                        entryPointName));
+                }
+
+                if (entryPointPath.Length > MAX_ENTRYPOINT_PATH)
+                {
+                    throw new ArgumentException(String.Format(
+                        "Entry point path exceeds limit of {0} characters: {1}",
+                        MAX_ENTRYPOINT_PATH,
+                        entryPointPath));
+                }
+
+                var replaceNameBytes = Encoding.ASCII.GetBytes(entryPointName);
+                var replacePathBytes = Encoding.Unicode.GetBytes(entryPointPath);
+
+                MakeSfxCA.ReplaceBytes(fileBytes, nameOffset, MAX_ENTRYPOINT_NAME, replaceNameBytes);
+                MakeSfxCA.ReplaceBytes(fileBytes, pathOffset, MAX_ENTRYPOINT_PATH * 2, replacePathBytes);
+            }
+
+            if (entryPoints.Count == 0 && uiClass != null)
+            {
+                // Remove the zzz prefix from exported EmbeddedUI entry-points.
+                foreach (var export in new string[] { "InitializeEmbeddedUI", "EmbeddedUIHandler", "ShutdownEmbeddedUI" })
+                {
+                    var exportNameBytes = Encoding.ASCII.GetBytes("zzz" + export);
+
+                    var exportOffset = MakeSfxCA.FindBytes(fileBytes, exportNameBytes);
+                    if (exportOffset < 0)
+                    {
+                        throw new ArgumentException("Input SfxCA.dll does not contain exported entry-point: " + export);
+                    }
+
+                    var replaceNameBytes = Encoding.ASCII.GetBytes(export);
+                    MakeSfxCA.ReplaceBytes(fileBytes, exportOffset, exportNameBytes.Length, replaceNameBytes);
+                }
+
+                if (uiClass.Length > MAX_ENTRYPOINT_PATH)
+                {
+                    throw new ArgumentException(String.Format(
+                        "UI class full name exceeds limit of {0} characters: {1}",
+                        MAX_ENTRYPOINT_PATH,
+                        uiClass));
+                }
+
+                var templateBytes = Encoding.Unicode.GetBytes("InitializeEmbeddedUI_FullClassName");
+                var replaceBytes = Encoding.Unicode.GetBytes(uiClass);
+
+                // Fill in the embedded UI implementor class so the proxy knows which one to load.
+                var replaceOffset = MakeSfxCA.FindBytes(fileBytes, templateBytes);
+                if (replaceOffset >= 0)
+                {
+                    MakeSfxCA.ReplaceBytes(fileBytes, replaceOffset, MAX_ENTRYPOINT_PATH * 2, replaceBytes);
+                }
+            }
+
+            outputStream.Write(fileBytes, 0, fileBytes.Length);
+        }
+
+        /// <summary>
+        /// Searches for a sub-array of bytes within a larger array of bytes.
+        /// </summary>
+        private static int FindBytes(byte[] source, byte[] find)
+        {
+            for (var i = 0; i < source.Length; i++)
+            {
+                int j;
+                for (j = 0; j < find.Length; j++)
+                {
+                    if (source[i + j] != find[j])
+                    {
+                        break;
+                    }
+                }
+
+                if (j == find.Length)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Replaces a range of bytes with new bytes, padding any extra part
+        /// of the range with zeroes.
+        /// </summary>
+        private static void ReplaceBytes(
+            byte[] source, int offset, int length, byte[] replace)
+        {
+            for (var i = 0; i < length; i++)
+            {
+                if (i < replace.Length)
+                {
+                    source[offset + i] = replace[i];
+                }
+                else
+                {
+                    source[offset + i] = 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Print the name of one file as it is being packed into the cab.
+        /// </summary>
+        private static void PackProgress(object source, ArchiveProgressEventArgs e)
+        {
+            if (e.ProgressType == ArchiveProgressType.StartFile && log != null)
+            {
+                log.WriteLine("    {0}", e.CurrentFileName);
+            }
+        }
+
+        /// <summary>
+        /// Gets a mapping from filenames as they will be in the cab to filenames
+        /// as they are currently on disk.
+        /// </summary>
+        /// <remarks>
+        /// By default, all files will be placed in the root of the cab. But inputs may
+        /// optionally include an alternate inside-cab file path before an equals sign.
+        /// </remarks>
+        private static IDictionary<string, string> GetPackFileMap(IList<string> inputs)
+        {
+            var fileMap = new Dictionary<string, string>();
+            foreach (var inputFile in inputs)
+            {
+                if (inputFile.IndexOf('=') > 0)
+                {
+                    var parse = inputFile.Split('=');
+                    if (!fileMap.ContainsKey(parse[0]))
+                    {
+                        fileMap.Add(parse[0], parse[1]);
+                    }
+                }
+                else
+                {
+                    var fileName = Path.GetFileName(inputFile);
+                    if (!fileMap.ContainsKey(fileName))
+                    {
+                        fileMap.Add(fileName, inputFile);
+                    }
+                }
+            }
+            return fileMap;
+        }
+
+        /// <summary>
+        /// Packs the input files into a cab that is appended to the
+        /// output SfxCA.dll.
+        /// </summary>
+        private static void PackInputFiles(string outputFile, IDictionary<string, string> fileMap)
+        {
+            log.WriteLine("Packaging files");
+
+            var cabInfo = new CabInfo(outputFile);
+            cabInfo.PackFileSet(null, fileMap, CompressionLevel.Max, PackProgress);
+        }
+
+        /// <summary>
+        /// Copies the version resource information from the CA module to
+        /// the CA package. This gives the package the file version and
+        /// description of the CA module, instead of the version and
+        /// description of SfxCA.dll.
+        /// </summary>
+        private static void CopyVersionResource(string sourceFile, string destFile)
+        {
+            log.WriteLine("Copying file version info from {0} to {1}",
+                sourceFile, destFile);
+
+            var rc = new ResourceCollection();
+            rc.Find(sourceFile, ResourceType.Version);
+            rc.Load(sourceFile);
+            rc.Save(destFile);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.exe.manifest b/src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.exe.manifest
new file mode 100644
index 00000000..5224db50
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity name="WixToolset.Dtf.MakeSfxCA" version="4.0.0.0" processorArchitecture="x86" type="win32"/>
+ <description>WiX Toolset Compiler</description> 
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+  <security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security>
+ </trustInfo>
+ <application xmlns="urn:schemas-microsoft-com:asm.v3">
+  <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings"><ws2:longPathAware>true</ws2:longPathAware></windowsSettings>
+ </application>
+</assembly>
diff --git a/src/dtf/WixToolset.Dtf.MakeSfxCA/WixToolset.Dtf.MakeSfxCA.csproj b/src/dtf/WixToolset.Dtf.MakeSfxCA/WixToolset.Dtf.MakeSfxCA.csproj
new file mode 100644
index 00000000..e62aaed3
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MakeSfxCA/WixToolset.Dtf.MakeSfxCA.csproj
@@ -0,0 +1,19 @@
+<?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 Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net472</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <DebugType>embedded</DebugType>
+    <AppConfig>app.config</AppConfig>
+    <ApplicationManifest>MakeSfxCA.exe.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
+    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+    <ProjectReference Include="..\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.MakeSfxCA/app.config b/src/dtf/WixToolset.Dtf.MakeSfxCA/app.config
new file mode 100644
index 00000000..29bbc006
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MakeSfxCA/app.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true"/>
+    <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
+  </runtime>
+</configuration>
diff --git a/src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs b/src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs
index b37d5311..8d46b54b 100644
--- a/src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs
+++ b/src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs
@@ -18,7 +18,7 @@ namespace WixToolset.Dtf.Resources
     /// <remarks>
     /// To use this class:<list type="number">
     /// <item>Create a new ResourceCollection</item>
-    /// <item>Locate resources for the collection by calling one of the <see cref="ResourceCollection.Find(string)"/> methods</item>
+    /// <item>Locate resources for the collection by calling one of the <see cref="ResourceCollection.Find(String)"/> methods</item>
     /// <item>Load data of one or more <see cref="Resource"/>s from a file by calling the <see cref="Load"/> method of the
     /// Resource class, or load them all at once (more efficient) with the <see cref="Load"/> method of the ResourceCollection.</item>
     /// <item>Read and/or edit data of the individual Resource objects using the methods on that class.</item>
@@ -28,7 +28,7 @@ namespace WixToolset.Dtf.Resources
     /// </remarks>
     public class ResourceCollection : ICollection<Resource>
     {
-        private List<Resource> resources;
+        private readonly List<Resource> resources;
 
         /// <summary>
         /// Creates a new, empty ResourceCollection.
@@ -48,17 +48,17 @@ namespace WixToolset.Dtf.Resources
         {
             this.Clear();
 
-            IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            var module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
             if (module == IntPtr.Zero)
             {
-                int err = Marshal.GetLastWin32Error();
+                var err = Marshal.GetLastWin32Error();
                 throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to load resource file. Error code: {0}", err));
             }
             try
             {
                 if (!NativeMethods.EnumResourceTypes(module, new NativeMethods.EnumResTypesProc(this.EnumResTypes), IntPtr.Zero))
                 {
-                    int err = Marshal.GetLastWin32Error();
+                    var err = Marshal.GetLastWin32Error();
                     throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to enumerate resources. Error code: {0}", err));
                 }
             }
@@ -79,12 +79,12 @@ namespace WixToolset.Dtf.Resources
         {
             this.Clear();
 
-            IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            var module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
             try
             {
                 if (!NativeMethods.EnumResourceNames(module, (string) type, new NativeMethods.EnumResNamesProc(this.EnumResNames), IntPtr.Zero))
                 {
-                    int err = Marshal.GetLastWin32Error();
+                    var err = Marshal.GetLastWin32Error();
                     throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceNames error. Error code: {0}", err));
                 }
             }
@@ -106,12 +106,12 @@ namespace WixToolset.Dtf.Resources
         {
             this.Clear();
 
-            IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            var module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
             try
             {
                 if (!NativeMethods.EnumResourceLanguages(module, (string) type, name, new NativeMethods.EnumResLangsProc(this.EnumResLangs), IntPtr.Zero))
                 {
-                    int err = Marshal.GetLastWin32Error();
+                    var err = Marshal.GetLastWin32Error();
                     throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceLanguages error. Error code: {0}", err));
                 }
             }
@@ -123,9 +123,9 @@ namespace WixToolset.Dtf.Resources
 
         private bool EnumResTypes(IntPtr module, IntPtr type, IntPtr param)
         {
-            if (!NativeMethods.EnumResourceNames(module, type, new NativeMethods.EnumResNamesProc(EnumResNames), IntPtr.Zero))
+            if (!NativeMethods.EnumResourceNames(module, type, new NativeMethods.EnumResNamesProc(this.EnumResNames), IntPtr.Zero))
             {
-                int err = Marshal.GetLastWin32Error();
+                var err = Marshal.GetLastWin32Error();
                 throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceNames error! Error code: {0}", err));
             }
             return true;
@@ -133,9 +133,9 @@ namespace WixToolset.Dtf.Resources
 
         private bool EnumResNames(IntPtr module, IntPtr type, IntPtr name, IntPtr param)
         {
-            if (!NativeMethods.EnumResourceLanguages(module, type, name, new NativeMethods.EnumResLangsProc(EnumResLangs), IntPtr.Zero))
+            if (!NativeMethods.EnumResourceLanguages(module, type, name, new NativeMethods.EnumResLangsProc(this.EnumResLangs), IntPtr.Zero))
             {
-                int err = Marshal.GetLastWin32Error();
+                var err = Marshal.GetLastWin32Error();
                 throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceLanguages error. Error code: {0}", err));
             }
             return true;
@@ -179,10 +179,10 @@ namespace WixToolset.Dtf.Resources
         /// <param name="file">The file from which resources are loaded.</param>
         public void Load(string file)
         {
-            IntPtr module = NativeMethods.LoadLibraryEx(file, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            var module = NativeMethods.LoadLibraryEx(file, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
             try
             {
-                foreach (Resource res in this)
+                foreach (var res in this)
                 {
                     res.Load(module);
                 }
@@ -199,17 +199,17 @@ namespace WixToolset.Dtf.Resources
         /// <param name="file">The file to which resources are saved.</param>
         public void Save(string file)
         {
-            IntPtr updateHandle = IntPtr.Zero;
+            var updateHandle = IntPtr.Zero;
             try
             {
                 updateHandle = NativeMethods.BeginUpdateResource(file, false);
-                foreach (Resource res in this)
+                foreach (var res in this)
                 {
                     res.Save(updateHandle);
                 }
                 if (!NativeMethods.EndUpdateResource(updateHandle, false))
                 {
-                    int err = Marshal.GetLastWin32Error();
+                    var err = Marshal.GetLastWin32Error();
                     throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to save resource. Error {0}", err));
                 }
                 updateHandle = IntPtr.Zero;
diff --git a/src/dtf/dtf.cmd b/src/dtf/dtf.cmd
index dbc67c63..6b55ecfe 100644
--- a/src/dtf/dtf.cmd
+++ b/src/dtf/dtf.cmd
@@ -8,6 +8,8 @@
 
 @echo Building dtf %_C%
 
+msbuild -Restore SfxCA\sfxca_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\dtf_sfxca.binlog || exit /b
+
 msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\dtf_build.binlog || exit /b
 
 @popd
diff --git a/src/dtf/dtf.sln b/src/dtf/dtf.sln
index fbd9452c..36592dcf 100644
--- a/src/dtf/dtf.sln
+++ b/src/dtf/dtf.sln
@@ -1,33 +1,39 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression", "WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj", "{2D62850C-9F81-4BE9-BDF3-9379389C8F7B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Compression", "WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj", "{2D62850C-9F81-4BE9-BDF3-9379389C8F7B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Cab", "WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj", "{15895FD1-DD68-407B-8717-08F6DD14F02C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Compression.Cab", "WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj", "{15895FD1-DD68-407B-8717-08F6DD14F02C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Zip", "WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj", "{261F2857-B521-42A4-A3E0-B5165F225E50}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Compression.Zip", "WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj", "{261F2857-B521-42A4-A3E0-B5165F225E50}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Resources", "WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj", "{44931ECB-8D6F-4C12-A872-64E261B6A98E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Resources", "WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj", "{44931ECB-8D6F-4C12-A872-64E261B6A98E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller", "WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj", "{24121677-0ED0-41B5-833F-1B9A18E87BF4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.WindowsInstaller", "WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj", "{24121677-0ED0-41B5-833F-1B9A18E87BF4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Linq", "WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj", "{CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.WindowsInstaller.Linq", "WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj", "{CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Package", "WixToolset.Dtf.WindowsInstaller.Package\WixToolset.Dtf.WindowsInstaller.Package.csproj", "{1A9940A7-3E29-4428-B753-C4CC66058F1A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.WindowsInstaller.Package", "WixToolset.Dtf.WindowsInstaller.Package\WixToolset.Dtf.WindowsInstaller.Package.csproj", "{1A9940A7-3E29-4428-B753-C4CC66058F1A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression", "WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj", "{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression", "test\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj", "{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Cab", "WixToolsetTests.Dtf.Compression.Cab\WixToolsetTests.Dtf.Compression.Cab.csproj", "{4544158C-2D63-4146-85FF-62169280144E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Cab", "test\WixToolsetTests.Dtf.Compression.Cab\WixToolsetTests.Dtf.Compression.Cab.csproj", "{4544158C-2D63-4146-85FF-62169280144E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Zip", "WixToolsetTests.Dtf.Compression.Zip\WixToolsetTests.Dtf.Compression.Zip.csproj", "{328799BB-7B03-4B28-8180-4132211FD07D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Zip", "test\WixToolsetTests.Dtf.Compression.Zip\WixToolsetTests.Dtf.Compression.Zip.csproj", "{328799BB-7B03-4B28-8180-4132211FD07D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller", "WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj", "{16F5202F-9276-4166-975C-C9654BAF8012}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller", "test\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj", "{16F5202F-9276-4166-975C-C9654BAF8012}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.CustomActions", "WixToolsetTests.Dtf.WindowsInstaller.CustomActions\WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj", "{137D376B-989F-4FEA-9A67-01D8D38CA0DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.CustomActions", "test\WixToolsetTests.Dtf.WindowsInstaller.CustomActions\WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj", "{137D376B-989F-4FEA-9A67-01D8D38CA0DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.Linq", "WixToolsetTests.Dtf.WindowsInstaller.Linq\WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj", "{4F55F9B8-D8B6-41EB-8796-221B4CD98324}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.Linq", "test\WixToolsetTests.Dtf.WindowsInstaller.Linq\WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj", "{4F55F9B8-D8B6-41EB-8796-221B4CD98324}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{222DA0A6-5E28-4D7A-A227-B818B0C55BAB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.MakeSfxCA", "WixToolset.Dtf.MakeSfxCA\WixToolset.Dtf.MakeSfxCA.csproj", "{F8CA8E72-08BF-4A8A-AD32-C638616B72E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.CustomAction", "WixToolset.Dtf.CustomAction\WixToolset.Dtf.CustomAction.csproj", "{D6C0D94C-80A5-495C-B573-C7440A8594F5}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -129,8 +135,8 @@ Global
                 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x64.Build.0 = Debug|Any CPU
                 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x86.Build.0 = Debug|Any CPU
-                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.Build.0 = Release|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.Build.0 = Debug|Any CPU
                 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x64.ActiveCfg = Release|Any CPU
                 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x64.Build.0 = Release|Any CPU
                 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x86.ActiveCfg = Release|Any CPU
@@ -141,8 +147,8 @@ Global
                 {4544158C-2D63-4146-85FF-62169280144E}.Debug|x64.Build.0 = Debug|Any CPU
                 {4544158C-2D63-4146-85FF-62169280144E}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {4544158C-2D63-4146-85FF-62169280144E}.Debug|x86.Build.0 = Debug|Any CPU
-                {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.Build.0 = Debug|Any CPU
                 {4544158C-2D63-4146-85FF-62169280144E}.Release|x64.ActiveCfg = Release|Any CPU
                 {4544158C-2D63-4146-85FF-62169280144E}.Release|x64.Build.0 = Release|Any CPU
                 {4544158C-2D63-4146-85FF-62169280144E}.Release|x86.ActiveCfg = Release|Any CPU
@@ -153,8 +159,8 @@ Global
                 {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x64.Build.0 = Debug|Any CPU
                 {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x86.Build.0 = Debug|Any CPU
-                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.Build.0 = Release|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.Build.0 = Debug|Any CPU
                 {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x64.ActiveCfg = Release|Any CPU
                 {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x64.Build.0 = Release|Any CPU
                 {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x86.ActiveCfg = Release|Any CPU
@@ -165,8 +171,8 @@ Global
                 {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x64.Build.0 = Debug|Any CPU
                 {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x86.Build.0 = Debug|Any CPU
-                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.Build.0 = Release|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.Build.0 = Debug|Any CPU
                 {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x64.ActiveCfg = Release|Any CPU
                 {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x64.Build.0 = Release|Any CPU
                 {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x86.ActiveCfg = Release|Any CPU
@@ -177,8 +183,8 @@ Global
                 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x64.Build.0 = Debug|Any CPU
                 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x86.Build.0 = Debug|Any CPU
-                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.Build.0 = Release|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.Build.0 = Debug|Any CPU
                 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x64.ActiveCfg = Release|Any CPU
                 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x64.Build.0 = Release|Any CPU
                 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x86.ActiveCfg = Release|Any CPU
@@ -189,29 +195,47 @@ Global
                 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x64.Build.0 = Debug|Any CPU
                 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x86.Build.0 = Debug|Any CPU
-                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.Build.0 = Debug|Any CPU
                 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.ActiveCfg = Release|Any CPU
                 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.Build.0 = Release|Any CPU
                 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.ActiveCfg = Release|Any CPU
                 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.Build.0 = Release|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.Build.0 = Debug|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x86.Build.0 = Debug|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|Any CPU.Build.0 = Release|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x64.ActiveCfg = Release|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x64.Build.0 = Release|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x86.ActiveCfg = Release|Any CPU
-                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x86.Build.0 = Release|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x64.Build.0 = Debug|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x86.Build.0 = Debug|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|Any CPU.Build.0 = Release|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x64.ActiveCfg = Release|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x64.Build.0 = Release|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x86.ActiveCfg = Release|Any CPU
+                {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x86.Build.0 = Release|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x64.Build.0 = Debug|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x86.Build.0 = Debug|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|Any CPU.Build.0 = Release|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x64.ActiveCfg = Release|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x64.Build.0 = Release|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x86.ActiveCfg = Release|Any CPU
+                {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x86.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE
         EndGlobalSection
         GlobalSection(NestedProjects) = preSolution
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
+                {4544158C-2D63-4146-85FF-62169280144E} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
+                {328799BB-7B03-4B28-8180-4132211FD07D} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
+                {16F5202F-9276-4166-975C-C9654BAF8012} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
         EndGlobalSection
         GlobalSection(ExtensibilityGlobals) = postSolution
                 SolutionGuid = {BB57C98D-C0C2-4805-AED3-C19B47759DBD}
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs b/src/dtf/test/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs
index 981ecc69..981ecc69 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj b/src/dtf/test/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
index e751d405..636cedc6 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
@@ -1,6 +1,6 @@
 <?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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -24,11 +24,11 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
       <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
       <Name>WixToolset.Dtf.Compression</Name>
     </ProjectReference>
-    <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj">
       <Project>{E56C0ED3-FA2F-4CA9-A1C0-2E796BB0BF80}</Project>
       <Name>WixToolset.Dtf.Compression.Cab</Name>
     </ProjectReference>
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj b/src/dtf/test/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
index 6ee102ae..d46776d8 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
@@ -1,6 +1,6 @@
 <?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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -22,11 +22,11 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
       <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
       <Name>WixToolset.Dtf.Compression</Name>
     </ProjectReference>
-    <ProjectReference Include="..\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj">
       <Project>{E4C60A57-8AFE-4FF3-9058-ACAC6A069533}</Project>
       <Name>WixToolset.Dtf.Compression.Zip</Name>
     </ProjectReference>
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs b/src/dtf/test/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs
index b264ad5b..b264ad5b 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs b/src/dtf/test/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs
index e7a5373d..e7a5373d 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs b/src/dtf/test/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs
index 2531f3bc..2531f3bc 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs b/src/dtf/test/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs
index 98354d97..98354d97 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/test/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
index 194628a7..628d36c5 100644
--- a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
+++ b/src/dtf/test/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
@@ -1,6 +1,6 @@
 <?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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -25,7 +25,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
       <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
       <Name>WixToolset.Dtf.Compression</Name>
     </ProjectReference>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs
index bf843024..bf843024 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
index 27e0b499..a2f45fde 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
@@ -1,6 +1,6 @@
 <?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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid>
     <OutputType>Library</OutputType>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs
index 7776a1c3..7776a1c3 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
index a59e64d4..c34494b7 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
@@ -1,6 +1,6 @@
 <?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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -23,11 +23,11 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
       <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project>
       <Name>WixToolset.Dtf.WindowsInstaller</Name>
     </ProjectReference>
-    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj">
       <Project>{7E66313B-C6D4-4729-8422-4D1474E0E6F7}</Project>
       <Name>WixToolset.Dtf.WindowsInstaller.Linq</Name>
     </ProjectReference>
@@ -39,4 +39,4 @@
 
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="Pack" DependsOnTargets="Build" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs
index b0fc00a8..b0fc00a8 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs
index 26c172c9..26c172c9 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs
index f994dfef..f994dfef 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs
index 3bdf5acd..3bdf5acd 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs
index 644f1988..644f1988 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
index 0d2a50fb..eaa273ed 100644
--- a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
+++ b/src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
@@ -1,6 +1,6 @@
 <?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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -28,7 +28,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
+    <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
       <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project>
       <Name>WixToolset.Dtf.WindowsInstaller</Name>
     </ProjectReference>