Initial code commit

45 files changed, 2904 insertions, 0 deletions

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