62 files changed, 5344 insertions, 0 deletions

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
new file mode 100644
index 00000000..453aa442
--- /dev/null
+++ b/src/Cpp.Build.props
@@ -0,0 +1,101 @@
+<?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>
+  <PropertyGroup>
+    <Platform Condition=" '$(Platform)' == 'AnyCPU' ">Win32</Platform>
+    <BaseOutputPath>$(OutputPath)</BaseOutputPath>
+    <IntDir>$(BaseIntermediateOutputPath)$(Platform)\</IntDir>
+    <OutDir>$(OutputPath)$(Platform)\</OutDir>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+      <CallingConvention>StdCall</CallingConvention>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
+      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Link>
+      <SubSystem>$(ProjectSubSystem)</SubSystem>
+      <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
+      <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
+    <ClCompile>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
+    <ClCompile>
+      <CallingConvention>CDecl</CallingConvention>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
+    <ClCompile>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
+    <ClCompile>
+      <BasicRuntimeChecks></BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
+    <ClCompile>
+      <BasicRuntimeChecks></BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
+    <Link>
+      <KeyFile>$(LinkKeyFile)</KeyFile>
+      <DelaySign>$(LinkDelaySign)</DelaySign>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 00000000..63ad5d6e
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,22 @@
+<?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>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
+
+    <Authors>WiX Toolset Team</Authors>
+    <Company>WiX Toolset</Company>
+    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder>
+  </PropertyGroup>
+
+  <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " />
+  <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
+</Project>
diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props
new file mode 100644
index 00000000..e77fb386
--- /dev/null
+++ b/src/FindLocalWix.props
@@ -0,0 +1,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">
+  <PropertyGroup>
+    <WixTargetsPath Condition=" '$(Configuration)' != 'Release' And Exists('$(MSBuildThisFileDirectory)..\..\Core\build\Release\publish\wix.targets') ">$(MSBuildThisFileDirectory)..\..\Core\build\Release\publish\wix.targets</WixTargetsPath>
+  </PropertyGroup>
+</Project>
diff --git a/src/ca/dllmain.cpp b/src/ca/dllmain.cpp
new file mode 100644
index 00000000..35ae6d1c
--- /dev/null
+++ b/src/ca/dllmain.cpp
@@ -0,0 +1,26 @@
+// 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"
+
+/********************************************************************
+DllMain - standard entry point for all WiX custom actions
+
+********************************************************************/
+extern "C" BOOL WINAPI DllMain(
+    IN HINSTANCE hInst,
+    IN ULONG ulReason,
+    IN LPVOID)
+{
+    switch(ulReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        WcaGlobalInitialize(hInst);
+        break;
+
+    case DLL_PROCESS_DETACH:
+        WcaGlobalFinalize();
+        break;
+    }
+
+    return TRUE;
+}
diff --git a/src/ca/packages.config b/src/ca/packages.config
new file mode 100644
index 00000000..b74ff5d0
--- /dev/null
+++ b/src/ca/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.14.114" targetFramework="native" developmentDependency="true" />
+  <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" />
+  <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/ca/precomp.h b/src/ca/precomp.h
new file mode 100644
index 00000000..3edad7ed
--- /dev/null
+++ b/src/ca/precomp.h
@@ -0,0 +1,13 @@
+#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>
+
+#define MAXUINT USHRT_MAX
+#include <Setup.Configuration.h>
+
+#include "wcautil.h"
+#include "fileutil.h"
+#include "strutil.h"
diff --git a/src/ca/vsca.cpp b/src/ca/vsca.cpp
new file mode 100644
index 00000000..30174672
--- /dev/null
+++ b/src/ca/vsca.cpp
@@ -0,0 +1,432 @@
+// 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"
+
+typedef HRESULT (WINAPI *PFN_PROCESS_INSTANCE)(
+    __in_opt ISetupInstance* pInstance,
+    __in DWORD64 qwVersion,
+    __in BOOL fComplete
+    );
+
+struct VS_INSTANCE
+{
+    DWORD64 qwMinVersion;
+    DWORD64 qwMaxVersion;
+    PFN_PROCESS_INSTANCE pfnProcessInstance;
+};
+
+struct VS_COMPONENT_PROPERTY
+{
+    LPCWSTR pwzComponent;
+    LPCWSTR pwzProperty;
+};
+
+static HRESULT InstanceInProducts(
+    __in ISetupInstance* pInstance,
+    __in DWORD cProducts,
+    __in LPCWSTR* rgwzProducts
+    );
+
+static HRESULT InstanceIsGreater(
+    __in_opt ISetupInstance* pPreviousInstance,
+    __in DWORD64 qwPreviousVersion,
+    __in ISetupInstance* pCurrentInstance,
+    __in DWORD64 qwCurrentVersion
+    );
+
+static HRESULT ProcessInstance(
+    __in ISetupInstance* pInstance,
+    __in LPCWSTR wzProperty,
+    __in DWORD cComponents,
+    __in VS_COMPONENT_PROPERTY* rgComponents
+    );
+
+static HRESULT ProcessVS2017(
+    __in_opt ISetupInstance* pInstance,
+    __in DWORD64 qwVersion,
+    __in BOOL fComplete
+    );
+
+static HRESULT SetPropertyForComponent(
+    __in DWORD cComponents,
+    __in VS_COMPONENT_PROPERTY* rgComponents,
+    __in LPCWSTR wzComponent
+    );
+
+static VS_INSTANCE vrgInstances[] =
+{
+    { FILEMAKEVERSION(15, 0, 0, 0), FILEMAKEVERSION(15, 0xffff, 0xffff, 0xffff), ProcessVS2017 },
+};
+
+/******************************************************************
+ FindInstances - entry point for VS custom action to find instances
+
+*******************************************************************/
+extern "C" UINT __stdcall FindInstances(
+    __in MSIHANDLE hInstall
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    BOOL fComInitialized = FALSE;
+    ISetupConfiguration* pConfiguration = NULL;
+    ISetupHelper* pHelper = NULL;
+    IEnumSetupInstances* pEnumInstances = NULL;
+    ISetupInstance* rgpInstances[1] = {};
+    ISetupInstance* pInstance = NULL;
+    ULONG cInstancesFetched = 0;
+    BSTR bstrVersion = NULL;
+    DWORD64 qwVersion = 0;
+
+    hr = WcaInitialize(hInstall, "VSFindInstances");
+    ExitOnFailure(hr, "Failed to initialize custom action.");
+
+    hr = ::CoInitialize(NULL);
+    ExitOnFailure(hr, "Failed to initialize COM.");
+
+    fComInitialized = TRUE;
+
+    hr = ::CoCreateInstance(__uuidof(SetupConfiguration), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pConfiguration));
+    if (REGDB_E_CLASSNOTREG != hr)
+    {
+        ExitOnFailure(hr, "Failed to initialize setup configuration class.");
+    }
+    else
+    {
+        WcaLog(LOGMSG_VERBOSE, "Setup configuration not registered; assuming no instances installed.");
+
+        hr = S_OK;
+        ExitFunction();
+    }
+
+    hr = pConfiguration->QueryInterface(IID_PPV_ARGS(&pHelper));
+    if (FAILED(hr))
+    {
+        WcaLog(LOGMSG_VERBOSE, "Setup configuration helpers not implemented; assuming Visual Studio 2017.");
+
+        qwVersion = FILEMAKEVERSION(15, 0, 0, 0);
+        hr = S_OK;
+    }
+
+    hr = pConfiguration->EnumInstances(&pEnumInstances);
+    ExitOnFailure(hr, "Failed to get instance enumerator.");
+
+    do
+    {
+        hr = pEnumInstances->Next(1, rgpInstances, &cInstancesFetched);
+        if (SUCCEEDED(hr) && cInstancesFetched)
+        {
+            pInstance = rgpInstances[0];
+            if (pInstance)
+            {
+                if (pHelper)
+                {
+                    hr = pInstance->GetInstallationVersion(&bstrVersion);
+                    ExitOnFailure(hr, "Failed to get installation version.");
+
+                    hr = pHelper->ParseVersion(bstrVersion, &qwVersion);
+                    ExitOnFailure(hr, "Failed to parse installation version.");
+                }
+
+                for (DWORD i = 0; i < countof(vrgInstances); ++i)
+                {
+                    const VS_INSTANCE* pElem = &vrgInstances[i];
+
+                    if (pElem->qwMinVersion <= qwVersion && qwVersion <= pElem->qwMaxVersion)
+                    {
+                        hr = pElem->pfnProcessInstance(pInstance, qwVersion, FALSE);
+                        ExitOnFailure(hr, "Failed to process instance.");
+                    }
+                }
+            }
+
+            ReleaseNullBSTR(bstrVersion);
+            ReleaseNullObject(pInstance);
+        }
+    } while (SUCCEEDED(hr) && cInstancesFetched);
+
+    // Complete all registered processing functions.
+    for (DWORD i = 0; i < countof(vrgInstances); ++i)
+    {
+        const VS_INSTANCE* pElem = &vrgInstances[i];
+
+        if (pElem->qwMinVersion <= qwVersion && qwVersion <= pElem->qwMaxVersion)
+        {
+            hr = pElem->pfnProcessInstance(NULL, 0, TRUE);
+            ExitOnFailure(hr, "Failed to process latest instance.");
+        }
+    }
+
+LExit:
+    ReleaseBSTR(bstrVersion);
+    ReleaseObject(pInstance);
+    ReleaseObject(pEnumInstances);
+    ReleaseObject(pHelper);
+    ReleaseObject(pConfiguration);
+
+    if (fComInitialized)
+    {
+        ::CoUninitialize();
+    }
+
+    if (FAILED(hr))
+    {
+        er = ERROR_INSTALL_FAILURE;
+    }
+
+    return WcaFinalize(er);
+}
+
+static HRESULT InstanceInProducts(
+    __in ISetupInstance* pInstance,
+    __in DWORD cProducts,
+    __in LPCWSTR* rgwzProducts
+    )
+{
+    HRESULT hr = S_OK;
+    ISetupInstance2* pInstance2 = NULL;
+    ISetupPackageReference* pProduct = NULL;
+    BSTR bstrId = NULL;
+
+    hr = pInstance->QueryInterface(IID_PPV_ARGS(&pInstance2));
+    if (FAILED(hr))
+    {
+        // Older implementations shipped when only VS SKUs were supported.
+        WcaLog(LOGMSG_VERBOSE, "Could not query instance for product information; assuming supported product.");
+
+        hr = S_OK;
+        ExitFunction();
+    }
+
+    hr = pInstance2->GetProduct(&pProduct);
+    ExitOnFailure(hr, "Failed to get product package reference.");
+
+    hr = pProduct->GetId(&bstrId);
+    ExitOnFailure(hr, "Failed to get product package ID.");
+
+    for (DWORD i = 0; i < cProducts; ++i)
+    {
+        const LPCWSTR wzProduct = rgwzProducts[i];
+
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, bstrId, -1, wzProduct, -1))
+        {
+            hr = S_OK;
+            ExitFunction();
+        }
+    }
+
+    hr = S_FALSE;
+
+LExit:
+    ReleaseBSTR(bstrId);
+    ReleaseObject(pProduct);
+    ReleaseObject(pInstance2);
+
+    return hr;
+}
+
+static HRESULT InstanceIsGreater(
+    __in_opt ISetupInstance* pPreviousInstance,
+    __in DWORD64 qwPreviousVersion,
+    __in ISetupInstance* pCurrentInstance,
+    __in DWORD64 qwCurrentVersion
+    )
+{
+    HRESULT hr = S_OK;
+    FILETIME ftPreviousInstance = {};
+    FILETIME ftCurrentInstance = {};
+
+    if (qwPreviousVersion != qwCurrentVersion)
+    {
+        return qwPreviousVersion < qwCurrentVersion ? S_OK : S_FALSE;
+    }
+
+    hr = pPreviousInstance->GetInstallDate(&ftPreviousInstance);
+    ExitOnFailure(hr, "Failed to get previous install date.");
+
+    hr = pCurrentInstance->GetInstallDate(&ftCurrentInstance);
+    ExitOnFailure(hr, "Failed to get current install date.");
+
+    return 0 > ::CompareFileTime(&ftPreviousInstance, &ftCurrentInstance) ? S_OK : S_FALSE;
+
+LExit:
+    return hr;
+}
+
+static HRESULT ProcessInstance(
+    __in ISetupInstance* pInstance,
+    __in LPCWSTR wzProperty,
+    __in DWORD cComponents,
+    __in VS_COMPONENT_PROPERTY* rgComponents
+    )
+{
+    HRESULT hr = S_OK;
+    ISetupInstance2* pInstance2 = NULL;
+    BSTR bstrPath = NULL;
+    LPSAFEARRAY psaPackages = NULL;
+    LONG lPackageIndex = 0;
+    LONG clMaxPackages = 0;
+    ISetupPackageReference** rgpPackages = NULL;
+    ISetupPackageReference* pPackage = NULL;
+    BSTR bstrPackageId = NULL;
+
+    hr = pInstance->GetInstallationPath(&bstrPath);
+    ExitOnFailure(hr, "Failed to get installation path.");
+
+    hr = WcaSetProperty(wzProperty, bstrPath);
+    ExitOnFailure(hr, "Failed to set installation path property: %ls", wzProperty);
+
+    hr = pInstance->QueryInterface(IID_PPV_ARGS(&pInstance2));
+    if (FAILED(hr))
+    {
+        // Older implementation did not expose installed components.
+        hr = S_OK;
+        ExitFunction();
+    }
+
+    hr = pInstance2->GetPackages(&psaPackages);
+    ExitOnFailure(hr, "Failed to get packages from instance.");
+
+    hr = ::SafeArrayGetLBound(psaPackages, 1, &lPackageIndex);
+    ExitOnFailure(hr, "Failed to get lower bound of packages array.");
+
+    hr = ::SafeArrayGetUBound(psaPackages, 1, &clMaxPackages);
+    ExitOnFailure(hr, "Failed to get upper bound of packages array.");
+
+    // Faster access to single dimension SAFEARRAY elements.
+    hr = ::SafeArrayAccessData(psaPackages, reinterpret_cast<LPVOID*>(&rgpPackages));
+    ExitOnFailure(hr, "Failed to access packages array.")
+
+    for (; lPackageIndex <= clMaxPackages; ++lPackageIndex)
+    {
+        pPackage = rgpPackages[lPackageIndex];
+
+        if (pPackage)
+        {
+            hr = pPackage->GetId(&bstrPackageId);
+            ExitOnFailure(hr, "Failed to get package ID.");
+
+            hr = SetPropertyForComponent(cComponents, rgComponents, bstrPackageId);
+            ExitOnFailure(hr, "Failed to set property for component: %ls", bstrPackageId);
+
+            ReleaseNullBSTR(bstrPackageId);
+        }
+    }
+
+LExit:
+    ReleaseBSTR(bstrPackageId);
+
+    if (rgpPackages)
+    {
+        ::SafeArrayUnaccessData(psaPackages);
+    }
+
+    if (psaPackages)
+    {
+        // This will Release() all objects in the array.
+        ::SafeArrayDestroy(psaPackages);
+    }
+
+    ReleaseObject(pInstance2);
+    ReleaseBSTR(bstrPath);
+
+    return hr;
+}
+
+static HRESULT ProcessVS2017(
+    __in_opt ISetupInstance* pInstance,
+    __in DWORD64 qwVersion,
+    __in BOOL fComplete
+    )
+{
+    static ISetupInstance* pLatest = NULL;
+    static DWORD64 qwLatest = 0;
+
+    static LPCWSTR rgwzProducts[] =
+    {
+        L"Microsoft.VisualStudio.Product.Community",
+        L"Microsoft.VisualStudio.Product.Professional",
+        L"Microsoft.VisualStudio.Product.Enterprise",
+    };
+
+    // TODO: Consider making table-driven with these defaults per-version for easy customization.
+    static VS_COMPONENT_PROPERTY rgComponents[] =
+    {
+        { L"Microsoft.VisualStudio.Component.FSharp", L"VS2017_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" },
+        { L"Microsoft.VisualStudio.Component.Roslyn.LanguageServices", L"VS2017_IDE_VB_PROJECTSYSTEM_INSTALLED" },
+        { L"Microsoft.VisualStudio.Component.Roslyn.LanguageServices", L"VS2017_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" },
+        { L"Microsoft.VisualStudio.Component.TestTools.Core", L"VS2017_IDE_VSTS_TESTSYSTEM_INSTALLED" },
+        { L"Microsoft.VisualStudio.Component.VC.CoreIde", L"VS2017_IDE_VC_PROJECTSYSTEM_INSTALLED" },
+        { L"Microsoft.VisualStudio.Component.Web", L"VS2017_IDE_VWD_PROJECTSYSTEM_INSTALLED" },
+        { L"Microsoft.VisualStudio.PackageGroup.DslRuntime", L"VS2017_IDE_MODELING_PROJECTSYSTEM_INSTALLED" },
+    };
+
+    HRESULT hr = S_OK;
+
+    if (fComplete)
+    {
+        if (pLatest)
+        {
+            hr = ProcessInstance(pLatest, L"VS2017_ROOT_FOLDER", countof(rgComponents), rgComponents);
+            ExitOnFailure(hr, "Failed to process VS2017 instance.");
+        }
+    }
+    else if (pInstance)
+    {
+        hr = InstanceInProducts(pInstance, countof(rgwzProducts), rgwzProducts);
+        ExitOnFailure(hr, "Failed to compare product IDs.");
+
+        if (S_FALSE == hr)
+        {
+            ExitFunction();
+        }
+
+        hr = InstanceIsGreater(pLatest, qwLatest, pInstance, qwVersion);
+        ExitOnFailure(hr, "Failed to compare instances.");
+
+        if (S_FALSE == hr)
+        {
+            ExitFunction();
+        }
+
+        ReleaseNullObject(pLatest);
+
+        pLatest = pInstance;
+        qwLatest = qwVersion;
+
+        // Caller will do a final Release() otherwise.
+        pLatest->AddRef();
+    }
+
+LExit:
+    if (fComplete)
+    {
+        ReleaseObject(pLatest);
+    }
+
+    return hr;
+}
+
+static HRESULT SetPropertyForComponent(
+    __in DWORD cComponents,
+    __in VS_COMPONENT_PROPERTY* rgComponents,
+    __in LPCWSTR wzComponent
+    )
+{
+    HRESULT hr = S_OK;
+
+    // For small arrays, faster looping through than hashing. There may also be duplicates like with VS2017.
+    for (DWORD i = 0; i < cComponents; ++i)
+    {
+        const VS_COMPONENT_PROPERTY* pComponent = &rgComponents[i];
+
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pComponent->pwzComponent, -1, wzComponent, -1))
+        {
+            hr = WcaSetIntProperty(pComponent->pwzProperty, 1);
+            ExitOnFailure(hr, "Failed to set property: %ls", pComponent->pwzProperty);
+        }
+    }
+
+LExit:
+    return hr;
+}
diff --git a/src/ca/vsca.def b/src/ca/vsca.def
new file mode 100644
index 00000000..fd2db98e
--- /dev/null
+++ b/src/ca/vsca.def
@@ -0,0 +1,7 @@
+; 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      "vsca"
+
+EXPORTS
+        FindInstances
diff --git a/src/ca/vsca.vcxproj b/src/ca/vsca.vcxproj
new file mode 100644
index 00000000..c52840bf
--- /dev/null
+++ b/src/ca/vsca.vcxproj
@@ -0,0 +1,69 @@
+<?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">
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{45308B85-0628-4978-8FC8-6AD9E1AD5949}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <TargetName>vsca</TargetName>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile>
+    <Description>WiX Toolset VS CustomAction</Description>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+
+  <ImportGroup Label="Shared">
+    <Import Project="..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
+  </ImportGroup>
+
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="vsca.cpp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="vsca.def" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" />
+  </Target>
+</Project>
diff --git a/src/wixext/Data/messages.xml b/src/wixext/Data/messages.xml
new file mode 100644
index 00000000..d1c85301
--- /dev/null
+++ b/src/wixext/Data/messages.xml
@@ -0,0 +1,133 @@
+<?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. -->
+
+
+<Messages Namespace="WixToolset.Extensions" Resources="Data.Messages" xmlns="http://schemas.microsoft.com/genmsgs/2004/07/messages">
+    <Class Name="VSErrors" ContainerName="VSErrorEventArgs" BaseContainerName="MessageEventArgs">
+        <Message Id="InvalidOutputGroup" Number="5301" SourceLineNumbers="no">
+            <Instance>
+                Invalid project output group: {0}.
+                <Parameter Type="System.String" Name="outputGroup" />
+            </Instance>
+        </Message>
+        <Message Id="NoOutputGroupSpecified" Number="5302" SourceLineNumbers="no">
+            <Instance>
+                No project output group specified.
+            </Instance>
+        </Message>
+        <Message Id="CannotLoadMSBuildAssembly" Number="5303" SourceLineNumbers="no">
+            <Instance>
+                Failed to load MSBuild assembly: {0}
+                <Parameter Type="System.String" Name="innerExceptionMessage" />
+            </Instance>
+        </Message>
+        <Message Id="CannotLoadMSBuildEngine" Number="5304" SourceLineNumbers="no">
+            <Instance>
+                Failed to load MSBuild engine: {0}
+                <Parameter Type="System.String" Name="innerExceptionMessage" />
+            </Instance>
+        </Message>
+        <Message Id="CannotLoadProject" Number="5305" SourceLineNumbers="no">
+            <Instance>
+                Failed to load project {0}: {1}
+                <Parameter Type="System.String" Name="projectFile" />
+                <Parameter Type="System.String" Name="innerExceptionMessage" />
+            </Instance>
+        </Message>
+        <Message Id="CannotBuildProject" Number="5306" SourceLineNumbers="no">
+            <Instance>
+                Failed to build project {0}: {1}
+                <Parameter Type="System.String" Name="projectFile" />
+                <Parameter Type="System.String" Name="innerExceptionMessage" />
+            </Instance>
+        </Message>
+        <Message Id="BuildFailed" Number="5307" SourceLineNumbers="no">
+            <Instance>
+                Build failed.
+            </Instance>
+        </Message>
+        <Message Id="MissingProjectOutputGroup" Number="5308" SourceLineNumbers="no">
+            <Instance>
+                Missing project output group '{1}' in project {0}.
+                <Parameter Type="System.String" Name="projectFile" />
+                <Parameter Type="System.String" Name="outputGroup" />
+            </Instance>
+        </Message>
+        <Message Id="DirectoryAttributeAccessorBadType" Number="5309" SourceLineNumbers="no">
+            <Instance>
+                DirectoryAttributeAccessor tried to access an invalid element type for attribute '{0'}.
+                <Parameter Type="System.String" Name="attributeName" />
+            </Instance>
+        </Message>
+        <Message Id="InvalidOutputType" Number="5310" SourceLineNumbers="no">
+            <Instance>
+                Invalid generated type: {0}. Must be one of: components, container, payloadgroup, layout.
+                <Parameter Type="System.String" Name="generateType" />
+            </Instance>
+        </Message>
+        <Message Id="InvalidDirectoryId" Number="5311" SourceLineNumbers="no">
+            <Instance>
+                Invalid directory ID: {0}. Check that it doesn't start with a hyphen or slash.
+                <Parameter Type="System.String" Name="generateType" />
+            </Instance>
+        </Message>
+        <Message Id="InvalidProjectName" Number="5312" SourceLineNumbers="no">
+            <Instance>
+                Invalid project name: {0}. Check that it doesn't start with a hyphen or slash.
+                <Parameter Type="System.String" Name="generateType" />
+            </Instance>
+        </Message>
+        <Message Id="BuildErrorDuringHarvesting" Number="5313" SourceLineNumbers="no">
+            <Instance>
+              Build error during harvesting: {0}
+              <Parameter Type="System.String" Name="buildError" />
+            </Instance>
+        </Message>
+        <Message Id="CannotLoadMSBuildWrapperAssembly" Number="5314" SourceLineNumbers="no">
+            <Instance>
+                Failed to load MSBuild wrapper assembly: {0}
+                <Parameter Type="System.String" Name="innerExceptionMessage" />
+            </Instance>
+        </Message>
+        <Message Id="CannotLoadMSBuildWrapperType" Number="5315" SourceLineNumbers="no">
+            <Instance>
+                Failed to load MSBuild wrapper type: {0}
+                <Parameter Type="System.String" Name="innerExceptionMessage" />
+            </Instance>
+        </Message>
+        <Message Id="CannotLoadMSBuildWrapperObject" Number="5316" SourceLineNumbers="no">
+            <Instance>
+                Failed to load MSBuild wrapper object: {0}
+                <Parameter Type="System.String" Name="innerExceptionMessage" />
+            </Instance>
+        </Message>
+    </Class>
+    <Class Name="VSWarnings" ContainerName="VSWarningEventArgs" BaseContainerName="MessageEventArgs">
+      <Message Id="NoLogger" Number="5399" SourceLineNumbers="no">
+        <Instance>
+          Failed to set loggers: {0}
+          <Parameter Type="System.String" Name="exceptionMessage" />
+        </Instance>
+      </Message>
+      <Message Id="NoProjectConfiguration" Number="5398" SourceLineNumbers="no">
+        <Instance>
+          Failed to set project configuration and platform: {0}
+          <Parameter Type="System.String" Name="exceptionMessage" />
+        </Instance>
+      </Message>
+    </Class>
+    <Class Name="VSVerboses" ContainerName="VSVerboseEventArgs" BaseContainerName="MessageEventArgs">
+      <Message Id="FoundToolsVersion" Number="5379" SourceLineNumbers="no">
+        <Instance>
+          Found ToolsVersion {0} inside project file.
+          <Parameter Type="System.String" Name="toolsVersion" />
+        </Instance>
+      </Message>
+      <Message Id="LoadingProject" Number="5378" SourceLineNumbers="no">
+        <Instance>
+          Loading project using MSBuild version {0}.
+          <Parameter Type="System.String" Name="msbuildVersion" />
+        </Instance>
+      </Message>
+    </Class>
+</Messages>
diff --git a/src/wixext/Data/tables.xml b/src/wixext/Data/tables.xml
new file mode 100644
index 00000000..e9c86097
--- /dev/null
+++ b/src/wixext/Data/tables.xml
@@ -0,0 +1,66 @@
+<?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. -->
+
+
+<tableDefinitions xmlns="http://wixtoolset.org/schemas/v4/wi/tables">
+    <tableDefinition name="HelpFile" createSymbols="yes">
+        <columnDefinition name="HelpFileKey" type="string" length="72" primaryKey="yes" modularize="column"
+            category="identifier" description="Primary Key for HelpFile Table (required)."/>
+        <columnDefinition name="HelpFileName" type="string" length="72"
+            category="text" description="Internal Microsoft Help ID for this HelpFile (required)."/>
+        <columnDefinition name="LangID" type="number" length="2" nullable="yes"
+            category="language" description="Language ID for content file (optional)."/>
+        <columnDefinition name="File_HxS" type="string" length="72" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for HxS (Title) file (required)."/>
+        <columnDefinition name="File_HxI" type="string" length="72" nullable="yes" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for HxI (Index) file (optional)."/>
+        <columnDefinition name="File_HxQ" type="string" length="72" nullable="yes" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for HxQ (Query) file (optional)."/>
+        <columnDefinition name="File_HxR" type="string" length="72" nullable="yes" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for HxR (Attributes) file (optional)."/>
+        <columnDefinition name="File_Samples" type="string" length="72" nullable="yes" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for a file that is in the 'root' of the samples directory for this HelpFile (optional)."/>
+    </tableDefinition>
+    <tableDefinition name="HelpFileToNamespace">
+        <columnDefinition name="HelpFile_" type="string" length="72" primaryKey="yes" modularize="column"
+            keyTable="HelpFile" keyColumn="1" category="identifier" description="Foreign key into HelpFile table (required)."/>
+        <columnDefinition name="HelpNamespace_" type="string" length="72" primaryKey="yes"
+            keyTable="HelpNamespace" keyColumn="1" category="identifier" description="Foreign key into HelpNamespace table (required)."/>
+    </tableDefinition>
+    <tableDefinition name="HelpFilter" createSymbols="yes">
+        <columnDefinition name="FilterKey" type="string" length="72" primaryKey="yes" modularize="column"
+            category="identifier" description="Primary Key for HelpFilter (required)."/>
+        <columnDefinition name="Description" type="localized" length="0"
+            category="text" description="Friendly name for Filter (required)."/>
+        <columnDefinition name="QueryString" type="string" length="0" nullable="yes"
+            category="text" description="Query String for Help Filter (optional)."/>
+    </tableDefinition>
+    <tableDefinition name="HelpFilterToNamespace">
+        <columnDefinition name="HelpFilter_" type="string" length="72" primaryKey="yes" modularize="column"
+            keyTable="HelpFilter" keyColumn="1" category="identifier" description="Foreign key into HelpFilter table (required)."/>
+        <columnDefinition name="HelpNamespace_" type="string" length="72" primaryKey="yes"
+            keyTable="HelpNamespace" keyColumn="1" category="identifier" description="Foreign key into HelpNamespace table (required)."/>
+    </tableDefinition>
+    <tableDefinition name="HelpNamespace" createSymbols="yes">
+        <columnDefinition name="NamespaceKey" type="string" length="72" primaryKey="yes"
+            category="identifier" description="Primary Key for HelpNamespace (required)."/>
+        <columnDefinition name="NamespaceName" type="string" length="0"
+            category="text" description="Internal Microsoft Help ID for this Namespace (required)."/>
+        <columnDefinition name="File_Collection" type="string" length="72" modularize="column"
+            keyTable="File" keyColumn="1" category="text" description="Key for HxC (Collection) file (required)."/>
+        <columnDefinition name="Description" type="localized" length="0" nullable="yes"
+            category="text" description="Friendly name for Namespace (optional)."/>
+    </tableDefinition>
+    <tableDefinition name="HelpPlugin">
+        <columnDefinition name="HelpNamespace_" type="string" length="72" primaryKey="yes"
+            keyTable="HelpNamespace" keyColumn="1" category="identifier" description="Forein Key into HelpNamespace table for the child namespace that will be plugged into the parent namespace (required)."/>
+        <columnDefinition name="HelpNamespace_Parent" type="string" length="72" primaryKey="yes"
+            category="identifier" description="Forein Key into HelpNamespace table for the parent namespace into which the child will be inserted (required)."/>
+        <columnDefinition name="File_HxT" type="string" length="72" nullable="yes" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for HxT  file of child namespace (optional)."/>
+        <columnDefinition name="File_HxA" type="string" length="72" nullable="yes" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for HxA (Attributes) file of child namespace (optional)."/>
+        <columnDefinition name="File_ParentHxT" type="string" length="72" nullable="yes" modularize="column"
+            keyTable="File" keyColumn="1" category="identifier" description="Key for HxT  file of parent namespace that now includes the new child namespace (optional)."/>
+    </tableDefinition>
+</tableDefinitions>
diff --git a/src/wixext/VSCompiler.cs b/src/wixext/VSCompiler.cs
new file mode 100644
index 00000000..cf6226dd
--- /dev/null
+++ b/src/wixext/VSCompiler.cs
@@ -0,0 +1,835 @@
+// 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.Extensions
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Xml.Linq;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+
+    /// <summary>
+    /// The compiler for the WiX Toolset Visual Studio Extension.
+    /// </summary>
+    public sealed class VSCompiler : CompilerExtension
+    {
+        internal const int MsidbCustomActionTypeExe = 0x00000002;  // Target = command line args
+        internal const int MsidbCustomActionTypeProperty = 0x00000030;  // Source = full path to executable
+        internal const int MsidbCustomActionTypeContinue = 0x00000040;  // ignore action return status; continue running
+        internal const int MsidbCustomActionTypeRollback = 0x00000100;  // in conjunction with InScript: queue in Rollback script
+        internal const int MsidbCustomActionTypeInScript = 0x00000400;  // queue for execution within script
+        internal const int MsidbCustomActionTypeNoImpersonate = 0x00000800;  // queue for not impersonating
+
+        /// <summary>
+        /// Instantiate a new HelpCompiler.
+        /// </summary>
+        public VSCompiler()
+        {
+            this.Namespace = "http://wixtoolset.org/schemas/v4/wxs/vs";
+        }
+
+        /// <summary>
+        /// Processes an element for the Compiler.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Source line number for the parent element.</param>
+        /// <param name="parentElement">Parent element of element to process.</param>
+        /// <param name="element">Element to process.</param>
+        /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
+        public override void ParseElement(XElement parentElement, XElement element, IDictionary<string, string> context)
+        {
+            switch (parentElement.Name.LocalName)
+            {
+                case "Component":
+                    switch (element.Name.LocalName)
+                    {
+                        case "VsixPackage":
+                            this.ParseVsixPackageElement(element, context["ComponentId"], null);
+                            break;
+                        default:
+                            this.Core.UnexpectedElement(parentElement, element);
+                            break;
+                    }
+                    break;
+                case "File":
+                    switch (element.Name.LocalName)
+                    {
+                        case "HelpCollection":
+                            this.ParseHelpCollectionElement(element, context["FileId"]);
+                            break;
+                        case "HelpFile":
+                            this.ParseHelpFileElement(element, context["FileId"]);
+                            break;
+                        case "VsixPackage":
+                            this.ParseVsixPackageElement(element, context["ComponentId"], context["FileId"]);
+                            break;
+                        default:
+                            this.Core.UnexpectedElement(parentElement, element);
+                            break;
+                    }
+                    break;
+                case "Fragment":
+                case "Module":
+                case "Product":
+                    switch (element.Name.LocalName)
+                    {
+                        case "HelpCollectionRef":
+                            this.ParseHelpCollectionRefElement(element);
+                            break;
+                        case "HelpFilter":
+                            this.ParseHelpFilterElement(element);
+                            break;
+                        default:
+                            this.Core.UnexpectedElement(parentElement, element);
+                            break;
+                    }
+                    break;
+                default:
+                    this.Core.UnexpectedElement(parentElement, element);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Parses a HelpCollectionRef element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        private void ParseHelpCollectionRefElement(XElement node)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string id = null;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, "HelpNamespace", id);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == id)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            foreach (XElement child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    SourceLineNumber childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
+                    switch (child.Name.LocalName)
+                    {
+                        case "HelpFileRef":
+                            this.ParseHelpFileRefElement(child, id);
+                            break;
+                        default:
+                            this.Core.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionElement(node, child);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses a HelpCollection element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        /// <param name="fileId">Identifier of the parent File element.</param>
+        private void ParseHelpCollectionElement(XElement node, string fileId)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string id = null;
+            string description = null;
+            string name = null;
+            YesNoType suppressCAs = YesNoType.No;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Description":
+                            description = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Name":
+                            name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SuppressCustomActions":
+                            suppressCAs = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == id)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            if (null == description)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Description"));
+            }
+
+            if (null == name)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
+            }
+
+            foreach (XElement child in node.Elements())
+            {
+                if (this.Namespace == child.Name.Namespace)
+                {
+                    switch (child.Name.LocalName)
+                    {
+                        case "HelpFileRef":
+                            this.ParseHelpFileRefElement(child, id);
+                            break;
+                        case "HelpFilterRef":
+                            this.ParseHelpFilterRefElement(child, id);
+                            break;
+                        case "PlugCollectionInto":
+                            this.ParsePlugCollectionIntoElement(child, id);
+                            break;
+                        default:
+                            this.Core.UnexpectedElement(node, child);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionElement(node, child);
+                }
+            }
+
+            if (!this.Core.EncounteredError)
+            {
+                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpNamespace");
+                row[0] = id;
+                row[1] = name;
+                row[2] = fileId;
+                row[3] = description;
+
+                if (YesNoType.No == suppressCAs)
+                {
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses a HelpFile element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        /// <param name="fileId">Identifier of the parent file element.</param>
+        private void ParseHelpFileElement(XElement node, string fileId)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string id = null;
+            string name = null;
+            int language = CompilerConstants.IntegerNotSet;
+            string hxi = null;
+            string hxq = null;
+            string hxr = null;
+            string samples = null;
+            YesNoType suppressCAs = YesNoType.No;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "AttributeIndex":
+                            hxr = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", hxr);
+                            break;
+                        case "Index":
+                            hxi = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", hxi);
+                            break;
+                        case "Language":
+                            language = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
+                            break;
+                        case "Name":
+                            name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SampleLocation":
+                            samples = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", samples);
+                            break;
+                        case "Search":
+                            hxq = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, "File", hxq);
+                            break;
+                        case "SuppressCustomActions":
+                            suppressCAs = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == id)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            if (null == name)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
+            }
+
+            //uninstall will always fail silently, leaving file registered, if Language is not set
+            if (CompilerConstants.IntegerNotSet == language)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Language"));
+            }
+
+            this.Core.ParseForExtensionElements(node);
+
+            if (!this.Core.EncounteredError)
+            {
+                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFile");
+                row[0] = id;
+                row[1] = name;
+                row[2] = language;
+                row[3] = fileId;
+                row[4] = hxi;
+                row[5] = hxq;
+                row[6] = hxr;
+                row[7] = samples;
+
+                if (YesNoType.No == suppressCAs)
+                {
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses a HelpFileRef element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        /// <param name="collectionId">Identifier of the parent help collection.</param>
+        private void ParseHelpFileRefElement(XElement node, string collectionId)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string id = null;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, "HelpFile", id);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == id)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            this.Core.ParseForExtensionElements(node);
+
+            if (!this.Core.EncounteredError)
+            {
+                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFileToNamespace");
+                row[0] = id;
+                row[1] = collectionId;
+            }
+        }
+
+        /// <summary>
+        /// Parses a HelpFilter element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        private void ParseHelpFilterElement(XElement node)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string id = null;
+            string filterDefinition = null;
+            string name = null;
+            YesNoType suppressCAs = YesNoType.No;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "FilterDefinition":
+                            filterDefinition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Name":
+                            name = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SuppressCustomActions":
+                            suppressCAs = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == id)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            if (null == name)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
+            }
+
+            this.Core.ParseForExtensionElements(node);
+
+            if (!this.Core.EncounteredError)
+            {
+                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFilter");
+                row[0] = id;
+                row[1] = name;
+                row[2] = filterDefinition;
+
+                if (YesNoType.No == suppressCAs)
+                {
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses a HelpFilterRef element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        /// <param name="collectionId">Identifier of the parent help collection.</param>
+        private void ParseHelpFilterRefElement(XElement node, string collectionId)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string id = null;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.Core.CreateSimpleReference(sourceLineNumbers, "HelpFilter", id);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (null == id)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+            }
+
+            this.Core.ParseForExtensionElements(node);
+
+            if (!this.Core.EncounteredError)
+            {
+                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpFilterToNamespace");
+                row[0] = id;
+                row[1] = collectionId;
+            }
+        }
+
+        /// <summary>
+        /// Parses a PlugCollectionInto element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        /// <param name="parentId">Identifier of the parent help collection.</param>
+        private void ParsePlugCollectionIntoElement(XElement node, string parentId)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string hxa = null;
+            string hxt = null;
+            string hxtParent = null;
+            string namespaceParent = null;
+            string feature = null;
+            YesNoType suppressExternalNamespaces = YesNoType.No;
+            bool pluginVS05 = false;
+            bool pluginVS08 = false;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Attributes":
+                            hxa = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "TableOfContents":
+                            hxt = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "TargetCollection":
+                            namespaceParent = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "TargetTableOfContents":
+                            hxtParent = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "TargetFeature":
+                            feature = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SuppressExternalNamespaces":
+                            suppressExternalNamespaces = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            pluginVS05 = namespaceParent.Equals("MS_VSIPCC_v80", StringComparison.Ordinal);
+            pluginVS08 = namespaceParent.Equals("MS.VSIPCC.v90", StringComparison.Ordinal);
+
+            if (null == namespaceParent)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "TargetCollection"));
+            }
+
+            if (null == feature && (pluginVS05 || pluginVS08) && YesNoType.No == suppressExternalNamespaces)
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "TargetFeature"));
+            }
+
+            this.Core.ParseForExtensionElements(node);
+
+            if (!this.Core.EncounteredError)
+            {
+                Row row = this.Core.CreateRow(sourceLineNumbers, "HelpPlugin");
+                row[0] = parentId;
+                row[1] = namespaceParent;
+                row[2] = hxt;
+                row[3] = hxa;
+                row[4] = hxtParent;
+
+                if (pluginVS05)
+                {
+                    if (YesNoType.No == suppressExternalNamespaces)
+                    {
+                        // Bring in the help 2 base namespace components for VS 2005
+                        this.Core.CreateComplexReference(sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
+                            ComplexReferenceChildType.ComponentGroup, "Help2_VS2005_Namespace_Components", false);
+                        // Reference CustomAction since nothing will happen without it
+                        this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction",
+                            "CA_HxMerge_VSIPCC_VSCC");
+                    }
+                }
+                else if (pluginVS08)
+                {
+                    if (YesNoType.No == suppressExternalNamespaces)
+                    {
+                        // Bring in the help 2 base namespace components for VS 2008
+                        this.Core.CreateComplexReference(sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
+                            ComplexReferenceChildType.ComponentGroup, "Help2_VS2008_Namespace_Components", false);
+                        // Reference CustomAction since nothing will happen without it
+                        this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction",
+                            "CA_ScheduleExtHelpPlugin_VSCC_VSIPCC");
+                    }
+                }
+                else
+                {
+                    // Reference the parent namespace to enforce the foreign key relationship
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "HelpNamespace",
+                        namespaceParent);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses a VsixPackage element.
+        /// </summary>
+        /// <param name="node">Element to process.</param>
+        /// <param name="componentId">Identifier of the parent Component element.</param>
+        /// <param name="fileId">Identifier of the parent File element.</param>
+        private void ParseVsixPackageElement(XElement node, string componentId, string fileId)
+        {
+            SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
+            string propertyId = "VS_VSIX_INSTALLER_PATH";
+            string packageId = null;
+            YesNoType permanent = YesNoType.NotSet;
+            string target = null;
+            string targetVersion = null;
+            YesNoType vital = YesNoType.NotSet;
+
+            foreach (XAttribute attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "File":
+                            if (String.IsNullOrEmpty(fileId))
+                            {
+                                fileId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            }
+                            else
+                            {
+                                this.Core.OnMessage(WixErrors.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, "File", "File"));
+                            }
+                            break;
+                        case "PackageId":
+                            packageId = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Permanent":
+                            permanent = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Target":
+                            target = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (target.ToLowerInvariant())
+                            {
+                                case "integrated":
+                                case "integratedshell":
+                                    target = "IntegratedShell";
+                                    break;
+                                case "professional":
+                                    target = "Pro";
+                                    break;
+                                case "premium":
+                                    target = "Premium";
+                                    break;
+                                case "ultimate":
+                                    target = "Ultimate";
+                                    break;
+                                case "vbexpress":
+                                    target = "VBExpress";
+                                    break;
+                                case "vcexpress":
+                                    target = "VCExpress";
+                                    break;
+                                case "vcsexpress":
+                                    target = "VCSExpress";
+                                    break;
+                                case "vwdexpress":
+                                    target = "VWDExpress";
+                                    break;
+                            }
+                            break;
+                        case "TargetVersion":
+                            targetVersion = this.Core.GetAttributeVersionValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Vital":
+                            vital = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            break;
+                        case "VsixInstallerPathProperty":
+                            propertyId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.Core.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.Core.ParseExtensionAttribute(node, attrib);
+                }
+            }
+
+            if (String.IsNullOrEmpty(fileId))
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "File"));
+            }
+
+            if (String.IsNullOrEmpty(packageId))
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PackageId"));
+            }
+
+            if (!String.IsNullOrEmpty(target) && String.IsNullOrEmpty(targetVersion))
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "TargetVersion", "Target"));
+            }
+            else if (String.IsNullOrEmpty(target) && !String.IsNullOrEmpty(targetVersion))
+            {
+                this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Target", "TargetVersion"));
+            }
+
+            this.Core.ParseForExtensionElements(node);
+
+            if (!this.Core.EncounteredError)
+            {
+                // Ensure there is a reference to the AppSearch Property that will find the VsixInstaller.exe.
+                this.Core.CreateSimpleReference(sourceLineNumbers, "Property", propertyId);
+
+                // Ensure there is a reference to the package file (even if we are a child under it).
+                this.Core.CreateSimpleReference(sourceLineNumbers, "File", fileId);
+
+                string cmdlinePrefix = "/q ";
+
+                if (!String.IsNullOrEmpty(target))
+                {
+                    cmdlinePrefix = String.Format("{0} /skuName:{1} /skuVersion:{2}", cmdlinePrefix, target, targetVersion);
+                }
+
+                string installAfter = "WriteRegistryValues"; // by default, come after the registry key registration.
+                int installExtraBits = VSCompiler.MsidbCustomActionTypeInScript;
+
+                // If the package is not vital, mark the install action as continue.
+                if (vital == YesNoType.No)
+                {
+                    installExtraBits |= VSCompiler.MsidbCustomActionTypeContinue;
+                }
+                else // the package is vital so ensure there is a rollback action scheduled.
+                {
+                    Identifier rollbackNamePerUser = this.Core.CreateIdentifier("vru", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
+                    Identifier rollbackNamePerMachine = this.Core.CreateIdentifier("vrm", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
+                    string rollbackCmdLinePerUser = String.Concat(cmdlinePrefix, " /u:\"", packageId, "\"");
+                    string rollbackCmdLinePerMachine = String.Concat(rollbackCmdLinePerUser, " /admin");
+                    int rollbackExtraBitsPerUser = VSCompiler.MsidbCustomActionTypeContinue | VSCompiler.MsidbCustomActionTypeRollback | VSCompiler.MsidbCustomActionTypeInScript;
+                    int rollbackExtraBitsPerMachine = rollbackExtraBitsPerUser | VSCompiler.MsidbCustomActionTypeNoImpersonate;
+                    string rollbackConditionPerUser = String.Format("NOT ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
+                    string rollbackConditionPerMachine = String.Format("ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
+
+                    this.SchedulePropertyExeAction(sourceLineNumbers, rollbackNamePerUser, propertyId, rollbackCmdLinePerUser, rollbackExtraBitsPerUser, rollbackConditionPerUser, null, installAfter);
+                    this.SchedulePropertyExeAction(sourceLineNumbers, rollbackNamePerMachine, propertyId, rollbackCmdLinePerMachine, rollbackExtraBitsPerMachine, rollbackConditionPerMachine, null, rollbackNamePerUser.Id);
+
+                    installAfter = rollbackNamePerMachine.Id;
+                }
+
+                Identifier installNamePerUser = this.Core.CreateIdentifier("viu", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
+                Identifier installNamePerMachine = this.Core.CreateIdentifier("vim", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
+                string installCmdLinePerUser = String.Format("{0} \"[#{1}]\"", cmdlinePrefix, fileId);
+                string installCmdLinePerMachine = String.Concat(installCmdLinePerUser, " /admin");
+                string installConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
+                string installConditionPerMachine = String.Format("ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
+
+                this.SchedulePropertyExeAction(sourceLineNumbers, installNamePerUser, propertyId, installCmdLinePerUser, installExtraBits, installConditionPerUser, null, installAfter);
+                this.SchedulePropertyExeAction(sourceLineNumbers, installNamePerMachine, propertyId, installCmdLinePerMachine, installExtraBits | VSCompiler.MsidbCustomActionTypeNoImpersonate, installConditionPerMachine, null, installNamePerUser.Id);
+
+                // If not permanent, schedule the uninstall custom action.
+                if (permanent != YesNoType.Yes)
+                {
+                    Identifier uninstallNamePerUser = this.Core.CreateIdentifier("vuu", componentId, fileId, "per-user", target ?? String.Empty, targetVersion ?? String.Empty);
+                    Identifier uninstallNamePerMachine = this.Core.CreateIdentifier("vum", componentId, fileId, "per-machine", target ?? String.Empty, targetVersion ?? String.Empty);
+                    string uninstallCmdLinePerUser = String.Concat(cmdlinePrefix, " /u:\"", packageId, "\"");
+                    string uninstallCmdLinePerMachine = String.Concat(uninstallCmdLinePerUser, " /admin");
+                    int uninstallExtraBitsPerUser = VSCompiler.MsidbCustomActionTypeContinue | VSCompiler.MsidbCustomActionTypeInScript;
+                    int uninstallExtraBitsPerMachine = uninstallExtraBitsPerUser | VSCompiler.MsidbCustomActionTypeNoImpersonate;
+                    string uninstallConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
+                    string uninstallConditionPerMachine = String.Format("ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
+
+                    this.SchedulePropertyExeAction(sourceLineNumbers, uninstallNamePerUser, propertyId, uninstallCmdLinePerUser, uninstallExtraBitsPerUser, uninstallConditionPerUser, "InstallFinalize", null);
+                    this.SchedulePropertyExeAction(sourceLineNumbers, uninstallNamePerMachine, propertyId, uninstallCmdLinePerMachine, uninstallExtraBitsPerMachine, uninstallConditionPerMachine, "InstallFinalize", null);
+                }
+            }
+        }
+
+        private void SchedulePropertyExeAction(SourceLineNumber sourceLineNumbers, Identifier name, string source, string cmdline, int extraBits, string condition, string beforeAction, string afterAction)
+        {
+            const string sequence = "InstallExecuteSequence";
+
+            Row actionRow = this.Core.CreateRow(sourceLineNumbers, "CustomAction", name);
+            actionRow[1] = VSCompiler.MsidbCustomActionTypeProperty | VSCompiler.MsidbCustomActionTypeExe | extraBits;
+            actionRow[2] = source;
+            actionRow[3] = cmdline;
+
+            Row sequenceRow = this.Core.CreateRow(sourceLineNumbers, "WixAction");
+            sequenceRow[0] = sequence;
+            sequenceRow[1] = name.Id;
+            sequenceRow[2] = condition;
+            // no explicit sequence
+            sequenceRow[4] = beforeAction;
+            sequenceRow[5] = afterAction;
+            sequenceRow[6] = 0; // not overridable
+
+            if (null != beforeAction)
+            {
+                if (WindowsInstallerStandard.IsStandardAction(beforeAction))
+                {
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", sequence, beforeAction);
+                }
+                else
+                {
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", beforeAction);
+                }
+            }
+
+            if (null != afterAction)
+            {
+                if (WindowsInstallerStandard.IsStandardAction(afterAction))
+                {
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", sequence, afterAction);
+                }
+                else
+                {
+                    this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", afterAction);
+                }
+            }
+        }
+    }
+}
diff --git a/src/wixext/VSDecompiler.cs b/src/wixext/VSDecompiler.cs
new file mode 100644
index 00000000..bfa0670c
--- /dev/null
+++ b/src/wixext/VSDecompiler.cs
@@ -0,0 +1,296 @@
+// 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.Extensions
+{
+    using System;
+    using System.Collections;
+    using System.Diagnostics;
+    using System.Globalization;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using VS = WixToolset.Extensions.Serialize.VS;
+    using Wix = WixToolset.Data.Serialize;
+
+    /// <summary>
+    /// The decompiler for the WiX Toolset Visual Studio Extension.
+    /// </summary>
+    public sealed class VSDecompiler : DecompilerExtension
+    {
+        /// <summary>
+        /// Creates a decompiler for VS Extension.
+        /// </summary>
+        public VSDecompiler()
+        {
+            this.TableDefinitions = VSExtensionData.GetExtensionTableDefinitions();
+        }
+
+        /// <summary>
+        /// Get the extensions library to be removed.
+        /// </summary>
+        /// <param name="tableDefinitions">Table definitions for library.</param>
+        /// <returns>Library to remove from decompiled output.</returns>
+        public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions)
+        {
+            return VSExtensionData.GetExtensionLibrary(tableDefinitions);
+        }
+
+        /// <summary>
+        /// Decompiles an extension table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        public override void DecompileTable(Table table)
+        {
+            switch (table.Name)
+            {
+                case "HelpFile":
+                    this.DecompileHelpFileTable(table);
+                    break;
+                case "HelpFileToNamespace":
+                    this.DecompileHelpFileToNamespaceTable(table);
+                    break;
+                case "HelpFilter":
+                    this.DecompileHelpFilterTable(table);
+                    break;
+                case "HelpFilterToNamespace":
+                    this.DecompileHelpFilterToNamespaceTable(table);
+                    break;
+                case "HelpNamespace":
+                    this.DecompileHelpNamespaceTable(table);
+                    break;
+                case "HelpPlugin":
+                    this.DecompileHelpPluginTable(table);
+                    break;
+                default:
+                    base.DecompileTable(table);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Decompile the HelpFile table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileHelpFileTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                VS.HelpFile helpFile = new VS.HelpFile();
+
+                helpFile.Id = (string)row[0];
+
+                helpFile.Name = (string)row[1];
+
+                if (null != row[2])
+                {
+                    helpFile.Language = (int)row[2];
+                }
+
+                if (null != row[4])
+                {
+                    helpFile.Index = (string)row[4];
+                }
+
+                if (null != row[5])
+                {
+                    helpFile.Search = (string)row[5];
+                }
+
+                if (null != row[6])
+                {
+                    helpFile.AttributeIndex = (string)row[6];
+                }
+
+                if (null != row[7])
+                {
+                    helpFile.SampleLocation = (string)row[7];
+                }
+                
+                if (this.Core.RootElement is Wix.Module)
+                {
+                    helpFile.SuppressCustomActions = VS.YesNoType.yes;
+                }
+
+                Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", (string)row[3]);
+                if (null != file)
+                {
+                    file.AddChild(helpFile);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File_HxS", (string)row[3], "File"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the HelpFileToNamespace table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileHelpFileToNamespaceTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                VS.HelpFileRef helpFileRef = new VS.HelpFileRef();
+
+                helpFileRef.Id = (string)row[0];
+
+                VS.HelpCollection helpCollection = (VS.HelpCollection)this.Core.GetIndexedElement("HelpNamespace", (string)row[1]);
+                if (null != helpCollection)
+                {
+                    helpCollection.AddChild(helpFileRef);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "HelpNamespace_", (string)row[1], "HelpNamespace"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the HelpFilter table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileHelpFilterTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                VS.HelpFilter helpFilter = new VS.HelpFilter();
+
+                helpFilter.Id = (string)row[0];
+
+                helpFilter.Name = (string)row[1];
+
+                if (null != row[2])
+                {
+                    helpFilter.FilterDefinition = (string)row[2];
+                }
+
+                if (this.Core.RootElement is Wix.Module)
+                {
+                    helpFilter.SuppressCustomActions = VS.YesNoType.yes;
+                }
+
+                this.Core.RootElement.AddChild(helpFilter);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the HelpFilterToNamespace table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileHelpFilterToNamespaceTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                VS.HelpFilterRef helpFilterRef = new VS.HelpFilterRef();
+
+                helpFilterRef.Id = (string)row[0];
+
+                VS.HelpCollection helpCollection = (VS.HelpCollection)this.Core.GetIndexedElement("HelpNamespace", (string)row[1]);
+                if (null != helpCollection)
+                {
+                    helpCollection.AddChild(helpFilterRef);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "HelpNamespace_", (string)row[1], "HelpNamespace"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Decompile the HelpNamespace table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileHelpNamespaceTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                VS.HelpCollection helpCollection = new VS.HelpCollection();
+
+                helpCollection.Id = (string)row[0];
+
+                helpCollection.Name = (string)row[1];
+
+                if (null != row[3])
+                {
+                    helpCollection.Description = (string)row[3];
+                }
+
+                if (this.Core.RootElement is Wix.Module)
+                {
+                    helpCollection.SuppressCustomActions = VS.YesNoType.yes;
+                }
+
+                Wix.File file = (Wix.File)this.Core.GetIndexedElement("File", (string)row[2]);
+                if (null != file)
+                {
+                    file.AddChild(helpCollection);
+                }
+                else if (0 != String.Compare(helpCollection.Id, "MS_VSIPCC_v80", StringComparison.Ordinal) &&
+                    0 != String.Compare(helpCollection.Id, "MS.VSIPCC.v90", StringComparison.Ordinal))
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "File_Collection", (string)row[2], "File"));
+                }
+                this.Core.IndexElement(row, helpCollection);
+            }
+        }
+
+        /// <summary>
+        /// Decompile the HelpPlugin table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        private void DecompileHelpPluginTable(Table table)
+        {
+            foreach (Row row in table.Rows)
+            {
+                VS.PlugCollectionInto plugCollectionInto = new VS.PlugCollectionInto();
+
+                plugCollectionInto.TargetCollection = (string)row[1];
+
+                if (null != row[2])
+                {
+                    plugCollectionInto.TableOfContents = (string)row[2];
+                }
+
+                if (null != row[3])
+                {
+                    plugCollectionInto.Attributes = (string)row[3];
+                }
+
+                if (null != row[4])
+                {
+                    plugCollectionInto.TargetTableOfContents = (string)row[4];
+                }
+
+                if (this.Core.RootElement is Wix.Module)
+                {
+                    plugCollectionInto.SuppressExternalNamespaces = VS.YesNoType.yes;
+                }
+
+                //we cannot do this work because we cannot get the FeatureComponent table
+                //plugCollectionInto.TargetFeature = DecompileHelpComponents();
+                
+                VS.HelpCollection helpCollection = (VS.HelpCollection)this.Core.GetIndexedElement("HelpNamespace", (string)row[0]);
+                if (null != helpCollection)
+                {
+                    helpCollection.AddChild(plugCollectionInto);
+                }
+                else
+                {
+                    this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "HelpNamespace_", (string)row[0], "HelpNamespace"));
+                }
+            }
+        }
+        //private string DecompileHelpComponents()
+        //{
+        //    throw new NotImplementedException();
+        //    //Find both known compontents from FeatureComponents table and build feature list
+
+        //    //remove components from FeatureComponents
+
+        //    //return a space delimited list of features that mapped to our help components
+        //    return String.Empty;
+        //}
+    }
+}
diff --git a/src/wixext/VSExtensionData.cs b/src/wixext/VSExtensionData.cs
new file mode 100644
index 00000000..edb1fd42
--- /dev/null
+++ b/src/wixext/VSExtensionData.cs
@@ -0,0 +1,55 @@
+// 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.Extensions
+{
+    using System;
+    using System.Reflection;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+
+    /// <summary>
+    /// The WiX Toolset Visual Studio Extension.
+    /// </summary>
+    public sealed class VSExtensionData : ExtensionData
+    {
+        /// <summary>
+        /// Gets the optional table definitions for this extension.
+        /// </summary>
+        /// <value>The optional table definitions for this extension.</value>
+        public override TableDefinitionCollection TableDefinitions
+        {
+            get
+            {
+                return VSExtensionData.GetExtensionTableDefinitions();
+            }
+        }
+
+        /// <summary>
+        /// Gets the library associated with this extension.
+        /// </summary>
+        /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
+        /// <returns>The loaded library.</returns>
+        public override Library GetLibrary(TableDefinitionCollection tableDefinitions)
+        {
+            return VSExtensionData.GetExtensionLibrary(tableDefinitions);
+        }
+
+        /// <summary>
+        /// Internal mechanism to access the extension's table definitions.
+        /// </summary>
+        /// <returns>Extension's table definitions.</returns>
+        internal static TableDefinitionCollection GetExtensionTableDefinitions()
+        {
+            return ExtensionData.LoadTableDefinitionHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.tables.xml");
+        }
+
+        /// <summary>
+        /// Internal mechanism to access the extension's library.
+        /// </summary>
+        /// <returns>Extension's library.</returns>
+        internal static Library GetExtensionLibrary(TableDefinitionCollection tableDefinitions)
+        {
+            return ExtensionData.LoadLibraryHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.vs.wixlib", tableDefinitions);
+        }
+    }
+}
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.csproj b/src/wixext/WixToolset.VisualStudio.wixext.csproj
new file mode 100644
index 00000000..0b092662
--- /dev/null
+++ b/src/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -0,0 +1,69 @@
+<?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>netstandard2.0</TargetFramework>
+    <RootNamespace>WixToolset.Extensions</RootNamespace>
+    <Description>WiX Toolset Visual Studio Extension</Description>
+    <Title>WiX Toolset VS Extension</Title>
+    <IsTool>true</IsTool>
+    <ContentTargetFolders>build</ContentTargetFolders>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NoWarn>NU1701</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Data\tables.xml">
+      <LogicalName>$(RootNamespace).Data.tables.xml</LogicalName>
+    </EmbeddedResource>
+
+    <MsgGenSource Include="Data\messages.xml">
+      <ResourcesLogicalName>$(RootNamespace).Data.Messages.resources</ResourcesLogicalName>
+    </MsgGenSource>
+
+    <EmbeddedResource Include="Xsd\vs.xsd">
+      <LogicalName>$(RootNamespace).Xsd.vs.xsd</LogicalName>
+      <Pack>true</Pack>
+      <PackagePath>tools</PackagePath>
+    </EmbeddedResource>
+
+    <XsdGenSource Include="Xsd\vs.xsd">
+      <CommonNamespace>WixToolset.Data.Serialize</CommonNamespace>
+      <Namespace>WixToolset.Extensions.Serialize.VS</Namespace>
+    </XsdGenSource>
+
+    <EmbeddedResource Include="$(OutputPath)..\vs.wixlib">
+      <Link>Data\vs.wixlib</Link>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileName).targets" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
+    <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " PrivateAssets="all" />
+
+    <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
+    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " PrivateAssets="all" />
+
+    <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj') " />
+    <PackageReference Include="WixToolset.Core" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj') " PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\wixlib\vs.wixproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
+    <PackageReference Include="WixBuildTools.MsgGen" Version="4.0.*" PrivateAssets="all" />
+    <PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.targets b/src/wixext/WixToolset.VisualStudio.wixext.targets
new file mode 100644
index 00000000..903455e3
--- /dev/null
+++ b/src/wixext/WixToolset.VisualStudio.wixext.targets
@@ -0,0 +1,10 @@
+<?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">
+  <ItemGroup>
+    <WixExtension Include="WixToolset.VS.wixext">
+      <HintPath>$(MSBuildThisFileDirectory)..\tools\WixToolset.VS.wixext.dll</HintPath>
+    </WixExtension>
+  </ItemGroup>
+</Project>
diff --git a/src/wixext/xsd/vs.xsd b/src/wixext/xsd/vs.xsd
new file mode 100644
index 00000000..51172920
--- /dev/null
+++ b/src/wixext/xsd/vs.xsd
@@ -0,0 +1,292 @@
+<?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. -->
+
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          xmlns:xse=" http://wixtoolset.org/schemas/XmlSchemaExtension"
+    targetNamespace="http://wixtoolset.org/schemas/v4/wxs/vs"
+              xmlns="http://wixtoolset.org/schemas/v4/wxs/vs">
+    <xs:annotation>
+        <xs:documentation>
+            The source code schema for the WiX Toolset Visual Studio Extension.
+        </xs:documentation>
+    </xs:annotation>
+
+    <xs:element name="HelpCollection">
+        <xs:annotation>
+            <xs:documentation>
+                Help Namespace for a help collection.  The parent file is the key for the HxC (Collection) file.
+            </xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="HelpFileRef" />
+                <xs:element ref="HelpFilterRef" />
+                <xs:element ref="PlugCollectionInto" />
+            </xs:choice>
+            <xs:attribute name="Id" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Primary Key for HelpNamespace.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Description" type="xs:string">
+                <xs:annotation><xs:documentation>Friendly name for Namespace.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Name" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Internal Microsoft Help ID for this Namespace.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SuppressCustomActions" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Help registration custom actions.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="HelpFilter">
+        <xs:annotation>
+            <xs:documentation>
+                Filter for Help Namespace.
+            </xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Id" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Primary Key for HelpFilter.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="FilterDefinition" type="xs:string">
+                <xs:annotation><xs:documentation>Query String for Help Filter.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Name" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Friendly name for Filter.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SuppressCustomActions" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Help registration custom actions.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="HelpFile">
+        <xs:annotation>
+            <xs:documentation>
+                File for Help Namespace.  The parent file is the key for HxS (Title) file.
+            </xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Id" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Primary Key for HelpFile Table.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="AttributeIndex" type="xs:string">
+                <xs:annotation><xs:documentation>Key for HxR (Attributes) file.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Index" type="xs:string">
+                <xs:annotation><xs:documentation>Key for HxI (Index) file.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Language" use="required" type="xs:integer">
+                <xs:annotation><xs:documentation>Language ID for content file.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Name" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Internal Microsoft Help ID for this HelpFile.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SampleLocation" type="xs:string">
+                <xs:annotation><xs:documentation>Key for a file that is in the "root" of the samples directory for this HelpFile.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Search" type="xs:string">
+                <xs:annotation><xs:documentation>Key for HxQ (Query) file.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SuppressCustomActions" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Help registration custom actions.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="PlugCollectionInto">
+        <xs:annotation><xs:documentation>Plugin for Help Namespace.</xs:documentation></xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Attributes" type="xs:string">
+                <xs:annotation><xs:documentation>Key for HxA (Attributes) file of child namespace.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="TableOfContents" type="xs:string">
+                <xs:annotation><xs:documentation>Key for HxT  file of child namespace.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="TargetCollection" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>
+                    Foriegn Key into HelpNamespace table for the parent namespace into which the child will be inserted.
+                    The following special keys can be used to plug into external namespaces defined outside of the installer.
+                      MS_VSIPCC_v80 : Visual Studio 2005
+                      MS.VSIPCC.v90 : Visual Studio 2008
+                </xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="TargetTableOfContents" type="xs:string">
+                <xs:annotation><xs:documentation>Key for HxT  file of parent namespace that now includes the new child namespace.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="TargetFeature" type="xs:string">
+                <xs:annotation><xs:documentation>Key for the feature parent of this help collection.  Required only when plugging into external namespaces.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SuppressExternalNamespaces" type="YesNoType">
+                <xs:annotation><xs:documentation>Suppress linking Visual Studio Help namespaces.  Help redistributable merge modules will be required.  Use this when building a merge module.</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="HelpFileRef">
+        <xs:annotation><xs:documentation>Create a reference to a HelpFile element in another Fragment.</xs:documentation></xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Id" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Primary Key for HelpFile Table.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:anyAttribute namespace="##other" processContents="lax">
+                <xs:annotation><xs:documentation>
+                    Extensibility point in the WiX XML Schema.  Schema extensions can register additional
+                    attributes at this point in the schema.
+                </xs:documentation></xs:annotation>
+            </xs:anyAttribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="HelpFilterRef">
+        <xs:annotation><xs:documentation>Create a reference to a HelpFile element in another Fragment.</xs:documentation></xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Id" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Primary Key for HelpFilter.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:anyAttribute namespace="##other" processContents="lax">
+                <xs:annotation><xs:documentation>
+                    Extensibility point in the WiX XML Schema.  Schema extensions can register additional
+                    attributes at this point in the schema.
+                </xs:documentation></xs:annotation>
+            </xs:anyAttribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="HelpCollectionRef">
+        <xs:annotation>
+            <xs:documentation>Create a reference to a HelpCollection element in another Fragment.</xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="HelpFileRef" />
+            </xs:choice>
+            <xs:attribute name="Id" use="required" type="xs:string">
+                <xs:annotation><xs:documentation>Primary Key for HelpNamespace Table.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:anyAttribute namespace="##other" processContents="lax">
+                <xs:annotation><xs:documentation>
+                    Extensibility point in the WiX XML Schema.  Schema extensions can register additional
+                    attributes at this point in the schema.
+                </xs:documentation></xs:annotation>
+            </xs:anyAttribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="VsixPackage">
+        <xs:annotation>
+            <xs:documentation>
+                This element provides the metdata required to install/uninstall a file as
+                a VSIX Package. The VSIX package file will be installed as part of the MSI
+                then passed to the VSIX installer to install the VSIX package. To avoid the
+                duplication, simply use the MSI to install the VSIX package itself.
+            </xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="File" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                    Reference to file identifer. This attribute is required when the element is not a
+                    child of a File element and is invalid when the element is a child of the File element.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="PackageId" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>
+                    Identity of the VSIX package per its internal manifest. If this value is not correct
+                    the VSIX package will not correctly uninstall.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Permanent" type="YesNoType">
+                <xs:annotation>
+                    <xs:documentation>
+                    Indicates whether the VSIX package is uninstalled when the parent Component is uninstalled.
+                    The default is 'no'.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Target" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                    Specifies the SKU of Visual Studio in which to register the extension. If no target
+                    is specified the extension is registered with all installed SKUs. If the Target
+                    attribute is specified the TargetVersion attribute must also be specified. The 
+                    following is a list of known Visual Studio targets: integratedShell, professional,
+                    premium, ultimate, vbExpress, vcExpress, vcsExpress, vwdExpress
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="TargetVersion" type="VersionType">
+                <xs:annotation>
+                    <xs:documentation>
+                    Specifies the version of Visual Studio in which to register the extension. This attribute
+                    is required if the Target attribute is specified.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Vital" type="YesNoType">
+                <xs:annotation>
+                    <xs:documentation>
+                    Indicates whether failure to install the VSIX package causes the installation to rollback.
+                    The default is 'yes'.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="VsixInstallerPathProperty" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                    Optional reference to a Property element that contains the path to the VsixInstaller.exe.
+                    By default, the latest VsixInstaller.exe on the machine will be used to install the VSIX
+                    package. It is highly recommended that this attribute is *not* used.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:anyAttribute namespace="##other" processContents="lax">
+                <xs:annotation><xs:documentation>
+                    Extensibility point in the WiX XML Schema.  Schema extensions can register additional
+                    attributes at this point in the schema.
+                </xs:documentation></xs:annotation>
+            </xs:anyAttribute>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:simpleType name="VersionType">
+        <xs:annotation><xs:documentation>Values of this type will look like: "x.x.x.x" where x is an integer from 0 to 65534.</xs:documentation></xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(\d{1,5}\.){0,3}\d{1,5}"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="YesNoType">
+        <xs:annotation>
+            <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base='xs:NMTOKEN'>
+            <xs:enumeration value="no"/>
+            <xs:enumeration value="yes"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/src/wixlib/HTML_Help_Registration__RTL_X86.wxs b/src/wixlib/HTML_Help_Registration__RTL_X86.wxs
new file mode 100644
index 00000000..fcb99f0f
--- /dev/null
+++ b/src/wixlib/HTML_Help_Registration__RTL_X86.wxs
@@ -0,0 +1,68 @@
+<?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. -->
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <DirectoryRef Id="CommonFilesFolder">
+      <Directory Id="MSShared" Name="Microsoft Shared">
+        <Directory Id="DevHelp" Name="DevHelp">
+          <Directory Id="VSIPCC" Name="VSIPCC">
+          </Directory>
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+
+  <Fragment Id="HTML_Help_Registration_">
+    <Binary Id="BIN_File_46002" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_46002.dll" />
+    <Binary Id="BIN_File_46001" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_46001.dll" />
+    <Binary Id="BIN_File_107602" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_107602.dll" />
+    <!-- We are stuck using GUID'ed ids here because they were hardcoded in the Help2 dlls-->
+    <CustomAction Id="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="BeginTransaction" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_RegisterPlugIn.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterPlugIn2" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="commit" Impersonate="no" />
+    <CustomAction Id="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="CommitTransaction" Return="ignore" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="ExportTempHxDs" />
+    <CustomAction Id="CA_RegisterNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterNamespace2" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_RollbackTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Execute="rollback" Impersonate="no" />
+    <CustomAction Id="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="RegisterMicrosoftHelp" Return="ignore" />
+    <CustomAction Id="CA_RegisterHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterHelpFile" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_RegisterFilter.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RegisterFilter2" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_RemoveNamespace.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveNamespace" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveTempHxDs" Return="ignore" />
+    <!-- This isn't actually executed, but the Help2 dlls use it to find the key for the binary file-->
+    <CustomAction Id="CA_DummyForHXDS_DLL.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_107602" DllEntry="Bogus" />
+    <CustomAction Id="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RollbackTransaction" Execute="rollback" Impersonate="no" />
+    <CustomAction Id="CA_RemoveHelpFile.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46001" DllEntry="RemoveHelpFile" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" BinaryKey="BIN_File_46002" DllEntry="UnRegisterMicrosoftHelp" Return="ignore" />
+
+    <InstallExecuteSequence>
+      <Custom Action="CA_ExportTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" Before="ProcessComponents" />
+
+      <Custom Action="CA_RollbackHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" />
+      <Custom Action="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" After="RemoveFiles" />
+      <Custom Action="CA_UnRegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" After="CA_BeginHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" />
+
+      <Custom Action="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFiles" />
+
+      <Custom Action="CA_CommitHelpTransaction.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( NOT RollbackDisabled )</Custom>
+      <Custom Action="CA_CommitHelpTransactionNoRB.3643236F_FC70_11D3_A536_0090278A1BB8" Before="InstallFinalize">( RollbackDisabled )</Custom>
+      <Custom Action="CA_RemoveTempHxDs.3643236F_FC70_11D3_A536_0090278A1BB8" After="InstallFinalize" />
+    </InstallExecuteSequence>
+
+    <CustomTable Id="HelpPlugin">
+      <Column Id="HelpNamespace_" Type="string" Width="72" PrimaryKey="yes" />
+      <Column Id="HelpNamespace_Parent" Type="string" Width="72" PrimaryKey="yes" />
+      <Column Id="File_HxT" Nullable="yes" Type="string" Width="72" />
+      <Column Id="File_HxA" Nullable="yes" Type="string" Width="72" />
+      <Column Id="File_ParentHxT" Nullable="yes" Type="string" Width="72" />
+    </CustomTable>
+
+    <CustomTable Id="HelpNamespace">
+      <Column Id="NamespaceKey" Type="string" Width="72" PrimaryKey="yes" />
+      <Column Id="NamespaceName" Type="string" Width="0" />
+      <Column Id="File_Collection" Type="string" Width="72" />
+      <Column Id="Description" Nullable="yes" Localizable="yes" Type="string" Width="0" />
+    </CustomTable>
+  </Fragment>
+</Wix>
diff --git a/src/wixlib/Redist/BIN_File_107602.dll b/src/wixlib/Redist/BIN_File_107602.dll
new file mode 100644
index 00000000..aef2cf29
--- /dev/null
+++ b/src/wixlib/Redist/BIN_File_107602.dll
diff --git a/src/wixlib/Redist/BIN_File_46001.dll b/src/wixlib/Redist/BIN_File_46001.dll
new file mode 100644
index 00000000..9e470267
--- /dev/null
+++ b/src/wixlib/Redist/BIN_File_46001.dll
diff --git a/src/wixlib/Redist/BIN_File_46002.dll b/src/wixlib/Redist/BIN_File_46002.dll
new file mode 100644
index 00000000..ae9c30dd
--- /dev/null
+++ b/src/wixlib/Redist/BIN_File_46002.dll
diff --git a/src/wixlib/VS11.wxs b/src/wixlib/VS11.wxs
new file mode 100644
index 00000000..dd52e80a
--- /dev/null
+++ b/src/wixlib/VS11.wxs
@@ -0,0 +1,206 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS11_EXTENSIONS_DIR" Secure="yes">
+            <RegistrySearch Id="VS11DevEnvForExtensionsSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS11ExtensionsPathSearch" Path="Extensions" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS11_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS11DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS11ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS11_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS11ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="11.0" Type="raw">
+                <DirectorySearch Id="VS11XmlPathSearch" Path="Xml" Depth="1">
+                    <DirectorySearch Id="VS11XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS11_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS11DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS11ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS11_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVs11BootstrapperPackageFolder" Root="HKLM" Key="Software\Microsoft\GenericBootstrapper\4.0" Name="Path" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS11_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS11RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="11.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS11DEVENV" Secure="yes">
+            <RegistrySearch Id="VS11DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS11Setup" Property="VS11DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS11DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS11Setup" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS11InstallVSTemplates" Property="VS11DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS11DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 11 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 11 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 11 setup.              -->
+    <Fragment>
+        <Property Id="VS11_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCS11ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 11 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 11 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 11 setup.             -->
+    <Fragment>
+        <Property Id="VS11_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVB11ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VB" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 11 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 11 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD11EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVwdExpressIde11Component" Guid="92A0CBA0-BF39-422D-87FA-AB64564CD136" Type="file">
+                <FileSearch Id="VwdExpressIde11" Name="vwdexpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD11Setup" Property="VWD11EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD11EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD11Setup" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD11InstallVSTemplates" Property="VWD11EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD11EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD11InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD11EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 11 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 11 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 11 setup.             -->
+    <Fragment>
+        <Property Id="VS11_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVWD11ProjectSystemUnderVSSetup" Guid="03E73DF8-BED3-44BB-BE2E-BAC10FAE723E" />
+            <ComponentSearch Id="SearchForVWD11ProjectSystemUnderVWDSetup" Guid="3D7D4A9F-E3D7-4F13-9907-AF4F3CD75D33" Type="directory" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 11 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 11 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 11 setup.             -->
+    <Fragment>
+        <Property Id="VS11_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVC11ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 11 Team Test project system is installed -->
+    <Fragment>
+        <Property Id="VS11_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS11TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 11 Database project system is installed -->
+    <Fragment>
+        <Property Id="VS11_IDE_DB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVS11DBSystemUnderVSSetup" Guid="E781FFA7-55F5-4E8C-9275-7B7EF035B13B" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the WiX project system is installed for VS11 -->
+    <Fragment>
+        <Property Id="VS11_IDE_WIX_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <!-- Component search for the .pkgdef file for VS11 -->
+            <ComponentSearch Id="SearchForVS11WixSystemUnderVSSetup" Guid="55489E7A-7DCA-5228-975E-39C51BE332D9" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Modeling project system is installed -->
+    <Fragment>
+        <Property Id="VS11_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS11ModelingSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Projects\{f088123c-0e9e-452a-89e6-6ba2f21d5cac}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio F# project system is installed -->
+    <Fragment>
+        <Property Id="VS11_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS11FSharpSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\F#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Express for Windows IDE component is installed. -->
+    <!-- If this property is set, that means Visual Studio Express for Windows is installed  -->
+    <!-- on the system.                                                                      -->
+    <Fragment>
+        <Property Id="VS11WINEXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVS11WinExpressIdeComponent" Guid="A7A5FD99-1DFE-4AA8-A563-4DF5E0DD89E1" Type="file">
+                <FileSearch Id="VS11WinExpressIde" Name="vswinexpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /setup                             -->
+    <Fragment>
+        <CustomAction Id="VS11WinExpressSetup" Property="VS11WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS11WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS11WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
+    <Fragment>
+        <CustomAction Id="VS11WinExpressInstallVSTemplates" Property="VS11WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS11WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS11WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS11WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS14.wxs b/src/wixlib/VS14.wxs
new file mode 100644
index 00000000..52db1562
--- /dev/null
+++ b/src/wixlib/VS14.wxs
@@ -0,0 +1,187 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS14_EXTENSIONS_DIR" Secure="yes">
+            <RegistrySearch Id="VS14DevEnvForExtensionsSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS14ExtensionsPathSearch" Path="Extensions" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS14_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS14DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS14ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS14_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS14ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="14.0" Type="raw">
+                <DirectorySearch Id="VS14XmlPathSearch" Path="Xml" Depth="1">
+                    <DirectorySearch Id="VS14XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS14_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS14DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS14ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS14_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS14BootstrapperPackageFolder" Root="HKLM" Key="Software\Microsoft\GenericBootstrapper\4.0" Name="Path" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS14_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS14RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="14.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS14DEVENV" Secure="yes">
+            <RegistrySearch Id="VS14DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS14Setup" Property="VS14DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS14DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS14Setup" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS14InstallVSTemplates" Property="VS14DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS14DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 14 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 14 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 14 setup.              -->
+    <Fragment>
+        <Property Id="VS14_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCS14ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VC#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 14 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 14 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 14 setup.             -->
+    <Fragment>
+        <Property Id="VS14_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVB14ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VB" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 14 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 14 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD14EXPRESS_IDE" Secure="yes">
+            <RegistrySearch Id="VWD14ExpressSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VWDExpress\14.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD14Setup" Property="VWD14EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD14EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD14Setup" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD14InstallVSTemplates" Property="VWD14EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD14EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD14EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 14 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 14 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 14 setup.             -->
+    <Fragment>
+        <Property Id="VS14_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVWD14ProjectSystemUnderVSSetup" Guid="274EB373-6B78-5EBD-8A6C-6D8094E58ECB" />
+            <ComponentSearch Id="SearchForVWD14ProjectSystemUnderVWDSetup" Guid="71EBDA4A-4A15-426F-95C4-4FC051FD7AA4" Type="directory" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 14 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 14 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 14 setup.             -->
+    <Fragment>
+        <Property Id="VS14_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVC14ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VC" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 14 Team Test project system is installed -->
+    <Fragment>
+        <Property Id="VS14_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS14TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Modeling project system is installed -->
+    <Fragment>
+        <Property Id="VS14_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS14ModelingSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Projects\{f088123c-0e9e-452a-89e6-6ba2f21d5cac}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio F# project system is installed -->
+    <Fragment>
+        <Property Id="VS14_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS14FSharpSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\F#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Express for Windows IDE component is installed. -->
+    <!-- If this property is set, that means Visual Studio Express for Windows is installed  -->
+    <!-- on the system.                                                                      -->
+    <Fragment>
+        <Property Id="VS14WINEXPRESS_IDE" Secure="yes">
+            <RegistrySearch Id="VS14WinExpressSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VSWinExpress\14.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /setup                             -->
+    <Fragment>
+        <CustomAction Id="VS14WinExpressSetup" Property="VS14WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS14WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS14WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
+    <Fragment>
+        <CustomAction Id="VS14WinExpressInstallVSTemplates" Property="VS14WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS14WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS14WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2003.wxs b/src/wixlib/VS2003.wxs
new file mode 100644
index 00000000..10515b52
--- /dev/null
+++ b/src/wixlib/VS2003.wxs
@@ -0,0 +1,28 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <!-- Visual Studio 2003 .NET -->
+    <Fragment>
+        <Property Id="VS2003DEVENV" Secure="yes">
+            <RegistrySearch Id="VS2003DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\7.1\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2003Setup" Property="VS2003DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2003DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2003Setup" Before="InstallFinalize" Overridable="yes">VS2003DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether or not the J# redistributable package 1.1 is installed.              -->
+    <Fragment>
+        <Property Id="JSHARP_REDIST_11_INSTALLED" Secure="yes">
+            <RegistrySearch Id="JSharpRedist11RegKey" Root="HKLM" Key="Software\Microsoft\Visual JSharp Setup\Redist\v1.1.4322" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2005.wxs b/src/wixlib/VS2005.wxs
new file mode 100644
index 00000000..3aadf08c
--- /dev/null
+++ b/src/wixlib/VS2005.wxs
@@ -0,0 +1,370 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <!-- Visual Studio 2005 -->
+    <Fragment>
+        <Property Id="VS2005DEVENV" Secure="yes">
+            <RegistrySearch Id="VS2005DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2005_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2005DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Setup\VS" Name="EnvironmentPath" Type="raw">
+                <DirectorySearch Id="VS2005ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2005_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2005DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Setup\VS" Name="EnvironmentPath" Type="raw">
+                <DirectorySearch Id="VS2005ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2005_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2005ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="8.0" Type="raw">
+                <DirectorySearch Id="VS2005XmlPathSearch" Path="Xml" Depth="1">
+                  <DirectorySearch Id="VS2005XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2005PROJECTAGGREGATOR2" Secure="yes">
+            <ComponentSearch Id="VS2005ProjectAggregator2Search" Guid="B0BB80E0-5CCC-474E-A75E-05DC1AE073BC" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2005Setup" Property="VS2005DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2005DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2005Setup" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2005InstallVSTemplates" Property="VS2005DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2005DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2005DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Location of the Visual Studio 2005 root installation directory. -->
+    <Fragment>
+        <Property Id="VS2005_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS2005RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="8.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# 2005 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual C# 2005 Express Edition is     -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VCSHARP2005EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVcsExpressIde2005Component" Guid="E8A67F23-21D0-4E7B-BBD3-54E2D505BED8" Type="file" >
+                <FileSearch Id="VcsExpressIde2005" Name="vcsexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vcsexpress.exe /setup                     -->
+    <Fragment>
+        <CustomAction Id="VCSHARP2005Setup" Property="VCSHARP2005EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VCSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vcsexpress.exe /InstallVSTemplates        -->
+    <Fragment>
+        <CustomAction Id="VCSHARP2005InstallVSTemplates" Property="VCSHARP2005EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VCSHARP2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VCSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+  
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 2005 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2005 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 2005 setup.              -->
+    <Fragment>
+        <Property Id="VS2005_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCSProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Projects\{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic 2005 Express IDE component is installed. -->
+    <!-- If this property is set, that means Visual Basic 2005 Express Edition is    -->
+    <!-- installed on the system.                                                    -->
+    <Fragment>
+        <Property Id="VB2005EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVbExpressIde2005Component" Guid="FCDD3EF0-FFF4-4391-9467-AA48ADC7028F" Type="file">
+                <FileSearch Id="VbExpressIde2005" Name="vbexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vbexpress.exe /setup                        -->
+    <Fragment>
+        <CustomAction Id="VB2005Setup" Property="VB2005EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VB2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VB2005Setup" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vbexpress.exe /InstallVSTemplates           -->
+    <Fragment>
+        <CustomAction Id="VB2005InstallVSTemplates" Property="VB2005EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VB2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VB2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 2005 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 2005 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 2005 setup.             -->
+    <Fragment>
+        <Property Id="VS2005_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVBProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Projects\{F184B08F-C81C-45f6-A57F-5ABD9991F28F}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 2005 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 2005 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD2005EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVwdExpressIde2005Component" Guid="56B053EA-AEFA-490A-A537-5EA145574862" Type="file">
+                <FileSearch Id="VwdExpressIde2005" Name="vwdexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD2005Setup" Property="VWD2005EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VWD2005Setup" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD2005InstallVSTemplates" Property="VWD2005EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VWD2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 2005 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 2005 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 2005 setup.             -->
+    <Fragment>
+        <Property Id="VS2005_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVWDProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Projects\{E24C65DC-7377-472B-9ABA-BC803B73C61A}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ 2005 Express IDE component is installed. -->
+    <!-- If this property is set, that means Visual C++ 2005 Express Edition is    -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VC2005EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVcExpressIde2005Component" Guid="83D8DFB7-73ED-4C83-9606-805F4CD7E1EE" Type="file">
+                <FileSearch Id="VcExpressIde2005" Name="vcexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vcexpress.exe /setup                      -->
+    <Fragment>
+        <CustomAction Id="VC2005Setup" Property="VC2005EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VC2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VC2005Setup" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vcexpress.exe /InstallVSTemplates         -->
+    <Fragment>
+        <CustomAction Id="VC2005InstallVSTemplates" Property="VC2005EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VC2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VC2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 2005 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2005 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 2005 setup.             -->
+    <Fragment>
+        <Property Id="VS2005_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual J# 2005 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual J# 2005 Express Edition is     -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VJSHARP2005EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVjsExpressIde2005Component" Guid="7077FCC9-C3E4-437E-83ED-D5D7D8D9BB6C" Type="file">
+                <FileSearch Id="VjsExpressIde2005" Name="vjsexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vjsexpress.exe /setup                     -->
+    <Fragment>
+        <CustomAction Id="VJSHARP2005Setup" Property="VJSHARP2005EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VJSHARP2005Setup" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vjsexpress.exe /InstallVSTemplates        -->
+    <Fragment>
+        <CustomAction Id="VJSHARP2005InstallVSTemplates" Property="VJSHARP2005EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VJSHARP2005EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VJSHARP2005InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VJSHARP2005EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual J# project system is installed as a part of -->
+    <!-- Visual Studio 2005 standard or higher. If this property is set, that     -->
+    <!-- means Visual Studio 2005 standard or higher is installed and the Visual  -->
+    <!-- J# language tools were installed as a part of VS 2005 setup.             -->
+    <Fragment>
+        <Property Id="VS2005_IDE_VJSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVJSProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Projects\{E6FDF86B-F3D1-11D4-8576-0002A516ECE8}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Code Name "Orcas" Development Tools   -->
+    <!-- for .NET Framework 3.0 add-in is installed for Visual Studio 2005.        -->
+    <Fragment>
+        <Property Id="VSEXTENSIONS_FOR_NETFX30_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVSExtensionsForNetfx30RootComponent" Guid="72616A39-A8E6-4187-BC32-0950598B4499" Type="file" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Team Test project system is installed -->
+    <Fragment>
+      <Property Id="VS2005_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+        <RegistrySearch Id="SearchForVSTSTestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+      </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Web Application Project is installed as a part of  -->
+    <!-- Visual Studio 2005 standard or higher. This project type is installed    -->
+    <!-- as a standalone package and as a part of Visual Studio 2005 SP1.         -->
+    <Fragment>
+        <Property Id="VS2005_WAP_PROJECT_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVS2005WAPProject" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\8.0\Packages\{349c5850-65df-11da-9384-00065b846f21}" Name="ProductName" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for Visual Studio 2005 standard edition -->
+    <!-- and higher.                                                              -->
+    <Fragment>
+        <Property Id="VS2005_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="SearchForVS2005SP1" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VS\Servicing\8.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for Visual Basic 2005 Express Edition.  -->
+    <Fragment>
+        <Property Id="VB2005EXPRESS_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="SearchForVBExp2005SP1" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VB\Servicing\8.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for Visual C++ 2005 Express Edition.    -->
+    <Fragment>
+        <Property Id="VC2005EXPRESS_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="SearchForVCExp2005SP1" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\8.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for Visual C# 2005 Express Edition.     -->
+    <Fragment>
+        <Property Id="VCSHARP2005EXPRESS_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="SearchForVCSharpExp2005SP1" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VCS\Servicing\8.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for Visual J# 2005 Express Edition.     -->
+    <Fragment>
+        <Property Id="VJSHARP2005EXPRESS_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="SearchForVJSharpExp2005SP1" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VJS\Servicing\8.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for Visual Web Developer 2005 Express   -->
+    <!-- Edition.                                                                 -->
+    <Fragment>
+        <Property Id="VWD2005EXPRESS_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="SearchForVWDExp2005SP1" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VNS\Servicing\8.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates the service pack level for Visual Studio 2005 Team Foundation. -->
+    <Fragment>
+        <Property Id="VSTF2005_SP_LEVEL" Secure="yes">
+            <RegistrySearch Id="SearchForVSTF2005SP1" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VSTF\Servicing\8.0" Name="SP" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether or not the Document Explorer 2005 runtime components are installed.  -->
+    <Fragment>
+        <Property Id="DEXPLORE_2005_INSTALLED" Secure="yes">
+            <RegistrySearch Id="Dexplore2005RegKey" Root="HKLM" Key="Software\Microsoft\DExplore\v2.0.50727\1033" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether or not the J# redistributable package 2.0 first edition is installed.  -->
+    <Fragment>
+        <Property Id="JSHARP_REDIST_20_INSTALLED" Secure="yes">
+            <RegistrySearch Id="JSharpRedist20RegKey" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Visual J# 2.0 Redistributable Package" Name="UninstallPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether or not the J# redistributable package 2.0 second edition is installed. -->
+    <Fragment>
+        <Property Id="JSHARP_REDIST_20SE_INSTALLED" Secure="yes">
+            <RegistrySearch Id="JSharpRedist20SERegKey" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Visual J# 2.0 Redistributable Package - SE" Name="UninstallPath" Type="raw" />
+        </Property>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2008.wxs b/src/wixlib/VS2008.wxs
new file mode 100644
index 00000000..096221c2
--- /dev/null
+++ b/src/wixlib/VS2008.wxs
@@ -0,0 +1,300 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <!-- Visual Studio 2008 -->
+    <Fragment>
+        <Property Id="VS90DEVENV" Secure="yes">
+            <RegistrySearch Id="VS90DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS90_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS90DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentPath" Type="raw">
+                <DirectorySearch Id="VS90ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS90_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS90DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentPath" Type="raw">
+                <DirectorySearch Id="VS90ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS90_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS90ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="9.0" Type="raw">
+                <DirectorySearch Id="VS90XmlPathSearch" Path="Xml" Depth="1">
+                  <DirectorySearch Id="VS90XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS90Setup" Property="VS90DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS90DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS90Setup" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS90InstallVSTemplates" Property="VS90DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS90DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS90DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Location of the Visual Studio 2008 root installation directory. -->
+    <Fragment>
+        <Property Id="VS90_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS90RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="9.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# 2008 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual C# 2008 Express Edition is     -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VCSHARP90EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" >
+                <FileSearch Id="VcsExpressIde90" Name="vcsexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vcsexpress.exe /setup                     -->
+    <Fragment>
+        <CustomAction Id="VCSHARP90Setup" Property="VCSHARP90EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VCSHARP90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VCSHARP90Setup" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+  
+    <!-- Custom action definition to run vcsexpress.exe /InstallVSTemplates        -->
+    <Fragment>
+        <CustomAction Id="VCSHARP90InstallVSTemplates" Property="VCSHARP90EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VCSHARP90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VCSHARP90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 2008 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2008 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 2008 setup.              -->
+    <Fragment>
+        <Property Id="VS90_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCS90ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Projects\{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic 2008 Express IDE component is installed. -->
+    <!-- If this property is set, that means Visual Basic 2008 Express Edition is    -->
+    <!-- installed on the system.                                                    -->
+    <Fragment>
+        <Property Id="VB90EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file">
+                <FileSearch Id="VbExpressIde90" Name="vbexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vbexpress.exe /setup                        -->
+    <Fragment>
+        <CustomAction Id="VB90Setup" Property="VB90EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VB90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VB90Setup" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vbexpress.exe /InstallVSTemplates           -->
+    <Fragment>
+        <CustomAction Id="VB90InstallVSTemplates" Property="VB90EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VB90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VB90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 2008 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 2008 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 2008 setup.             -->
+    <Fragment>
+        <Property Id="VS90_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVB90ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Projects\{F184B08F-C81C-45f6-A57F-5ABD9991F28F}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 2008 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 2008 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD90EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file">
+                <FileSearch Id="VwdExpressIde90" Name="vwdexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD90Setup" Property="VWD90EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VWD90Setup" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD90InstallVSTemplates" Property="VWD90EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VWD90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 2008 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 2008 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 2008 setup.             -->
+    <Fragment>
+        <Property Id="VS90_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVWD90ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Projects\{E24C65DC-7377-472B-9ABA-BC803B73C61A}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ 2008 Express IDE component is installed. -->
+    <!-- If this property is set, that means Visual C++ 2008 Express Edition is    -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VC90EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file">
+                <FileSearch Id="VcExpressIde90" Name="vcexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vcexpress.exe /setup                      -->
+    <Fragment>
+        <CustomAction Id="VC90Setup" Property="VC90EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VC90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VC90Setup" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vcexpress.exe /InstallVSTemplates         -->
+    <Fragment>
+        <CustomAction Id="VC90InstallVSTemplates" Property="VC90EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VC90EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VC90InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC90EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 2008 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2008 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 2008 setup.             -->
+    <Fragment>
+        <Property Id="VS90_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVC90ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Team Test project system is installed -->
+    <Fragment>
+      <Property Id="VS90_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+        <RegistrySearch Id="SearchForVSTS90TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+      </Property>
+    </Fragment>
+
+    <!-- Location of the Visual Studio 2008 bootstrapper package install location  -->
+    <Fragment>
+        <Property Id="VS90_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVs90BootstrapperPackageFolder" Root="HKLM" Key="Software\Microsoft\GenericBootstrapper\3.5" Name="Path" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2008 SP1 version of devenv.exe is    -->
+    <!-- installed on the system.                                                 -->
+    <Fragment>
+        <Property Id="VS90_SP1" Secure="yes">
+            <RegistrySearch Id="VS90DevEnvDirectorySearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS90DevEnvFilePathSearch">
+                    <FileSearch Id="VS90DevEnvFileVersionSearch" Name="devenv.exe" MinVersion="9.0.30729.0"/>
+                </DirectorySearch>      
+            </RegistrySearch>      
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2008 SP1 version of vbexpress.exe is -->
+    <!-- installed on the system.                                                 -->
+    <Fragment>
+        <Property Id="VB90EXPRESS_SP1" Secure="yes">
+            <ComponentSearch Id="SearchForVbExpressIde90Component" Guid="010A50C6-8604-4BA2-8CA1-4EC3A5B861B2" Type="file">
+                <FileSearch Id="VB90ExpressFileVersionSearch" Name="vbexpress.exe" MinVersion="9.0.30729.0"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2008 SP1 version of vcexpress.exe is -->
+    <!-- installed on the system.                                                 -->
+    <Fragment>
+        <Property Id="VC90EXPRESS_SP1" Secure="yes">
+            <ComponentSearch Id="SearchForVcExpressIde90Component" Guid="147EB31D-8042-4E8F-A3EC-D32C04ED652A" Type="file">
+                <FileSearch Id="VC90ExpressFileVersionSearch" Name="vcexpress.exe" MinVersion="9.0.30729.0"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2008 SP1 version of vcsexpress.exe is -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VCS90EXPRESS_SP1" Secure="yes">
+            <ComponentSearch Id="SearchForVcsExpressIde90Component" Guid="EF0BC34E-6AAE-47C0-8FEC-7E00C2638209" Type="file" >
+                <FileSearch Id="VCS90ExpressFileVersionSearch" Name="vcsexpress.exe" MinVersion="9.0.30729.0"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2008 SP1 version of vcsexpress.exe is -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VWD90EXPRESS_SP1" Secure="yes">
+            <ComponentSearch Id="SearchForVwdExpressIde90Component" Guid="C7F516CB-CB5C-41B7-9CB4-33927C4DD206" Type="file">
+                <FileSearch Id="VWD90ExpressFileVersionSearch" Name="vwdexpress.exe" MinVersion="9.0.30729.0"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether or not the Document Explorer 2008 runtime components are installed.  -->
+    <Fragment>
+        <Property Id="DEXPLORE_2008_INSTALLED" Secure="yes">
+            <RegistrySearch Id="Dexplore2008RegKey" Root="HKLM" Key="Software\Microsoft\DExplore\v9.0.21022\1033" Name="Install" Type="raw" />
+        </Property>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2010.wxs b/src/wixlib/VS2010.wxs
new file mode 100644
index 00000000..d0d899cc
--- /dev/null
+++ b/src/wixlib/VS2010.wxs
@@ -0,0 +1,313 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS2010_EXTENSIONS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2010DevEnvForExtensionsSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2010ExtensionsPathSearch" Path="Extensions" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2010_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2010DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2010ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2010_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2010ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="10.0" Type="raw">
+                <DirectorySearch Id="VS2010XmlPathSearch" Path="Xml" Depth="1">
+                    <DirectorySearch Id="VS2010XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2010_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2010DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2010ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2010_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVs2010BootstrapperPackageFolder" Root="HKLM" Key="Software\Microsoft\GenericBootstrapper\4.0" Name="Path" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2010_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS2010RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="10.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2010DEVENV" Secure="yes">
+            <RegistrySearch Id="VS2010DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2010Setup" Property="VS2010DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2010DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2010Setup" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2010InstallVSTemplates" Property="VS2010DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2010DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2010DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# 2010 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual C# 2010 Express Edition is     -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VCSHARP2010EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVcsExpressIde2010Component" Guid="A4945167-D8A4-4B10-9B78-99C2CDC243EC" Type="file" >
+                <FileSearch Id="VcsExpressIde2010" Name="vcsexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vcsexpress.exe /setup                     -->
+    <Fragment>
+        <CustomAction Id="VCSHARP2010Setup" Property="VCSHARP2010EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VCSHARP2010Setup" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vcsexpress.exe /InstallVSTemplates        -->
+    <Fragment>
+        <CustomAction Id="VCSHARP2010InstallVSTemplates" Property="VCSHARP2010EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VCSHARP2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VCSHARP2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VCSHARP2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 2010 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2010 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 2010 setup.              -->
+    <Fragment>
+        <Property Id="VS2010_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCS2010ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic 2010 Express IDE component is installed. -->
+    <!-- If this property is set, that means Visual Basic 2010 Express Edition is    -->
+    <!-- installed on the system.                                                    -->
+    <Fragment>
+        <Property Id="VB2010EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVbExpressIde2010Component" Guid="3EDEF607-9E3A-4A64-BFE1-104979CF2899" Type="file">
+                <FileSearch Id="VbExpressIde2010" Name="vbexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vbexpress.exe /setup                        -->
+    <Fragment>
+        <CustomAction Id="VB2010Setup" Property="VB2010EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VB2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VB2010Setup" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vbexpress.exe /InstallVSTemplates           -->
+    <Fragment>
+        <CustomAction Id="VB2010InstallVSTemplates" Property="VB2010EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VB2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VB2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VB2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 2010 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 2010 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 2010 setup.             -->
+    <Fragment>
+        <Property Id="VS2010_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVB2010ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{F184B08F-C81C-45f6-A57F-5ABD9991F28F}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 2010 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 2010 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD2010EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVwdExpressIde2010Component" Guid="771B6CF7-C8D2-4D85-BACD-ED01600256DC" Type="file">
+                <FileSearch Id="VwdExpressIde2010" Name="vwdexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD2010Setup" Property="VWD2010EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VWD2010Setup" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD2010InstallVSTemplates" Property="VWD2010EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VWD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 2010 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 2010 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 2010 setup.             -->
+    <Fragment>
+        <Property Id="VS2010_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVWD2010ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{E24C65DC-7377-472B-9ABA-BC803B73C61A}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ 2010 Express IDE component is installed. -->
+    <!-- If this property is set, that means Visual C++ 2010 Express Edition is    -->
+    <!-- installed on the system.                                                  -->
+    <Fragment>
+        <Property Id="VC2010EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVcExpressIde2010Component" Guid="B455E8D3-90CB-47F6-AB7B-9B31E5DE6266" Type="file">
+                <FileSearch Id="VcExpressIde2010" Name="vcexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vcexpress.exe /setup                      -->
+    <Fragment>
+        <CustomAction Id="VC2010Setup" Property="VC2010EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VC2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VC2010Setup" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vcexpress.exe /InstallVSTemplates         -->
+    <Fragment>
+        <CustomAction Id="VC2010InstallVSTemplates" Property="VC2010EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VC2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VC2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VC2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 2010 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2010 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 2010 setup.             -->
+    <Fragment>
+        <Property Id="VS2010_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVC2010ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" Name="DefaultProjectExtension" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2010 Express for Windows Phone IDE component is  -->
+    <!-- installed. If this property is set, that means Visual Studio 2010 Express for        -->
+    <!-- Windows Phone is installed on the system.                                            -->
+    <Fragment>
+        <Property Id="VPD2010EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVpdExpressIde2010Component" Guid="80C81DB2-E95B-4C03-A559-C664E8411DDF" Type="file">
+                <FileSearch Id="VpdExpressIde2010" Name="vpdexpress.exe"/>
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vpdexpress.exe /setup                                -->
+    <Fragment>
+        <CustomAction Id="VPD2010Setup" Property="VPD2010EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VPD2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VPD2010Setup" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run vpdexpress.exe /InstallVSTemplates                   -->
+    <Fragment>
+        <CustomAction Id="VPD2010InstallVSTemplates" Property="VPD2010EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VPD2010EXPRESS_IDE" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VPD2010InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2010EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2010 Team Test project system is installed -->
+    <Fragment>
+        <Property Id="VS2010_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2010TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2010 Database project system is installed -->
+    <Fragment>
+        <Property Id="VS2010_IDE_DB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2010DBSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{C8D11400-126E-41CD-887F-60BD40844F9E}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2010 Deployment project system (setup project) is installed -->
+    <Fragment>
+        <Property Id="VS2010_IDE_VSD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2010VSDSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{54435603-DBB4-11D2-8724-00A0C9A8B90C}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the WiX project system is installed for VS2010 -->
+    <Fragment>
+        <Property Id="VS2010_IDE_WIX_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <!-- Component search for the .pkgdef file for VS2010 -->
+            <ComponentSearch Id="SearchForVS2010WixSystemUnderVSSetup" Guid="3C5BA30B-0713-5E28-8EEA-171E7A5E4864" Type="file" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Modeling project system is installed -->
+    <Fragment>
+        <Property Id="VS2010_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2010ModelingSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{f088123c-0e9e-452a-89e6-6ba2f21d5cac}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio F# project system is installed -->
+    <Fragment>
+        <Property Id="VS2010_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2010FSharpSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Projects\{f2a71f9b-5d33-465a-a702-920d77279786}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2012.wxs b/src/wixlib/VS2012.wxs
new file mode 100644
index 00000000..c4baa2c9
--- /dev/null
+++ b/src/wixlib/VS2012.wxs
@@ -0,0 +1,256 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS2012_EXTENSIONS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2012DevEnvForExtensionsSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2012ExtensionsPathSearch" Path="Extensions" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2012_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2012DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2012ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2012_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2012ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="11.0" Type="raw">
+                <DirectorySearch Id="VS2012XmlPathSearch" Path="Xml" Depth="1">
+                    <DirectorySearch Id="VS2012XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2012_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2012DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2012ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2012_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVs2012BootstrapperPackageFolder" Root="HKLM" Key="Software\Microsoft\GenericBootstrapper\4.0" Name="Path" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2012_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS2012RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="11.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2012DEVENV" Secure="yes">
+            <RegistrySearch Id="VS2012DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2012Setup" Property="VS2012DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2012DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2012Setup" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2012InstallVSTemplates" Property="VS2012DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2012DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 2012 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2012 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 2012 setup.              -->
+    <Fragment>
+        <Property Id="VS2012_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCS2012ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 2012 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 2012 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 2012 setup.             -->
+    <Fragment>
+        <Property Id="VS2012_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVB2012ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VB" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 2012 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 2012 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD2012EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVwdExpressIde2012Component" Guid="92A0CBA0-BF39-422D-87FA-AB64564CD136" Type="file">
+                <FileSearch Id="VwdExpressIde2012" Name="vwdexpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD2012Setup" Property="VWD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2012EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD2012Setup" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD2012InstallVSTemplates" Property="VWD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2012EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2012EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2012 Express IDE for Phone component is installed.  -->
+    <Fragment>
+        <Property Id="VPD2012EXPRESS_IDE" Secure="yes">
+            <RegistrySearch Id="VPD2012ExpressForPhoneEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VPDExpress\11.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run VPDexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VPD2012Setup" Property="VPD2012EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VPD2012EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VPD2012Setup" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VPD2012InstallVSTemplates" Property="VPD2012EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VPD2012EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VPD2012InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2012EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 2012 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 2012 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 2012 setup.             -->
+    <Fragment>
+        <Property Id="VS2012_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVWD2012ProjectSystemUnderVSSetup" Guid="03E73DF8-BED3-44BB-BE2E-BAC10FAE723E" />
+            <ComponentSearch Id="SearchForVWD2012ProjectSystemUnderVWDSetup" Guid="3D7D4A9F-E3D7-4F13-9907-AF4F3CD75D33" Type="directory" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 2012 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2012 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 2012 setup.             -->
+    <Fragment>
+        <Property Id="VS2012_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVC2012ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2012 Team Test project system is installed -->
+    <Fragment>
+        <Property Id="VS2012_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2012TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2012 Database project system is installed -->
+    <Fragment>
+        <Property Id="VS2012_IDE_DB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVS2012DBSystemUnderVSSetup" Guid="E781FFA7-55F5-4E8C-9275-7B7EF035B13B" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the WiX project system is installed for VS2012 -->
+    <Fragment>
+        <Property Id="VS2012_IDE_WIX_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <!-- Component search for the .pkgdef file for VS2012 -->
+            <ComponentSearch Id="SearchForVS2012WixSystemUnderVSSetup" Guid="55489E7A-7DCA-5228-975E-39C51BE332D9" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Modeling project system is installed -->
+    <Fragment>
+        <Property Id="VS2012_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2012ModelingSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Projects\{f088123c-0e9e-452a-89e6-6ba2f21d5cac}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio F# project system is installed -->
+    <Fragment>
+        <Property Id="VS2012_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2012FSharpSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\F#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Express for Windows IDE component is installed. -->
+    <!-- If this property is set, that means Visual Studio Express for Windows is installed  -->
+    <!-- on the system.                                                                      -->
+    <Fragment>
+        <Property Id="VS2012WINEXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVS2012WinExpressIdeComponent" Guid="A7A5FD99-1DFE-4AA8-A563-4DF5E0DD89E1" Type="file">
+                <FileSearch Id="VS2012WinExpressIde" Name="vswinexpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /setup                             -->
+    <Fragment>
+        <CustomAction Id="VS2012WinExpressSetup" Property="VS2012WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2012WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2012WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
+    <Fragment>
+        <CustomAction Id="VS2012WinExpressInstallVSTemplates" Property="VS2012WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2012WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2012WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    
+    <!-- Indicates whether the Visual Studio Express for Windows Desktop IDE component is installed. -->
+    <!-- If this property is set, that means Visual Studio Express for Windows Desktop is installed  -->
+    <!-- on the system.                                                                              -->
+    <Fragment>
+        <Property Id="VS2012WDEXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVS2012WDExpressIdeComponent" Guid="{55C6B9D6-A824-4AFC-8D08-20E581B6F42C}" Type="file">
+                <FileSearch Id="VS2012WDExpressIde" Name="WDExpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run WDExpress.exe /setup -->
+    <Fragment>
+        <CustomAction Id="VS2012WDExpressSetup" Property="VS2012WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2012WDEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2012WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run WDExpress.exe /InstallVSTemplates -->
+    <Fragment>
+        <CustomAction Id="VS2012WDExpressInstallVSTemplates" Property="VS2012WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2012WDEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2012WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2012WDEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2013.wxs b/src/wixlib/VS2013.wxs
new file mode 100644
index 00000000..fa774ff0
--- /dev/null
+++ b/src/wixlib/VS2013.wxs
@@ -0,0 +1,253 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS2013_EXTENSIONS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2013DevEnvForExtensionsSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2013ExtensionsPathSearch" Path="Extensions" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2013_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2013DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2013ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2013_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2013ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="12.0" Type="raw">
+                <DirectorySearch Id="VS2013XmlPathSearch" Path="Xml" Depth="1">
+                    <DirectorySearch Id="VS2013XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2013_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2013DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2013ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2013_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS2013BootstrapperPackageFolder" Root="HKLM" Key="Software\Microsoft\GenericBootstrapper\12.0" Name="Path" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2013_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS2013RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="12.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2013DEVENV" Secure="yes">
+            <RegistrySearch Id="VS2013DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2013Setup" Property="VS2013DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2013DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2013Setup" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2013InstallVSTemplates" Property="VS2013DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2013DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 2013 Pro or higher. If this property is set, that           -->
+    <!-- means Visual Studio 2013 Pro or higher is installed and the Visual        -->
+    <!-- C# language tools were installed as a part of VS 2013 setup.              -->
+    <Fragment>
+        <Property Id="VS2013_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCS2013ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 2013 Pro or higher. If this property is set, that             -->
+    <!-- means Visual Studio 2013 Pro or higher is installed and the Visual          -->
+    <!-- Basic language tools were installed as a part of VS 2013 setup.             -->
+    <Fragment>
+        <Property Id="VS2013_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVB2013ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VB" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 2013 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 2013 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD2013EXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVwdExpressIde2013Component" Guid="{04B98358-C73B-40F7-9946-AA80B316DA84}" Type="file">
+                <FileSearch Id="VwdExpressIde2013" Name="vwdexpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD2013Setup" Property="VWD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2013EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD2013Setup" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD2013InstallVSTemplates" Property="VWD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2013EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2013EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2013 Express IDE for Phone component is installed.  -->
+    <Fragment>
+        <Property Id="VPD2013EXPRESS_IDE" Secure="yes">
+            <RegistrySearch Id="VPD2013ExpressForPhoneEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VPDExpress\12.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run VPDexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VPD2013Setup" Property="VPD2013EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VPD2013EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VPD2013Setup" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run VPDexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VPD2013InstallVSTemplates" Property="VPD2013EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VPD2013EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VPD2013InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VPD2013EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 2013 Pro or higher. If this property is set, that                     -->
+    <!-- means Visual Studio 2013 Pro or higher is installed and the Visual                  -->
+    <!-- Web Developer language tools were installed as a part of VS 2013 setup.             -->
+    <Fragment>
+        <Property Id="VS2013_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVWD2013ProjectSystemUnderVSSetup" Guid="{CDA2DE5A-F6F4-48D0-B9BA-58CFD381143C}" />
+            <ComponentSearch Id="SearchForVWD2013ProjectSystemUnderVWDSetup" Guid="{C6E8D1B3-85F3-4F3A-A6AE-4166F917C9FD}" Type="directory" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 2013 Pro or higher. If this property is set, that           -->
+    <!-- means Visual Studio 2013 Pro or higher is installed and the Visual        -->
+    <!-- C++ language tools were installed as a part of VS 2013 setup.             -->
+    <Fragment>
+        <Property Id="VS2013_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVC2013ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2013 Team Test project system is installed -->
+    <Fragment>
+        <Property Id="VS2013_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2013TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Windows Installer XML project system is installed for VS2013 -->
+    <Fragment>
+        <Property Id="VS2013_IDE_WIX_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <!-- Component search for the .pkgdef file for VS2013 -->
+            <ComponentSearch Id="SearchForVS2013WixSystemUnderVSSetup" Guid="{768F32E1-BAAB-5203-822D-3BD85F9BD26E}" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Modeling project system is installed -->
+    <Fragment>
+        <Property Id="VS2013_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2013ModelingSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Projects\{f088123c-0e9e-452a-89e6-6ba2f21d5cac}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio F# project system is installed -->
+    <Fragment>
+        <Property Id="VS2013_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2013FSharpSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\F#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Express for Windows IDE component is installed. -->
+    <!-- If this property is set, that means Visual Studio Express for Windows is installed  -->
+    <!-- on the system.                                                                      -->
+    <Fragment>
+        <Property Id="VS2013WINEXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVS2013WinExpressIdeComponent" Guid="{5E7D5287-3ADA-4A8E-9953-C6B702BD1F01}" Type="file">
+                <FileSearch Id="VS2013WinExpressIde" Name="vswinexpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run vswinexpress.exe /setup                             -->
+    <Fragment>
+        <CustomAction Id="VS2013WinExpressSetup" Property="VS2013WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2013WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2013WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    
+    <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
+    <Fragment>
+        <CustomAction Id="VS2013WinExpressInstallVSTemplates" Property="VS2013WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2013WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2013WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Express for Windows Desktop IDE component is installed. -->
+    <!-- If this property is set, that means Visual Studio Express for Windows Desktop is installed  -->
+    <!-- on the system.                                                                              -->
+    <Fragment>
+        <Property Id="VS2013WDEXPRESS_IDE" Secure="yes">
+            <ComponentSearch Id="SearchForVS2013WDExpressIdeComponent" Guid="{6C65247B-900C-45AD-8ED8-3F20E668348E}" Type="file">
+                <FileSearch Id="VS2013WDExpressIde" Name="WDExpress.exe" />
+            </ComponentSearch>
+        </Property>
+    </Fragment>
+
+    <!-- Custom action definition to run WDExpress.exe /setup -->
+    <Fragment>
+        <CustomAction Id="VS2013WDExpressSetup" Property="VS2013WDEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2013WDEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2013WDExpressSetup" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Custom action definition to run WDExpress.exe /InstallVSTemplates -->
+    <Fragment>
+        <CustomAction Id="VS2013WDExpressInstallVSTemplates" Property="VS2013WDEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2013WDEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2013WDExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2013WDEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2015.wxs b/src/wixlib/VS2015.wxs
new file mode 100644
index 00000000..b7fb7b4d
--- /dev/null
+++ b/src/wixlib/VS2015.wxs
@@ -0,0 +1,187 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS2015_EXTENSIONS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2015DevEnvForExtensionsSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2015ExtensionsPathSearch" Path="Extensions" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2015_PROJECTTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2015DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2015ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2015_SCHEMAS_DIR" Secure="yes">
+            <RegistrySearch Id="VS2015ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="14.0" Type="raw">
+                <DirectorySearch Id="VS2015XmlPathSearch" Path="Xml" Depth="1">
+                    <DirectorySearch Id="VS2015XmlSchemasPathSearch" Path="Schemas" Depth="1" />
+                </DirectorySearch>
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2015_ITEMTEMPLATES_DIR" Secure="yes">
+            <RegistrySearch Id="VS2015DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentDirectory" Type="raw">
+                <DirectorySearch Id="VS2015ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
+            </RegistrySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2015_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS2015BootstrapperPackageFolder" Root="HKLM" Key="Software\Microsoft\GenericBootstrapper\4.0" Name="Path" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2015_ROOT_FOLDER" Secure="yes">
+            <RegistrySearch Id="SearchForVS2015RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="14.0" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2015DEVENV" Secure="yes">
+            <RegistrySearch Id="VS2015DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2015Setup" Property="VS2015DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2015DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2015InstallVSTemplates" Property="VS2015DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2015DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 2015 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2015 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 2015 setup.              -->
+    <Fragment>
+        <Property Id="VS2015_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVCS2015ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VC#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 2015 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 2015 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 2015 setup.             -->
+    <Fragment>
+        <Property Id="VS2015_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVB2015ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VB" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer 2015 Express IDE component is installed.  -->
+    <!-- If this property is set, that means Visual Web Developer 2015 Express Edition is     -->
+    <!-- installed on the system.                                                             -->
+    <Fragment>
+        <Property Id="VWD2015EXPRESS_IDE" Secure="yes">
+            <RegistrySearch Id="VWD2015ExpressSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VWDExpress\14.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /setup                               -->
+    <Fragment>
+        <CustomAction Id="VWD2015Setup" Property="VWD2015EXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2015EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD2015Setup" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vwdexpress.exe /InstallVSTemplates                  -->
+    <Fragment>
+        <CustomAction Id="VWD2015InstallVSTemplates" Property="VWD2015EXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VWD2015EXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VWD2015InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VWD2015EXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 2015 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 2015 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 2015 setup.             -->
+    <Fragment>
+        <Property Id="VS2015_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <ComponentSearch Id="SearchForVWD2015ProjectSystemUnderVSSetup" Guid="274EB373-6B78-5EBD-8A6C-6D8094E58ECB" />
+            <ComponentSearch Id="SearchForVWD2015ProjectSystemUnderVWDSetup" Guid="71EBDA4A-4A15-426F-95C4-4FC051FD7AA4" Type="directory" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 2015 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2015 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 2015 setup.             -->
+    <Fragment>
+        <Property Id="VS2015_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVC2015ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VC" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2015 Team Test project system is installed -->
+    <Fragment>
+        <Property Id="VS2015_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2015TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Projects\{3AC096D0-A1C2-E12C-1390-A8335801FDAB}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Modeling project system is installed -->
+    <Fragment>
+        <Property Id="VS2015_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2015ModelingSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Projects\{f088123c-0e9e-452a-89e6-6ba2f21d5cac}" Name="Package" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio F# project system is installed -->
+    <Fragment>
+        <Property Id="VS2015_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
+            <RegistrySearch Id="SearchForVSTS2015FSharpSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\F#" Name="ProductDir" Type="raw" />
+        </Property>
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Express for Windows IDE component is installed. -->
+    <!-- If this property is set, that means Visual Studio Express for Windows is installed  -->
+    <!-- on the system.                                                                      -->
+    <Fragment>
+        <Property Id="VS2015WINEXPRESS_IDE" Secure="yes">
+            <RegistrySearch Id="VS2015WinExpressSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VSWinExpress\14.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
+        </Property>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /setup                             -->
+    <Fragment>
+        <CustomAction Id="VS2015WinExpressSetup" Property="VS2015WINEXPRESS_IDE" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2015WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2015WinExpressSetup" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+    <!-- Custom action definition to run vswinexpress.exe /InstallVSTemplates                -->
+    <Fragment>
+        <CustomAction Id="VS2015WinExpressInstallVSTemplates" Property="VS2015WINEXPRESS_IDE" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2015WINEXPRESS_IDE" />
+        <InstallExecuteSequence>
+            <Custom Action="VS2015WinExpressInstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2015WINEXPRESS_IDE</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VS2017.wxs b/src/wixlib/VS2017.wxs
new file mode 100644
index 00000000..acc96d67
--- /dev/null
+++ b/src/wixlib/VS2017.wxs
@@ -0,0 +1,143 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS2017_ROOT_FOLDER" Secure="yes" />
+
+        <!-- Currently supported only on x86 -->
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+
+    <Fragment>
+        <PropertyRef Id="VS2017_ROOT_FOLDER" />
+        <Property Id="VS2017_IDE_DIR" Secure="yes">
+            <DirectorySearch Id="VS2017DirectorySearch" Path="[VS2017_ROOT_FOLDER]">
+                <DirectorySearch Id="VS2017EnvironmentDirectorySearch" Path="Common7\IDE" Depth="1" />
+            </DirectorySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2017_EXTENSIONS_DIR" Secure="yes">
+            <DirectorySearchRef Id="VS2017EnvironmentDirectorySearch" Parent="VS2017DirectorySearch" Path="Common7\IDE">
+                <DirectorySearch Id="VS2017ExtensionsDirectorySearch" Path="Extensions" Depth="1" />
+            </DirectorySearchRef>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2017_PROJECTTEMPLATES_DIR" Secure="yes">
+            <DirectorySearchRef Id="VS2017EnvironmentDirectorySearch" Parent="VS2017DirectorySearch" Path="Common7\IDE">
+                <DirectorySearch Id="VS2017ProjectTemplatesDirectorySearch" Path="ProjectTemplates" Depth="1" />
+            </DirectorySearchRef>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <PropertyRef Id="VS2017_ROOT_FOLDER" />
+        <Property Id="VS2017_SCHEMAS_DIR" Secure="yes">
+            <DirectorySearch Id="VS2017XmlDirectorySearch" Path="[VS2017_ROOT_FOLDER]\Xml" Depth="1">
+                <DirectorySearch Id="VS2017XmlSchemasDirectorySearch" Path="Schemas" Depth="1" />
+            </DirectorySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2017_ITEMTEMPLATES_DIR" Secure="yes">
+            <DirectorySearchRef Id="VS2017EnvironmentDirectorySearch" Parent="VS2017DirectorySearch" Path="Common7\IDE">
+                <DirectorySearch Id="VS2017ItemTemplatesDirectorySearch" Path="ItemTemplates" Depth="1" />
+            </DirectorySearchRef>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <PropertyRef Id="VS2017_ROOT_FOLDER" />
+        <Property Id="VS2017_BOOTSTRAPPER_PACKAGE_FOLDER" Secure="yes">
+            <DirectorySearch Id="VS2017SDKDirectorySearch" Path="[VS2017_ROOT_FOLDER]\SDK" Depth="1">
+                <DirectorySearch Id="SearchForVS2017BootstrapperPackageDirectory" Path="Bootstrapper" Depth="1" />
+            </DirectorySearch>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <Property Id="VS2017DEVENV" Secure="yes">
+            <DirectorySearchRef Id="VS2017EnvironmentDirectorySearch" Parent="VS2017DirectorySearch" Path="Common7\IDE">
+                <FileSearch Id="VS2017DevEnvSearch" Name="devenv.exe" />
+            </DirectorySearchRef>
+        </Property>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2017Setup" Property="VS2017DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2017DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2017Setup" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <CustomAction Id="VS2017InstallVSTemplates" Property="VS2017DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
+        <PropertyRef Id="VS2017DEVENV" />
+
+        <InstallExecuteSequence>
+            <Custom Action="VS2017InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS2017DEVENV</Custom>
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <!-- Indicates whether the Visual C# project system is installed as a part of  -->
+    <!-- Visual Studio 2017 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2017 standard or higher is installed and the Visual   -->
+    <!-- C# language tools were installed as a part of VS 2017 setup.              -->
+    <Fragment>
+        <Property Id="VS2017_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+
+    <!-- Indicates whether the Visual Basic project system is installed as a part of -->
+    <!-- Visual Studio 2017 standard or higher. If this property is set, that        -->
+    <!-- means Visual Studio 2017 standard or higher is installed and the Visual     -->
+    <!-- Basic language tools were installed as a part of VS 2017 setup.             -->
+    <Fragment>
+        <Property Id="VS2017_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" />
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+
+    <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
+    <!-- Visual Studio 2017 standard or higher. If this property is set, that                -->
+    <!-- means Visual Studio 2017 standard or higher is installed and the Visual             -->
+    <!-- Web Developer language tools were installed as a part of VS 2017 setup.             -->
+    <Fragment>
+        <Property Id="VS2017_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" />
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+
+    <!-- Indicates whether the Visual C++ project system is installed as a part of -->
+    <!-- Visual Studio 2017 standard or higher. If this property is set, that      -->
+    <!-- means Visual Studio 2017 standard or higher is installed and the Visual   -->
+    <!-- C++ language tools were installed as a part of VS 2017 setup.             -->
+    <Fragment>
+        <Property Id="VS2017_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" />
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio 2017 Team Test project system is installed -->
+    <Fragment>
+        <Property Id="VS2017_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" />
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio Modeling project system is installed -->
+    <Fragment>
+        <Property Id="VS2017_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" />
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+
+    <!-- Indicates whether the Visual Studio F# project system is installed -->
+    <Fragment>
+        <Property Id="VS2017_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
+        <CustomActionRef Id="VSFindInstances" />
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/VSExtension_Platform.wxi b/src/wixlib/VSExtension_Platform.wxi
new file mode 100644
index 00000000..30d107ef
--- /dev/null
+++ b/src/wixlib/VSExtension_Platform.wxi
@@ -0,0 +1,18 @@
+<?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. -->
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?include caSuffix.wxi ?>
+    <Fragment>
+        <CustomAction Id="VSFindInstances$(var.Suffix)" BinaryKey="VSCA$(var.Suffix)" DllEntry="FindInstances" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+        <InstallExecuteSequence>
+            <Custom Action="VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
+        </InstallExecuteSequence>
+        <InstallUISequence>
+            <Custom Action="VSFindInstances$(var.Suffix)" Before="AppSearch" Overridable="yes" />
+        </InstallUISequence>
+    </Fragment>
+    <Fragment>
+        <Binary Id="VSCA$(var.Suffix)" SourceFile="vsca.dll" />
+    </Fragment>
+</Include>
diff --git a/src/wixlib/VSExtension_x86.wxs b/src/wixlib/VSExtension_x86.wxs
new file mode 100644
index 00000000..288cf687
--- /dev/null
+++ b/src/wixlib/VSExtension_x86.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x86 ?>
+    <?include VSExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/wixlib/VsixPackage.wxs b/src/wixlib/VsixPackage.wxs
new file mode 100644
index 00000000..8149c55b
--- /dev/null
+++ b/src/wixlib/VsixPackage.wxs
@@ -0,0 +1,61 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <Property Id="VS2010_VSIX_INSTALLER_PATH" Secure="yes">
+            <RegistrySearch Id="WixVS2010EnvDir" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS" Name="EnvironmentDirectory" Type="directory">
+                <FileSearch Id="WixVS2010VsixInstaller" Name="VSIXInstaller.exe" />
+            </RegistrySearch>
+        </Property>
+
+        <Property Id="VS2012_VSIX_INSTALLER_PATH" Secure="yes">
+            <RegistrySearch Id="WixVS2012EnvDir" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VS" Name="EnvironmentDirectory" Type="directory">
+                <FileSearch Id="WixVS2012VsixInstaller" Name="VSIXInstaller.exe" />
+            </RegistrySearch>
+        </Property>
+
+        <Property Id="VS2013_VSIX_INSTALLER_PATH" Secure="yes">
+            <RegistrySearch Id="WixVS2013EnvDir" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VS" Name="EnvironmentDirectory" Type="directory">
+                <FileSearch Id="WixVS2013VsixInstaller" Name="VSIXInstaller.exe" />
+            </RegistrySearch>
+        </Property>
+
+        <!-- VS2015 is the latest VSIX at this point in time, so search for that by default. -->
+        <Property Id="VS2015_VSIX_INSTALLER_PATH" Secure="yes">
+            <RegistrySearch Id="WixVS2015EnvDir" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentDirectory" Type="directory">
+                <FileSearch Id="WixVS2015VsixInstaller" Name="VSIXInstaller.exe" />
+            </RegistrySearch>
+        </Property>
+
+        <Property Id="VS_VSIX_INSTALLER_PATH" Secure="yes" />
+
+        <!-- VWD2012 registers differently than the rest of Visual Studio, so search for it in the case VS2012 is missing. -->
+        <Property Id="VWD2012_VSIX_INSTALL_ROOT">
+            <RegistrySearch Id="Vwd2012Search" Root="HKLM" Key="SOFTWARE\Microsoft\VWDExpress\11.0\Setup\VS" Name="ProductDir" Type="raw" />
+        </Property>
+
+        <!-- VWD2013 registers differently than the rest of Visual Studio, so search for it in the case VS2013 is missing. -->
+        <Property Id="VWD2013_VSIX_INSTALL_ROOT">
+            <RegistrySearch Id="Vwd2013Search" Root="HKLM" Key="SOFTWARE\Microsoft\VWDExpress\12.0\Setup\VS" Name="ProductDir" Type="raw" />
+        </Property>
+
+        <!-- VWD2015 registers differently than the rest of Visual Studio, so search for it in the case VS2015 is missing. -->
+        <Property Id="VWD2015_VSIX_INSTALL_ROOT">
+            <RegistrySearch Id="Vwd2015Search" Root="HKLM" Key="SOFTWARE\Microsoft\VWDExpress\14.0\Setup\VS" Name="ProductDir" Type="raw" />
+        </Property>
+
+        <!-- Use the latest VS- or VWD-installed VSIXInstaller.exe. -->
+        <SetProperty Action="SetVS2015Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2015_VSIX_INSTALLER_PATH]" Sequence="both" After="AppSearch">NOT VS_VSIX_INSTALLER_PATH AND VS2015_VSIX_INSTALLER_PATH</SetProperty>
+        <SetProperty Action="Vwd2015VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2015_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2015Vsix">NOT VS_VSIX_INSTALLER_PATH AND VWD2015_VSIX_INSTALL_ROOT</SetProperty>
+
+        <SetProperty Action="SetVS2013Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2013_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2015VsixWhenVSAbsent">NOT VS_VSIX_INSTALLER_PATH AND VS2013_VSIX_INSTALLER_PATH</SetProperty>
+        <SetProperty Action="Vwd2013VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2013_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2013Vsix">NOT VS_VSIX_INSTALLER_PATH AND VWD2013_VSIX_INSTALL_ROOT</SetProperty>
+
+        <SetProperty Action="SetVS2012Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2012_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2013VsixWhenVSAbsent">NOT VS_VSIX_INSTALLER_PATH AND VS2012_VSIX_INSTALLER_PATH</SetProperty>
+        <SetProperty Action="Vwd2012VsixWhenVSAbsent" Id="VS_VSIX_INSTALLER_PATH" Value="[VWD2012_VSIX_INSTALL_ROOT]\Common7\IDE\VSIXInstaller.exe" Sequence="both" After="SetVS2012Vsix">NOT VS_VSIX_INSTALLER_PATH AND VWD2012_VSIX_INSTALL_ROOT</SetProperty>
+
+        <SetProperty Action="SetVS2010Vsix" Id="VS_VSIX_INSTALLER_PATH" Value="[VS2010_VSIX_INSTALLER_PATH]" Sequence="both" After="Vwd2012VsixWhenVSAbsent">NOT VS_VSIX_INSTALLER_PATH AND VS2010_VSIX_INSTALLER_PATH</SetProperty>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi
new file mode 100644
index 00000000..a56a2393
--- /dev/null
+++ b/src/wixlib/caSuffix.wxi
@@ -0,0 +1,28 @@
+<?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. -->
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?ifndef platform ?>
+        <?error Required value "platform" not defined in include caSuffix.wxi ?>
+    <?endif ?>
+
+    <?ifdef Suffix ?>
+        <?undef Suffix ?>
+        <?undef DeferredSuffix ?>
+    <?endif ?>
+
+    <?if $(var.platform)="x86" ?>
+        <?define Suffix="" ?>
+        <?define DeferredSuffix="" ?>
+    <?endif ?>
+
+    <?if $(var.platform)="x64" ?>
+        <?define Suffix="_x64" ?>
+        <?define DeferredSuffix="_64" ?>
+    <?endif ?>
+
+    <?if $(var.platform)="arm" ?>
+        <?define Suffix="_ARM" ?>
+        <?define DeferredSuffix="_ARM" ?>
+    <?endif ?>
+</Include>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
new file mode 100644
index 00000000..7120dc24
--- /dev/null
+++ b/src/wixlib/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.0.41" developmentDependency="true" />
+  <package id="WixToolset.Core.InternalPackage" version="4.0.15" targetFramework="net40" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/src/wixlib/vs.wixproj b/src/wixlib/vs.wixproj
new file mode 100644
index 00000000..15dd5092
--- /dev/null
+++ b/src/wixlib/vs.wixproj
@@ -0,0 +1,65 @@
+<?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" ToolsVersion="15.0">
+  <Import Project="..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props" Condition="Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props')" />
+  <Import Project="..\FindLocalWix.props" />
+
+  <PropertyGroup>
+    <ProjectGuid>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid>
+    <OutputName>vs</OutputName>
+    <OutputType>Library</OutputType>
+    <BindFiles>true</BindFiles>
+    <Pedantic>true</Pedantic>
+    <Cultures>en-us</Cultures>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="HTML_Help_Registration__RTL_X86.wxs" />
+    <Compile Include="Vs2003.wxs" />
+    <Compile Include="Vs2005.wxs" />
+    <Compile Include="Vs2008.wxs" />
+    <Compile Include="Vs2010.wxs" />
+    <Compile Include="Vs11.wxs" />
+    <Compile Include="Vs2012.wxs" />
+    <Compile Include="Vs2013.wxs" />
+    <Compile Include="VS14.wxs" />
+    <Compile Include="VS2015.wxs" />
+    <Compile Include="VS2017.wxs" />
+    <Compile Include="VSExtension_x86.wxs" />
+    <Compile Include="VsixPackage.wxs" />
+    <Compile Include="vs2005\vs2005_VSIPCC_Collection_Files_RTL.wxs" />
+    <Compile Include="vs2008\vs2008_VSIPCC_Collection_Files_RTL.wxs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="vs2005\" />
+    <Folder Include="vs2008\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ca\vsca.vcxproj">
+      <Name>vsca</Name>
+      <Project>{45308b85-0628-4978-8fc8-6ad9e1ad5949}</Project>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="FG-WiX or WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download FG-WiX, go to https://www.firegiant.com/downloads/. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
+  </Target>
+
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props'))" />
+  </Target>
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" />
+</Project>
diff --git a/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs b/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs
new file mode 100644
index 00000000..bb0dfd62
--- /dev/null
+++ b/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs
@@ -0,0 +1,64 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment Id="VS2005_Namespace">
+    <DirectoryRef Id="VSIPCC">
+      <Component Id="VSIPCC_Reg" Guid="96F72137-191F-4120-A2FA-9DA8F6C2C993" KeyPath="yes">
+        <CreateFolder />
+        <RegistryValue Id="_FldbVs8_RegFile_15039_________00000" Root="HKLM" Key="SOFTWARE\Microsoft\MSDN\8.0\Help\0x0409\{F658C410-5D42-41a9-AB6C-83E8FE395595}" Name="Filename" Type="string" Value="ms-help://MS.VSIPCC.v80" />
+      </Component>
+      <Directory Id="vsipcc_v8.0" Name="v8.0" FileSource="$(sys.SOURCEFILEDIR)\Redist">
+        <Component Id="vsipcc_collection________" Guid="454FF049-0B57-4927-8A0C-AA10608A480C">
+          <File Id="FL_vsipcc_reg_hxs_86878________" Name="vsipcc_reg.hxs" KeyPath="yes" />
+          <File Id="FL_vsipcc_hxc_86879________" Name="vsipcc.hxc" />
+          <File Id="FL_vsipcc_hxt_86880________" Name="vsipcc.hxt" />
+          <File Id="FL_vsipccALinks_hxk_86881________" Name="vsipccALinks.hxk" />
+          <File Id="FL_vsipccBLinks_hxk_86882________" Name="vsipccBLinks.hxk" />
+          <File Id="FL_vsipccFLinks_hxk_86885________" Name="vsipccFLinks.hxk" />
+          <File Id="FL_vsipccKLinks_hxk_86886________" Name="vsipccKLinks.hxk" />
+          <File Id="FL_vsipccNamedURLs_hxk_86888________.3643236F_FC70_11D3_A536_0090278A1BB" Name="vsipccNamedURLs.hxk" />
+          <File Id="FL_vsipccSlinks_hxk_93825________" Name="vsipccSlinks.hxk" />
+          <File Id="FL_VsipCCSamples_HxK_103959________" Name="VsipCCSamples.HxK" />
+        </Component>
+      </Directory>
+    </DirectoryRef>
+    <CustomAction Id="CA_HxMerge_VSIPCC_VSCC" Return="ignore" Execute="commit" Impersonate="no" BinaryKey="BIN_File_60377" ExeCommand="ms-help://MS.VSCC.v80" />
+    <CustomAction Id="CA_HxMerge_VSIPCC_VSExpCC" Return="ignore" Execute="commit" Impersonate="no" BinaryKey="BIN_File_60377" ExeCommand="ms-help://MS.VSExpressCC.v80" />
+    <InstallExecuteSequence>
+      <Custom Action="CA_HxMerge_VSIPCC_VSCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8"/>
+      <Custom Action="CA_HxMerge_VSIPCC_VSExpCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8"/>
+    </InstallExecuteSequence>
+    <Binary Id="BIN_File_60377" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_File_60377.dll" />
+    <CustomTable Id="HelpPlugin">
+      <Row>
+        <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data>
+        <Data Column="HelpNamespace_Parent">MS_VSCC_v80</Data>
+        <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data>
+        <Data Column="File_HxA" />
+        <Data Column="File_ParentHxT" />
+      </Row>
+      <Row>
+        <Data Column="HelpNamespace_">MS_VSIPCC_v80</Data>
+        <Data Column="HelpNamespace_Parent">MS_VSExpressCC_v80</Data>
+        <Data Column="File_HxT">FL_vsipcc_hxt_86880________</Data>
+        <Data Column="File_HxA" />
+        <Data Column="File_ParentHxT" />
+      </Row>
+    </CustomTable>
+    <CustomTable Id="HelpNamespace">
+      <Row>
+        <Data Column="NamespaceKey">MS_VSIPCC_v80</Data>
+        <Data Column="NamespaceName">MS.VSIPCC.v80</Data>
+        <Data Column="File_Collection">FL_vsipcc_hxc_86879________</Data>
+        <Data Column="Description">VSIP Documentation</Data>
+      </Row>
+    </CustomTable>
+
+    <ComponentGroup Id="Help2_VS2005_Namespace_Components">
+      <ComponentRef Id="VSIPCC_Reg"/>
+      <ComponentRef Id="vsipcc_collection________"/>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/wixlib/vs2005/redist/BIN_File_60377.dll b/src/wixlib/vs2005/redist/BIN_File_60377.dll
new file mode 100644
index 00000000..dfdddf66
--- /dev/null
+++ b/src/wixlib/vs2005/redist/BIN_File_60377.dll
diff --git a/src/wixlib/vs2005/redist/vsipCCSamples.HxK b/src/wixlib/vs2005/redist/vsipCCSamples.HxK
new file mode 100644
index 00000000..00db745c
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipCCSamples.HxK
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "Samples"
+        Id = "VsipCCSamples"
+        AutoInclude = "Yes"
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "Samples"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2005/redist/vsipcc.hxc b/src/wixlib/vs2005/redist/vsipcc.hxc
new file mode 100644
index 00000000..406e7f2b
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipcc.hxc
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpCollection>
+<HelpCollection 
+        DTDVersion = "1.0" 
+        Id = "vsipcc.8.0" 
+        FileVersion = "8.0.41025.0" 
+        LangId = "1033" 
+        Title = "Microsoft VSIP Combined Help Collection" 
+        Copyright = "Copyright (c) 2005 Microsoft Corporation. All Rights Reserved."
+        >
+        <TOCDef File = "vsipcc.HxT" Id = "InsertTOC:VSIPCC" />
+        <KeywordIndexDef File = "vsipccALinks.HxK"/>
+        <KeywordIndexDef File = "vsipccBLinks.HxK"/>
+        <KeywordIndexDef File = "vsipccCLinks.HxK"/>
+        <KeywordIndexDef File = "vsipccFLinks.HxK"/>
+        <KeywordIndexDef File = "vsipccKLinks.HxK"/>
+        <KeywordIndexDef File = "vsipccSLinks.HxK"/>
+        <KeywordIndexDef File = "vsipccNamedUrls.HxK"/>
+        <KeywordIndexDef File=  "VsipCCSamples.HxK" />
+
+        <ItemMoniker Name = "!DefaultNamedUrlIndex" ProgId = "HxDs.HxIndex" InitData = "VsccNamedUrls"/>
+        <ItemMoniker Name = "!SampleInfo" ProgId = "HxDs.HxSampleCollection" InitData = "Samples"/>
+        <ItemMoniker Name = "!DefaultTOC" ProgId = "HxDs.HxHierarchy" InitData = "TOC"/>
+        <ItemMoniker Name = "!DefaultFullTextSearch" ProgId = "HxDs.HxFullTextSearch" InitData = ""/>
+        <ItemMoniker Name = "!DefaultAssociativeIndex" ProgId = "HxDs.HxIndex" InitData = "A"/>
+        <ItemMoniker Name = "!DefaultDynamicLinkIndex" ProgId = "HxDs.HxIndex" InitData = "B"/>
+        <ItemMoniker Name = "!DefaultCodeIndex" ProgId = "HxDs.HxIndex" InitData = "C"/>
+        <ItemMoniker Name = "!DefaultContextWindowIndex" ProgId = "HxDs.HxIndex" InitData = "F"/>
+        <ItemMoniker Name = "!DefaultKeywordIndex" ProgId = "HxDs.HxIndex" InitData = "K"/>
+        <ItemMoniker Name = "!DefaultSearchWindowIndex" ProgId = "HxDs.HxIndex" InitData = "S"/>
+        <ItemMoniker Name = "!DefaultSampleIndex" ProgId="HxDs.HxIndex" InitData="Samples" />
+</HelpCollection>
+
diff --git a/src/wixlib/vs2005/redist/vsipcc.hxt b/src/wixlib/vs2005/redist/vsipcc.hxt
new file mode 100644
index 00000000..613dcfbb
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipcc.hxt
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpTOC>
+<HelpTOC 
+        DTDVersion = "1.0" 
+        Id = "vsipcc_TOC"
+        FileVersion = "8.0.0.0" 
+        LangId = "1033"
+        ParentNodeIcon = "Book"
+        PluginStyle = "Flat"
+        >
+        <HelpTOCNode Id = "InsertTOC:VSIP" NodeType = "TOC"/>
+        <HelpTOCNode Id = "InsertTOC:Partner" NodeType = "TOC"/>
+</HelpTOC>
+
+
diff --git a/src/wixlib/vs2005/redist/vsipccALinks.hxk b/src/wixlib/vs2005/redist/vsipccALinks.hxk
new file mode 100644
index 00000000..27017f76
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipccALinks.hxk
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "A"
+        Id = "vsipcc8.0_ALinks"
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "HxLink Index"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2005/redist/vsipccBLinks.hxk b/src/wixlib/vs2005/redist/vsipccBLinks.hxk
new file mode 100644
index 00000000..b37d2e18
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipccBLinks.hxk
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "B"
+        Id = "vsipcc8.0_BLinks"
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "Dynamic Link Index"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
diff --git a/src/wixlib/vs2005/redist/vsipccFLinks.hxk b/src/wixlib/vs2005/redist/vsipccFLinks.hxk
new file mode 100644
index 00000000..2d37efbf
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipccFLinks.hxk
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "F"
+        Id = "vsipcc8.0_FLinks"
+        AutoInclude = "Yes"
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "Dynamic Help and F1 Index"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2005/redist/vsipccKLinks.hxk b/src/wixlib/vs2005/redist/vsipccKLinks.hxk
new file mode 100644
index 00000000..2938eff3
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipccKLinks.hxk
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "K"
+        Id = "vsipcc8.0_KLinks" 
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "Keyword Index"
+        Visible = "Yes"
+        LangId = "1033"
+        >
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2005/redist/vsipccNamedURLs.hxk b/src/wixlib/vs2005/redist/vsipccNamedURLs.hxk
new file mode 100644
index 00000000..8691c54c
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipccNamedURLs.hxk
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "VsipccNamedUrls"
+        Id = "VsipccNamedUrls"  
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "VSIPCC NamedUrl Index"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2005/redist/vsipccSlinks.hxk b/src/wixlib/vs2005/redist/vsipccSlinks.hxk
new file mode 100644
index 00000000..9d193521
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipccSlinks.hxk
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "S"
+        Id = "vsipcc8.0_SLinks"
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "Search Enhancement Index"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
+
diff --git a/src/wixlib/vs2005/redist/vsipcc_reg.hxs b/src/wixlib/vs2005/redist/vsipcc_reg.hxs
new file mode 100644
index 00000000..3f2905c4
--- /dev/null
+++ b/src/wixlib/vs2005/redist/vsipcc_reg.hxs
diff --git a/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
new file mode 100644
index 00000000..bfeef18f
--- /dev/null
+++ b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
@@ -0,0 +1,61 @@
+<?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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment Id="VS2008_Namespace">
+    <Binary Id="BIN_435439_x86_enu" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_435439_x86_enu.dll" />
+    <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" BinaryKey="BIN_435439_x86_enu" DllEntry="ScheduleExtHelpPlugin" Return="ignore" />
+    <CustomAction Id="CA_ExtHelpPlugin" BinaryKey="BIN_435439_x86_enu" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" />
+    
+    <DirectoryRef Id="VSIPCC">
+      <Component Id="VSIPCC_Reg_27501" Guid="{7C32E9FB-9C4D-416B-8ACC-9D487ED0ADBD}" KeyPath="yes">
+        <CreateFolder Directory="VSIPCC" />
+        <RegistryValue Id="reg7291AF922BB02FD23E15437538DF9347" Root="HKLM" Key="SOFTWARE\Microsoft\MSDN\9.0\Help\0x0409\{F658C410-5D42-41a9-AB6C-83E8FE395595}" Name="Filename" Value="ms-help://MS.VSIPCC.v90" Type="string" />
+      </Component>
+      <Directory Id="vsipcc_v9.0" Name="v9.0" FileSource="$(sys.SOURCEFILEDIR)\Redist">
+        <Component Id="vsipcc_collection_25097" Guid="{D419D13C-D6D8-4E2A-A3EF-B26398D36524}">
+          <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no"/>
+          <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no"/>
+          <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no"/>
+          <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no"/>
+          <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no"/>
+          <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no"/>
+          <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no"/>
+          <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no"/>
+          <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no"/>
+          <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no"/>
+          <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no"/>
+        </Component>
+      </Directory>
+    </DirectoryRef>
+    <CustomTable Id="HelpNamespace">
+      <Row>
+        <Data Column="NamespaceKey">MS.VSIPCC.v90</Data>
+        <Data Column="NamespaceName">MS.VSIPCC.v90</Data>
+        <Data Column="File_Collection">FL_vsipcc_hxc_86879_86879_cn_ln</Data>
+        <Data Column="Description">VSIP Documentation</Data>
+      </Row>
+    </CustomTable>
+    <CustomTable Id="HelpPlugin">
+      <Row>
+        <Data Column="HelpNamespace_">MS.VSIPCC.v90</Data>
+        <Data Column="HelpNamespace_Parent">MS.VSCC.v90</Data>
+        <Data Column="File_HxT">FL_vsipcc_hxt_86880_86880_cn_ln</Data>
+        <Data Column="File_HxA" />
+        <Data Column="File_ParentHxT" />
+      </Row>
+    </CustomTable>
+    <Property Id="EXTERNALPLUGINLIST" Value="MS.VSCC.v90;MS.VSIPCC.v90" />
+    <Property Id="DirectoryTable_x86" Value="DirectoryTable" />
+    <Property Id="HHFilterTable" Value="HHFilterTable" />
+    <InstallExecuteSequence>
+      <Custom Action="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8">Not Installed</Custom>
+    </InstallExecuteSequence>
+
+    <ComponentGroup Id="Help2_VS2008_Namespace_Components">
+      <ComponentRef Id="VSIPCC_Reg_27501"/>
+      <ComponentRef Id="vsipcc_collection_25097"/>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/wixlib/vs2008/redist/BIN_435439_x86_enu.dll b/src/wixlib/vs2008/redist/BIN_435439_x86_enu.dll
new file mode 100644
index 00000000..7f5e9436
--- /dev/null
+++ b/src/wixlib/vs2008/redist/BIN_435439_x86_enu.dll
diff --git a/src/wixlib/vs2008/redist/_ALinks.hxk b/src/wixlib/vs2008/redist/_ALinks.hxk
new file mode 100644
index 00000000..dd6df168
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_ALinks.hxk
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex DTDVersion = "1.0"
+   Name="A"
+   Id = "_ALinks"
+   Merge="Yes"
+   Sort="Yes"
+   Title="A-link Index"
+   Visible="No">
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2008/redist/_BLinks.hxk b/src/wixlib/vs2008/redist/_BLinks.hxk
new file mode 100644
index 00000000..a2288162
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_BLinks.hxk
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex DTDVersion = "1.0"
+   Name="B"
+   Id = "_BLinks"
+   Merge="Yes"
+   Sort="Yes"
+   Title="B-link Index"
+   Visible="No">
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2008/redist/_CLinks.hxk b/src/wixlib/vs2008/redist/_CLinks.hxk
new file mode 100644
index 00000000..da0df730
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_CLinks.hxk
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "C"
+        Id = "_CLinks"
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "Code Index"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
diff --git a/src/wixlib/vs2008/redist/_FLinks.hxk b/src/wixlib/vs2008/redist/_FLinks.hxk
new file mode 100644
index 00000000..37dfda34
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_FLinks.hxk
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex DTDVersion = "1.0"
+   Name="F"
+   Id = "_FLinks"
+   Merge="Yes"
+   Sort="Yes"
+   Title="F-link Index"
+   Visible="No">
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2008/redist/_KLinks.hxk b/src/wixlib/vs2008/redist/_KLinks.hxk
new file mode 100644
index 00000000..2303ed0c
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_KLinks.hxk
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex Name = "K"
+        Id = "_KLinks"  
+        DTDVersion = "1.0"
+        Merge="Yes"
+        Sort="Yes"
+        Title="Keyword Index"
+        Visible="Yes">
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2008/redist/_SLinks.hxk b/src/wixlib/vs2008/redist/_SLinks.hxk
new file mode 100644
index 00000000..9f65eca3
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_SLinks.hxk
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex
+        DTDVersion = "1.0"
+        Name="S"
+        Id = "_SLinks"
+        AutoInclude = "Yes"
+        Merge="Yes"
+        Sort="Yes"
+        Title="Search Index"
+        Visible="No"
+        LangId = "1033">
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2008/redist/_vsipcc90.hxc b/src/wixlib/vs2008/redist/_vsipcc90.hxc
new file mode 100644
index 00000000..9ad6869e
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_vsipcc90.hxc
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpCollection>
+<HelpCollection 
+        DTDVersion = "1.0" 
+        Id = "vsipcc.9.0" 
+        FileVersion = "9.0.20220.0" 
+        LangId = "1033" 
+        Title = "Visual Studio Orcas Partner Documentation" 
+        Copyright = "Copyright (c) 2007 Microsoft Corporation. All Rights Reserved."
+        >
+        <TOCDef File = "_vsipcc90.HxT" Id = "InsertTOC:VSIPCC" />
+        <KeywordIndexDef File = "_ALinks.HxK"/>
+        <KeywordIndexDef File = "_BLinks.HxK"/>
+        <KeywordIndexDef File = "_CLinks.HxK"/>
+        <KeywordIndexDef File = "_FLinks.HxK"/>
+        <KeywordIndexDef File = "_KLinks.HxK"/>
+        <KeywordIndexDef File = "_SLinks.HxK"/>
+        <KeywordIndexDef File = "_vsipcc_NamedUrls.HxK"/>
+        <KeywordIndexDef File=  "_VsipCC_Samples.HxK" />
+
+        <ItemMoniker Name = "!DefaultNamedUrlIndex" ProgId = "HxDs.HxIndex" InitData = "VsccNamedUrls"/>
+        <ItemMoniker Name = "!SampleInfo" ProgId = "HxDs.HxSampleCollection" InitData = "Samples"/>
+        <ItemMoniker Name = "!DefaultTOC" ProgId = "HxDs.HxHierarchy" InitData = "TOC"/>
+        <ItemMoniker Name = "!DefaultFullTextSearch" ProgId = "HxDs.HxFullTextSearch" InitData = ""/>
+        <ItemMoniker Name = "!DefaultAssociativeIndex" ProgId = "HxDs.HxIndex" InitData = "A"/>
+        <ItemMoniker Name = "!DefaultDynamicLinkIndex" ProgId = "HxDs.HxIndex" InitData = "B"/>
+        <ItemMoniker Name = "!DefaultCodeIndex" ProgId = "HxDs.HxIndex" InitData = "C"/>
+        <ItemMoniker Name = "!DefaultContextWindowIndex" ProgId = "HxDs.HxIndex" InitData = "F"/>
+        <ItemMoniker Name = "!DefaultKeywordIndex" ProgId = "HxDs.HxIndex" InitData = "K"/>
+        <ItemMoniker Name = "!DefaultSearchWindowIndex" ProgId = "HxDs.HxIndex" InitData = "S"/>
+        <ItemMoniker Name = "!DefaultSampleIndex" ProgId="HxDs.HxIndex" InitData="Samples" />
+</HelpCollection>
+
diff --git a/src/wixlib/vs2008/redist/_vsipcc90.hxt b/src/wixlib/vs2008/redist/_vsipcc90.hxt
new file mode 100644
index 00000000..3ac4d5d6
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_vsipcc90.hxt
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpTOC>
+<HelpTOC 
+        DTDVersion = "1.0" 
+        Id = "vsipcc_TOC"
+        FileVersion = "9.0.20220.0" 
+        LangId = "1033"
+        ParentNodeIcon = "Book"
+        PluginStyle = "Flat"
+        >
+        <HelpTOCNode Id = "InsertTOC:VSIP" NodeType = "TOC"/>
+        <HelpTOCNode Id = "InsertTOC:Partner" NodeType = "TOC"/>
+</HelpTOC>
+
+
diff --git a/src/wixlib/vs2008/redist/_vsipcc_namedUrls.hxk b/src/wixlib/vs2008/redist/_vsipcc_namedUrls.hxk
new file mode 100644
index 00000000..aaa79158
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_vsipcc_namedUrls.hxk
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "VsipccNamedUrls"
+        Id = "VsipccNamedUrls"  
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "VSIPCC NamedUrl Index"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2008/redist/_vsipcc_samples.HxK b/src/wixlib/vs2008/redist/_vsipcc_samples.HxK
new file mode 100644
index 00000000..00db745c
--- /dev/null
+++ b/src/wixlib/vs2008/redist/_vsipcc_samples.HxK
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE HelpIndex>
+<HelpIndex 
+        DTDVersion = "1.0"
+        Name = "Samples"
+        Id = "VsipCCSamples"
+        AutoInclude = "Yes"
+        Merge = "Yes"
+        Sort = "Yes"
+        Title = "Samples"
+        Visible = "No"
+        LangId = "1033"
+        >
+</HelpIndex>
\ No newline at end of file
diff --git a/src/wixlib/vs2008/redist/vsipcc_reg.hxs b/src/wixlib/vs2008/redist/vsipcc_reg.hxs
new file mode 100644
index 00000000..f6446867
--- /dev/null
+++ b/src/wixlib/vs2008/redist/vsipcc_reg.hxs