diff --git a/.gitignore b/.gitignore
index 75d2ba66b3..b181dd0b2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 # Compiled Dynamic libraries
 *.so
 *.dylib
-*.dll
+#*.dll
 
 # Fortran module files
 *.mod
@@ -55,8 +55,8 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
-x86/
+#x64/
+#x86/
 bld/
 [Bb]in/
 [Oo]bj/
diff --git a/Jamroot.jam b/Jamroot.jam
index f4a5616ce6..20bb3aa0dd 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -363,6 +363,8 @@ project pwiz
 
         <toolset>msvc,<debug-symbols>on:<preserve-test-targets>off # save space on debug builds by deleting test artifacts which run successfully
 
+        <conditional>@msvc-runtime-dlls
+
         $(TEAMCITY_TEST_DECORATION)
 
     : build-dir $(PWIZ_BUILD_PATH)
@@ -704,6 +706,7 @@ install executables
       <conditional>@install-vendor-api-dependencies
       <conditional>@dotNET-dependencies
       <conditional>@gcc-install-dll-path
+      <toolset>msvc:<dependency>install-msvc-runtime-dlls
       <dependency>VERSION
     ;
 
@@ -715,6 +718,7 @@ install gui_tools
       <conditional>@install-vendor-api-dependencies
       <conditional>@dotNET-dependencies
       <conditional>@gcc-install-dll-path
+      <toolset>msvc:<dependency>install-msvc-runtime-dlls
     ;
 
 install package_docs
@@ -731,6 +735,7 @@ install msconvert
       <conditional>@install-identdata-dependencies
       <conditional>@install-vendor-api-dependencies
       <conditional>@gcc-install-dll-path
+      <toolset>msvc:<dependency>install-msvc-runtime-dlls
     ;
 explicit msconvert ;
 
@@ -740,6 +745,7 @@ install msbenchmark
       <conditional>@install-location
       <conditional>@install-vendor-api-dependencies
       <conditional>@gcc-install-dll-path
+      <toolset>msvc:<dependency>install-msvc-runtime-dlls
     ;
 explicit msbenchmark ;
 
@@ -750,6 +756,7 @@ install idconvert
       <conditional>@install-identdata-dependencies
       <conditional>@install-vendor-api-dependencies
       <conditional>@gcc-install-dll-path
+      <toolset>msvc:<dependency>install-msvc-runtime-dlls
     ;
 explicit idconvert ;
 
@@ -1146,6 +1153,161 @@ rule msparser-usage-requirements ( properties * )
 searched-lib msparser : : <conditional>@msparser-requirements : : <conditional>@msparser-usage-requirements ;
 
 
+.msvcrt-x86 = 
+    Microsoft.VC110.CRT/x86/msvcp110.dll 
+    Microsoft.VC110.CRT/x86/msvcr110.dll 
+    Microsoft.VC110.CRT/x86/vcomp110.dll 
+    Microsoft.VC120.CRT/x86/msvcp120.dll 
+    Microsoft.VC120.CRT/x86/msvcr120.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-console-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-datetime-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-debug-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-errorhandling-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-file-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-file-l1-2-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-file-l2-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-handle-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-heap-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-interlocked-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-libraryloader-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-localization-l1-2-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-memory-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-namedpipe-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-processenvironment-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-processthreads-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-processthreads-l1-1-1.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-profile-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-rtlsupport-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-string-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-synch-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-synch-l1-2-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-sysinfo-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-timezone-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-core-util-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-conio-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-convert-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-environment-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-filesystem-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-heap-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-locale-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-math-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-multibyte-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-private-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-process-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-runtime-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-stdio-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-string-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-time-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/api-ms-win-crt-utility-l1-1-0.dll 
+    Microsoft.VC140.CRT/x86/mfc140.dll 
+    Microsoft.VC140.CRT/x86/msvcp140.dll 
+    Microsoft.VC140.CRT/x86/ucrtbase.dll 
+    Microsoft.VC140.CRT/x86/vcomp140.dll 
+    Microsoft.VC140.CRT/x86/vcruntime140.dll 
+    Microsoft.VC90.CRT/x86/msvcm90.dll 
+    Microsoft.VC90.CRT/x86/msvcp90.dll 
+    Microsoft.VC90.CRT/x86/msvcr90.dll 
+    Microsoft.VC90.CRT/x86/vcomp90.dll 
+    Microsoft.VC90.MFC/x86/mfc90.dll 
+    Microsoft.VC90.MFC/x86/mfc90u.dll 
+    ;
+
+.msvcrt-x64 =
+    Microsoft.VC110.CRT/x64/msvcp110.dll
+    Microsoft.VC110.CRT/x64/msvcr110.dll
+    Microsoft.VC110.CRT/x64/vcomp110.dll
+    Microsoft.VC120.CRT/x64/msvcp120.dll
+    Microsoft.VC120.CRT/x64/msvcr120.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-console-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-datetime-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-debug-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-errorhandling-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-file-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-file-l1-2-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-file-l2-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-handle-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-heap-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-interlocked-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-libraryloader-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-localization-l1-2-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-memory-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-namedpipe-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-processenvironment-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-processthreads-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-processthreads-l1-1-1.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-profile-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-rtlsupport-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-string-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-synch-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-synch-l1-2-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-sysinfo-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-timezone-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-core-util-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-conio-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-convert-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-environment-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-filesystem-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-heap-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-locale-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-math-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-multibyte-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-private-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-process-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-runtime-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-stdio-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-string-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-time-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/api-ms-win-crt-utility-l1-1-0.dll
+    Microsoft.VC140.CRT/x64/concrt140.dll
+    Microsoft.VC140.CRT/x64/mfc140.dll
+    Microsoft.VC140.CRT/x64/msvcp140.dll
+    Microsoft.VC140.CRT/x64/ucrtbase.dll
+    Microsoft.VC140.CRT/x64/vcomp140.dll
+    Microsoft.VC140.CRT/x64/vcruntime140.dll
+    Microsoft.VC90.CRT/x64/msvcm90.dll
+    Microsoft.VC90.CRT/x64/msvcp90.dll
+    Microsoft.VC90.CRT/x64/msvcr90.dll
+    Microsoft.VC90.CRT/x64/vcomp.dll
+    Microsoft.VC90.MFC/x64/mfc90.dll
+    ;
+
+rule msvc-runtime-dlls ( properties * )
+{
+    local result ;
+    if <toolset>msvc in $(properties)
+    {
+        if <address-model>64 in $(properties)
+        {
+            result = <assembly-dependency>$(PWIZ_ROOT_PATH)/pwiz_tools/Shared/Lib/$(.msvcrt-x64) ;
+        }
+        else
+        {
+            result = <assembly-dependency>$(PWIZ_ROOT_PATH)/pwiz_tools/Shared/Lib/$(.msvcrt-x86) ;
+        }
+    }
+    return $(result) ;
+}
+
+rule install-msvc-runtime-dlls-requirements ( properties * )
+{
+    local result ;
+    if <toolset>msvc in $(properties)
+    {
+        if <address-model>64 in $(properties)
+        {
+            result = <source>$(PWIZ_ROOT_PATH)/pwiz_tools/Shared/Lib/$(.msvcrt-x64) ;
+        }
+        else
+        {
+            result = <source>$(PWIZ_ROOT_PATH)/pwiz_tools/Shared/Lib/$(.msvcrt-x86) ;
+        }
+    }
+    return $(result) ;
+}
+
+install install-msvc-runtime-dlls : : <conditional>@install-location <conditional>@install-msvc-runtime-dlls-requirements ;
+
+
 # any source tree can build binary tarballs
 
 import common ;
diff --git a/pwiz_tools/Bumbershoot/idpicker/Deploy/Deploy.wxs.template b/pwiz_tools/Bumbershoot/idpicker/Deploy/Deploy.wxs.template
index b9e239fc5a..17fa02ee55 100644
--- a/pwiz_tools/Bumbershoot/idpicker/Deploy/Deploy.wxs.template
+++ b/pwiz_tools/Bumbershoot/idpicker/Deploy/Deploy.wxs.template
@@ -8,12 +8,12 @@
             Manufacturer="Bumbershoot"
             UpgradeCode="644795C6-012A-49B7-A47F-E46E164D3689">
 
-      <Package Description="IDPicker {version} $(var.AddressModel)-bit Installer" Manufacturer="Bumbershoot" InstallerVersion="405" Compressed="yes" />
+      <Package Description="IDPicker {version} $(var.AddressModel)-bit Installer" Manufacturer="Bumbershoot" InstallerVersion="500" Compressed="yes" />
       <Media Id="1" Cabinet="IDPicker.cab" EmbedCab="yes" />
       <Icon Id="idpDB_Icon.exe" SourceFile="msvc-release\IDPicker.exe" />
       <Property Id="ARPPRODUCTICON" Value="idpDB_Icon.exe" />
-      <Property Id="ALLUSERS" Value="1" />
-      <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONROOTDIRECTORY" />
+      <Property Id="ApplicationFolderName" Value="IDPicker {version} $(var.AddressModel)-bit" />
+      <Property Id="WixAppFolder" Value="WixPerUserFolder" />
       <WixVariable Id="WixUIBannerBmp" Value="msvc-release\..\..\pwiz_tools\Bumbershoot\idpicker\Resources\IDPickerSetupBanner.bmp" />
       <WixVariable Id="WixUIDialogBmp" Value="msvc-release\..\..\pwiz_tools\Bumbershoot\idpicker\Resources\IDPickerSetupBackground.bmp" />
 
@@ -30,56 +30,21 @@
       </Condition>
 
       <PropertyRef Id='NETFRAMEWORK45'/>
-      <Condition Message="Requires Microsoft .NET 4.5 Framework">
-        <![CDATA[Installed OR NETFRAMEWORK45]]>
+      <Condition Message="Requires Microsoft .NET 4.7.2 Framework">
+        <![CDATA[Installed OR (NETFRAMEWORK45 >= "#461808")]]>
       </Condition>
 
-      <UI>
-         <UIRef Id="WixUI_InstallDir" />
-         <!-- skip license dialog -->
-         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
-         <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
-      </UI>
-
-      <Directory Id="TARGETDIR" Name="SourceDir">
-
-        <?if $(var.AddressModel)=64 ?>
-          <Merge Id="CRT9" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm" DiskId="1" />
-          <Merge Id="MFC9" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_MFC_x86_x64.msm" DiskId="1" />
-          <Merge Id="CRT9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm" DiskId="1" />
-          <Merge Id="MFC9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86_x64.msm" DiskId="1" />
-
-          <Merge Id="CRT11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_CRT_x64.msm" DiskId="1" />
-          <Merge Id="OMP11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_OpenMP_x64.msm" DiskId="1" />
-          
-          <Merge Id="CRT12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_CRT_x64.msm" DiskId="1" />
-          <Merge Id="MFC12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_MFC_x64.msm" DiskId="1" />
-
-          <Merge Id="CRT14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_CRT_x64.msm" DiskId="1" />
-          <Merge Id="OMP14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_OpenMP_x64.msm" DiskId="1" />
-        <?else?>
-          <Merge Id="CRT9" Language="0" SourceFile="$(env.ProgramFiles(x86))\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm" DiskId="1" />
-          <Merge Id="MFC9" Language="0" SourceFile="$(env.ProgramFiles(x86))\Common Files\Merge Modules\Microsoft_VC90_MFC_x86.msm" DiskId="1" />
-          <Merge Id="CRT9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm" DiskId="1" />
-          <Merge Id="MFC9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86.msm" DiskId="1" />
-
-          <Merge Id="CRT11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_CRT_x86.msm" DiskId="1" />
-          <Merge Id="OMP11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_OpenMP_x86.msm" DiskId="1" />
-          
-          <Merge Id="CRT12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_CRT_x86.msm" DiskId="1" />
-          <Merge Id="MFC12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_MFC_x86.msm" DiskId="1" />
-            
-          <Merge Id="CRT14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_CRT_x86.msm" DiskId="1" />
-          <Merge Id="OMP14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_OpenMP_x86.msm" DiskId="1" />
-        <?endif?>
-        
+      <UIRef Id="WixUI_InstallDirScoped" />
+     <UIRef Id="WixUI_Common" />
+     
+     <Directory Id="TARGETDIR" Name="SourceDir">    
         <Directory Id="ProgramMenuFolder" />
         <Directory Id="$(var.ProgramFilesFolder)" Name="PFiles">
           <Directory Id="BumbershootFolder" Name="Bumbershoot">
-            <Directory Id="APPLICATIONROOTDIRECTORY" Name="IDPicker {version} $(var.AddressModel)-bit">
-              <Component Feature="MainFeature" Id="MainComponent">
-                <File Id="IDPicker.exe" Name="IDPicker.exe" Source="msvc-release\IDPicker.exe" KeyPath="yes" Checksum="yes" />
-                <Shortcut Id="MainShortcut" Directory="ProgramMenuFolder" Name="IDPicker {numeric-version} $(var.AddressModel)-bit" WorkingDirectory="APPLICATIONROOTDIRECTORY" Icon="idpDB_Icon.exe" IconIndex="-101" Advertise="yes" />
+            <Directory Id="APPLICATIONFOLDER" Name="IDPicker {version} $(var.AddressModel)-bit">
+              <Component Feature="MainFeature">
+                <File Source="msvc-release\IDPicker.exe" KeyPath="yes" />
+                <Shortcut Id="MainShortcut" Directory="ProgramMenuFolder" Name="IDPicker {numeric-version} $(var.AddressModel)-bit" WorkingDirectory="APPLICATIONFOLDER" Icon="idpDB_Icon.exe" IconIndex="-101" Advertise="yes" />
     
                 <ProgId Id="idpDB_ProgId" Description="IDPicker database" Icon="idpDB_Icon.exe" IconIndex="-102" Advertise="yes">
                   <Extension Id="idpDB" Advertise="yes">
@@ -122,15 +87,8 @@
 <Component Feature="MainFeature"><File Source="msvc-release\PopupControl.dll" KeyPath="yes"/></Component>
 <Component Feature="MainFeature"><File Source="msvc-release\QuasiTel.R" KeyPath="yes"/></Component>
 <Component Feature="MainFeature"><File Source="msvc-release\scantime.R" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\System.Data.SQLite.dll" KeyPath="yes"/></Component>
 <Component Feature="MainFeature"><File Source="msvc-release\IdpSqlExtensions.dll" KeyPath="yes"/></Component>
 <Component Feature="MainFeature"><File Source="msvc-release\gene2protein.db3" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\SharpSvn.dll" KeyPath="yes"/></Component>
-<?if $(var.AddressModel)=32 ?>
-    <Component Feature="MainFeature"><File Source="msvc-release\SharpPlink-Win32.svnExe" KeyPath="yes"/></Component>
-<?else?>
-    <Component Feature="MainFeature"><File Source="msvc-release\SharpPlink-x64.svnExe" KeyPath="yes"/></Component>
-<?endif?>
 
 <!-- Components shared by IDPicker and ProteoWizard -->
 <Component Feature="MainFeature"><File Source="msvc-release\CustomDataSourceDialog.dll" KeyPath="yes"/></Component>
@@ -146,184 +104,108 @@
 <Component Feature="MainFeature"><File Source="msvc-release\STL_Containers.dll" KeyPath="yes"/></Component>
 <Component Feature="MainFeature"><File Source="msvc-release\ZedGraph.dll" KeyPath="yes"/></Component>
 <Component Feature="MainFeature"><File Source="msvc-release\IMP.PhosphoRS.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\msparser.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\unimod_2.xsd" KeyPath="yes"/></Component>
-
-
-<!-- Agilent DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\EULA.MHDAC" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\agtsampleinforw.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\MassSpecDataReader.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseCommon.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseDataAccess.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseDataAccess.dll.config" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\MIDAC.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseError.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseTof.dll" KeyPath="yes"/></Component>
-
-
-<!-- Bruker DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\EULA.TimsSDK" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Constants.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Interfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Objects.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Calibration.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Constants.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Interfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Objects.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.TemperatureCompensation.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Transformation.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Utilities.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.Factory.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.Interfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.UntU2.dll" KeyPath="yes"/></Component>
-<?if $(var.AddressModel)=64 ?>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_date_time-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_regex-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_system-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_thread-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-<?else?>   
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_date_time-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_regex-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_system-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_thread-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\msvcr71.dll" KeyPath="yes"/></Component>
-<?endif?>
-<Component Feature="MainFeature"><File Source="msvc-release\CompassXtractMS.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_4F1EA0CB-5A6A-43ED-9562-D6D873034577.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_6BB2E64A-27A0-4575-A66A-4E312C8B9AD7.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_6EEE649E-09AA-4332-8E82-8188652E8AB5.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_7F88E97F-2038-40ba-8F3A-FCA9A9719569.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_382D5134-9727-4be6-B6F8-754F577426D6.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_12451AC8-3BF1-48e1-8E66-DA05BF3852A0.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\FlexVariableTable.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\HSReadWrite.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.EDAL.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.EDAL.SxS.manifest" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.HSREADWRITELib.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.HSREADWRITELib.SxS.manifest" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\ICRVariableTable.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\mkl_sequential.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\baf2sql_c.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\timsdata.dll" KeyPath="yes"/></Component>
-
-
-<!-- AB Sciex DLLs -->
-<Directory Id="SQLite_v1.0.98" Name="SQLite_v1.0.98">
-<Component Feature="MainFeature"><File Id="Wiff2_System.Data.SQLite.dll" Source="msvc-release\SQLite_v1.0.98\System.Data.SQLite.dll" KeyPath="yes"/></Component>
-</Directory>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.DataExplorer.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Compression.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Acquisition.Client.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Acquisition.Contracts.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.AnalystDataProvider.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Client.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Common.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.CommonInterfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Contracts.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Core.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Wiff2.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.WiffReader.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.DataService.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Devices.Types.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Domain.Acquisition.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Domain.Acquisition.Methods.MassSpec.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Infrastructure.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.InternalRawXYProcessing.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Muni.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.RawXYProcessing.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.StructuredStorage.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.UserLog.Types.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Utility.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.XmlHelpers.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.Unity.Configuration.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.Unity.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.ServiceLocation.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Core.Contracts.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Core.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.EventServices.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Logging.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Security.Core.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\SciexToolKit.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\protobuf-net.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Clearcore.FMan.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.Processing.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.SimpleTypes.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.XYData.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.FMan.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Wiff.dll" KeyPath="yes"/></Component>
-
-              
-<!-- Shimadzu DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\EULA.SFCS" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\DataReader.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\CABINET.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\DualProbeInterfaceParametersCS.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Google.Protobuf.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\QTFLProtoCS.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Shimadzu.LabSolutions.IO.IoModule.dll" KeyPath="yes"/></Component>
-<?if $(var.AddressModel)=64 ?>
-<Directory Id="Shimadzu_x64" Name="x64">
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\CLFIO32.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\CRHAKEI2.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\IOModuleQTFL.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\MassCalcWrapObject.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\MSMSDBCntl.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\PeakItgLSS.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\QTFLDebugLog.dll" KeyPath="yes"/></Component>
-</Directory>
-<?else?>
-<Directory Id="Shimadzu_x86" Name="x86">
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\CLFIO32.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\CRHAKEI2.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\IOModuleQTFL.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\MassCalcWrapObject.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\MSMSDBCntl.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\PeakItgLSS.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\QTFLDebugLog.dll" KeyPath="yes"/></Component>
-</Directory>
-<?endif?>
               
-
-<!-- Thermo DLLs -->
-<?if $(var.AddressModel)=64 ?>
-    <Component Feature="MainFeature"><File Source="msvc-release\EULA.RawFileReader" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\ThermoFisher.CommonCore.Data.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\ThermoFisher.CommonCore.RawFileReader.dll" KeyPath="yes"/></Component>
-<?else?>
-    <Component Feature="MainFeature"><File Source="msvc-release\EULA.MSFileReader" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\Interop.MSFileReaderLib.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\MSFileReader.XRawfile2.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\MSFileReader.XRawfile2.SxS.manifest" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\fileio.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\fregistry.dll" KeyPath="yes"/></Component>
-<?endif?>
-
-
-<!-- Water DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\MassLynxRaw.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\cdt.dll" KeyPath="yes"/></Component>
-
-
+              __VENDOR_DLLS__
               </Directory>
           </Directory>
         </Directory>
-        </Directory>
-
-        <Feature Id="MainFeature" Title="IDPicker {numeric-version} $(var.AddressModel)-bit" Level="1">
-          <MergeRef Id="CRT9" />
-          <MergeRef Id="MFC9" />
-          <MergeRef Id="CRT9_policy" />
-          <MergeRef Id="MFC9_policy" />
-          <MergeRef Id="CRT11" />
-          <MergeRef Id="OMP11" />
-          <MergeRef Id="CRT12" />
-          <MergeRef Id="MFC12" />
-          <MergeRef Id="CRT14" />
-          <MergeRef Id="OMP14" />
-        </Feature>   
-    </Product>
+     </Directory>
+
+     <Feature Id="MainFeature" Title="IDPicker {numeric-version} $(var.AddressModel)-bit" Level="1" />
+
+     </Product>
+     <Fragment>
+       <WixVariable Id="WixUISupportPerUser" Value="1" Overridable="yes" />
+       <WixVariable Id="WixUISupportPerMachine" Value="1" Overridable="yes" />
+
+       <PropertyRef Id="ApplicationFolderName" />
+
+       <CustomAction Id="WixSetDefaultPerUserFolder2" Property="WixPerUserFolder" Value="[LocalAppDataFolder]Apps\[ApplicationFolderName]" Execute="immediate" />
+       <CustomAction Id="WixSetDefaultPerMachineFolder2" Property="WixPerMachineFolder" Value="[ProgramFilesFolder][ApplicationFolderName]" Execute="immediate" />
+       <CustomAction Id="WixSetPerUserFolder2" Property="APPLICATIONFOLDER" Value="[WixPerUserFolder]" Execute="immediate" />
+       <CustomAction Id="WixSetPerMachineFolder2" Property="APPLICATIONFOLDER" Value="[WixPerMachineFolder]" Execute="immediate" />
+
+       <InstallExecuteSequence>
+         <Custom Action="WixSetDefaultPerUserFolder2" Before="CostFinalize" />
+         <Custom Action="WixSetDefaultPerMachineFolder2" After="WixSetDefaultPerUserFolder2" />
+         <Custom Action="WixSetPerUserFolder2" After="WixSetDefaultPerMachineFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+         <Custom Action="WixSetPerMachineFolder2" After="WixSetPerUserFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
+       </InstallExecuteSequence>
+       <InstallUISequence>
+         <Custom Action="WixSetDefaultPerUserFolder2" Before="CostFinalize" />
+         <Custom Action="WixSetDefaultPerMachineFolder2" After="WixSetDefaultPerUserFolder2" />
+         <Custom Action="WixSetPerUserFolder2" After="WixSetDefaultPerMachineFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+         <Custom Action="WixSetPerMachineFolder2" After="WixSetPerUserFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
+       </InstallUISequence>
+
+       <UI Id="WixUI_InstallDirScoped">
+         <TextStyle Id="WixUI_Font_Normal" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Normal_Size)" />
+         <TextStyle Id="WixUI_Font_Bigger" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Bigger_Size)" />
+         <TextStyle Id="WixUI_Font_Title" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Title_Size)" Bold="yes" />
+         <TextStyle Id="WixUI_Font_Emphasized" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Emphasized_Size)" Bold="yes" />
+
+         <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+         <Property Id="WixUI_Mode" Value="Advanced" />
+         <Property Id="ALLUSERS" Value="2" />
+
+         <DialogRef Id="BrowseDlg" />
+         <DialogRef Id="InstallScopeDlg" />
+         <DialogRef Id="InstallDirDlg" />
+         <DialogRef Id="ErrorDlg" />
+         <DialogRef Id="FatalError" />
+         <DialogRef Id="FilesInUse" />
+         <DialogRef Id="MsiRMFilesInUse" />
+         <DialogRef Id="PrepareDlg" />
+         <DialogRef Id="ProgressDlg" />
+         <DialogRef Id="ResumeDlg" />
+         <DialogRef Id="UserExit" />
+         <DialogRef Id="WelcomeDlg"/>
+
+         <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+         <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="1">1</Publish>
+         <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="2"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallScopeDlg" Order="1">!(wix.WixUISupportPerMachine) AND !(wix.WixUISupportPerUser)</Publish>
+         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">!(wix.WixUISupportPerMachine) AND NOT !(wix.WixUISupportPerUser)</Publish>
+
+         <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+         <!-- override default WixAppFolder of WixPerMachineFolder as standard user won't be shown the radio group to set WixAppFolder -->
+         <Publish Dialog="InstallScopeDlg" Control="Next" Property="WixAppFolder" Value="WixPerUserFolder" Order="1">!(wix.WixUISupportPerUser) AND NOT Privileged</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Property="MSIINSTALLPERUSER" Value="1" Order="2">WixAppFolder = "WixPerUserFolder"</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Property="MSIINSTALLPERUSER" Value="{}" Order="3">WixAppFolder = "WixPerMachineFolder"</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="1" Order="4">WixAppFolder = "WixPerMachineFolder"</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="2" Order="5">WixAppFolder = "WixPerUserFolder"</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerUserFolder]" Order="6">WixAppFolder = "WixPerUserFolder"</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerMachineFolder]" Order="7">WixAppFolder = "WixPerMachineFolder"</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="8">WixAppFolder = "WixPerUserFolder"</Publish>
+         <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="9">WixAppFolder = "WixPerMachineFolder"</Publish>
+
+         <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">!(wix.WixUISupportPerUser)</Publish>
+         <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">NOT !(wix.WixUISupportPerUser)</Publish>
+         <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+         <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+         <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+         <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+         <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+         <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+         <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+         <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">NOT Installed AND WixAppFolder = "WixPerUserFolder"</Publish>
+         <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">NOT Installed AND WixAppFolder = "WixPerMachineFolder"</Publish>
+         <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="InstallDirDlg">1</Publish>
+         <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+         <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+         <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish>
+
+         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+       </UI>
+
+       <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
+       <UIRef Id="WixUI_Common" />
+     </Fragment> 
 </Wix>
diff --git a/pwiz_tools/Bumbershoot/idpicker/Deploy/Jamfile.jam b/pwiz_tools/Bumbershoot/idpicker/Deploy/Jamfile.jam
index 0e9521e154..8379c5ca54 100644
--- a/pwiz_tools/Bumbershoot/idpicker/Deploy/Jamfile.jam
+++ b/pwiz_tools/Bumbershoot/idpicker/Deploy/Jamfile.jam
@@ -104,12 +104,12 @@ rule test_msi ( targets + : sources * : properties * )
     if $(address-model) = 64
     {
         ARTIFACT_NAME on $(targets) = IDPicker-$(version-tag:J=.)-x86_64 ;
-        INSTALL_PATH on $(targets) = "%ProgramW6432%\\Bumbershoot\\IDPicker $(version-tag:J=.) 64-bit" ;
+        INSTALL_PATH on $(targets) = "%LocalAppData%\\Apps\\IDPicker $(version-tag:J=.) 64-bit" ;
     }
     else
     {
         ARTIFACT_NAME on $(targets) = IDPicker-$(version-tag:J=.)-x86 ;
-        INSTALL_PATH on $(targets) = "%ProgramFiles(x86)%\\Bumbershoot\\IDPicker $(version-tag:J=.) 32-bit" ;
+        INSTALL_PATH on $(targets) = "%LocalAppData%\\Apps\\IDPicker $(version-tag:J=.) 32-bit" ;
     }
 
     LOCATION on $(targets) = [ path.native [ feature.get-values <location> : $(properties) ]  ] ;
@@ -123,7 +123,7 @@ actions test_msi
     $(MSVC_CURRENT_SETUP_SCRIPT)
     echo Installing $(ARTIFACT_NAME)...
     pushd $(PWIZ_BUILD_PATH)
-    msiexec /qn /l* $(ARTIFACT_NAME).log /norestart /i $(ARTIFACT_NAME).msi REBOOT=ReallySuppress
+    start /wait msiexec /qn /l* $(ARTIFACT_NAME).log /norestart /i $(ARTIFACT_NAME).msi REBOOT=ReallySuppress ALLUSERS=2 MSIINSTALLPERUSER=1
     set EXIT=%ERRORLEVEL%
     IF %EXIT% NEQ 0 echo Install failed with code %EXIT%.
     set status=%EXIT%
@@ -140,17 +140,17 @@ actions test_msi
     set PATH=%PATH_TMP%
 
     echo Uninstalling $(ARTIFACT_NAME)...
-    msiexec /qn /l* $(ARTIFACT_NAME).log /norestart /x $(ARTIFACT_NAME).msi REBOOT=ReallySuppress
+    start /wait msiexec /qn /l* $(ARTIFACT_NAME).log /norestart /x $(ARTIFACT_NAME).msi REBOOT=ReallySuppress
     set EXIT=%ERRORLEVEL%
     IF %TEST_EXIT% NEQ 0 IF %EXIT% NEQ 0 set status=%EXIT%
     IF %EXIT% NEQ 0 echo Uninstall failed with code %EXIT%.
     
     set status=%TEST_EXIT%
     $(TEST_POSTCOMMAND)
-    IF %TEST_EXIT% NEQ 0 echo Deployment test passed.
-    IF %TEST_EXIT% NEQ 0 echo Deployment test passed. > $(LOCATION)\Test.passed
+    IF %TEST_EXIT% EQU 0 echo Deployment test passed.
+    IF %TEST_EXIT% EQU 0 echo Deployment test passed. > $(LOCATION)\Test.passed
 
-    popd
+    IF %TEST_EXIT% NEQ 0 exit 1
 }
 
 make Test.passed
diff --git a/pwiz_tools/Bumbershoot/idpicker/Deploy/SetupDeployProject.cs b/pwiz_tools/Bumbershoot/idpicker/Deploy/SetupDeployProject.cs
index 0d8eec3c7d..f31736d2e1 100644
--- a/pwiz_tools/Bumbershoot/idpicker/Deploy/SetupDeployProject.cs
+++ b/pwiz_tools/Bumbershoot/idpicker/Deploy/SetupDeployProject.cs
@@ -53,6 +53,9 @@ static int Main(string[] args)
             string addressModel = args[4];
             string installerSuffix = addressModel == "64" ? "-x86_64" : "-x86";
 
+            var wxsVendorDlls = File.ReadAllText(installPath + "/../../scripts/wix/vendor-dlls.wxs-fragment");
+            wxsTemplate.Replace("__VENDOR_DLLS__", wxsVendorDlls);
+
             wxsTemplate.Replace("{ProductGuid}", guid);
             wxsTemplate.Replace("{version}", version);
             wxsTemplate.Replace("{numeric-version}", numericVersion);
@@ -73,12 +76,6 @@ static int Main(string[] args)
                 wxsTemplate.Replace(sourceCapture.Value, installPath + "\\" + nameCapture.Value);
             }
 
-            var vc141path = Environment.GetEnvironmentVariable("PROGRAMFILES(x86)") + "\\Microsoft Visual Studio\\2017\\";
-            vc141path = Directory.GetDirectories(vc141path)[0]; // add edition (Community, Enterprise, etc) to path
-            vc141path += "\\VC\\Redist\\MSVC\\";
-            vc141path = Directory.GetDirectories(vc141path)[0] + "\\MergeModules"; // add runtime version to path (e.g. 14.14.26405)
-            wxsTemplate = wxsTemplate.Replace("__VC141_MERGEMODULES_PATH__", vc141path);
-
             // delete old wxs files
             foreach (string filepath in Directory.GetFiles(buildPath, "*.wxs"))
                 File.Delete(filepath);
diff --git a/pwiz_tools/Bumbershoot/idpicker/IDPicker.csproj b/pwiz_tools/Bumbershoot/idpicker/IDPicker.csproj
index c7e1b9fd30..36c6faccab 100644
--- a/pwiz_tools/Bumbershoot/idpicker/IDPicker.csproj
+++ b/pwiz_tools/Bumbershoot/idpicker/IDPicker.csproj
@@ -174,10 +174,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(BuildPath)\obj\$(Platform)\$(Configuration)\pwiz_bindings_cli.dll</HintPath>
     </Reference>
-    <Reference Include="SharpSvn, Version=1.9005.3957.231, Culture=neutral, PublicKeyToken=d729672594885a28, processorArchitecture=$(Platform)">
-      <HintPath>packages\SharpSvn.1.9-$(Platform).1.9005.3957.231\lib\net40\SharpSvn.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core">
@@ -693,7 +689,7 @@
     <NativeReference Include="Interop.EDAL.SxS, Version=1.0.0.0, Type=AnyCPU">
       <Name>Interop.EDAL.SxS.manifest</Name>
       <HintPath>..\..\pwiz_aux\msrc\utility\vendor_api\Bruker\$(Platform)\Interop.EDAL.SxS.manifest</HintPath>
-    </NativeReference>  
+    </NativeReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'x64' ">
     <Reference Include="ThermoFisher.CommonCore.Data">
@@ -721,12 +717,12 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>call "$(VS120COMNTOOLS)vsvars32.bat" &gt;nul
+    <PostBuildEvent>call "$(ProjectDir)..\..\..\libraries\msvc_setup_script.bat" &gt;nul
 IF $(PlatformName) NEQ "x64" editbin.exe /nologo /LARGEADDRESSAWARE "$(TargetPath)"
 IF EXIST $(OutDir)setup.exe del $(OutDir)setup.exe
 IF EXIST $(OutDir)Test.passed del $(OutDir)Test.passed</PostBuildEvent>
-    <PreBuildEvent>call "$(VS120COMNTOOLS)vsvars32.bat" &gt;nul
-rc.exe $(ProjectDir)/Resources/Resources.rc &gt;nul</PreBuildEvent>
+    <PreBuildEvent>call "$(ProjectDir)..\..\..\libraries\msvc_setup_script.bat" &gt;nul
+rc.exe $(ProjectDir)Resources\Resources.rc &gt;nul</PreBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/pwiz_tools/Bumbershoot/idpicker/Program.cs b/pwiz_tools/Bumbershoot/idpicker/Program.cs
index 73b78fb677..3e98932653 100644
--- a/pwiz_tools/Bumbershoot/idpicker/Program.cs
+++ b/pwiz_tools/Bumbershoot/idpicker/Program.cs
@@ -35,8 +35,6 @@
 using System.Net;
 using System.Text.RegularExpressions;
 using IDPicker.Forms;
-using SharpSvn;
-using SharpSvn.Security;
 using pwiz.Common.Collections;
 using System.Security.Policy;
 
@@ -313,7 +311,7 @@ public static bool CheckForUpdates ()
 
             if (currentVersion < latestVersion)
             {
-                System.Collections.ObjectModel.Collection<SvnLogEventArgs> logItems = null;
+                /*System.Collections.ObjectModel.Collection<SvnLogEventArgs> logItems = null;
 
                 using (var client = new SvnClient())
                 {
@@ -350,7 +348,8 @@ public static bool CheckForUpdates ()
                     }
                     else
                         changeLog = "Technical changes and bug fixes.";
-                }
+                }*/
+                string changeLog = "<unable to get change log>";
 
                 MainWindow.Invoke(new MethodInvoker(() =>
                 {
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x64/msvcp100.dll b/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x64/msvcp100.dll
deleted file mode 100644
index 68fa0d31ad..0000000000
Binary files a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x64/msvcp100.dll and /dev/null differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x64/msvcr100.dll b/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x64/msvcr100.dll
deleted file mode 100644
index 0318fb0964..0000000000
Binary files a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x64/msvcr100.dll and /dev/null differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x86/msvcp100.dll b/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x86/msvcp100.dll
deleted file mode 100644
index e9eae444e1..0000000000
Binary files a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x86/msvcp100.dll and /dev/null differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x86/msvcr100.dll b/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x86/msvcr100.dll
deleted file mode 100644
index fd91c89d8b..0000000000
Binary files a/pwiz_tools/Shared/Lib/Microsoft.VC100.CRT/x86/msvcr100.dll and /dev/null differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x64/Microsoft.VC100.MFC.manifest b/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x64/Microsoft.VC100.MFC.manifest
deleted file mode 100644
index a08d57f288..0000000000
--- a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x64/Microsoft.VC100.MFC.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <noInheritable/>
-    <assemblyIdentity
-        type="win32"
-        name="Microsoft.VC100.MFC"
-        version="9.0.21022.8"
-        processorArchitecture="amd64"
-        publicKeyToken="1fc8b3b9a1e18e3b"
-    />
-    <file name="mfc100u.dll" />
-</assembly>
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x64/mfc100u.dll b/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x64/mfc100u.dll
deleted file mode 100644
index 2ef5bcc935..0000000000
Binary files a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x64/mfc100u.dll and /dev/null differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x86/Microsoft.VC100.MFC.manifest b/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x86/Microsoft.VC100.MFC.manifest
deleted file mode 100644
index 782e15d01e..0000000000
--- a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x86/Microsoft.VC100.MFC.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <noInheritable/>
-    <assemblyIdentity
-        type="win32"
-        name="Microsoft.VC100.MFC"
-        version="9.0.21022.8"
-        processorArchitecture="x86"
-        publicKeyToken="1fc8b3b9a1e18e3b"
-    />
-    <file name="mfc100u.dll" />
-</assembly>
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x86/mfc100u.dll b/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x86/mfc100u.dll
deleted file mode 100644
index 869b8a3e88..0000000000
Binary files a/pwiz_tools/Shared/Lib/Microsoft.VC100.MFC/x86/mfc100u.dll and /dev/null differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC110.OPENMP/x64/vcomp110.dll b/pwiz_tools/Shared/Lib/Microsoft.VC110.CRT/x64/vcomp110.dll
similarity index 100%
rename from pwiz_tools/Shared/Lib/Microsoft.VC110.OPENMP/x64/vcomp110.dll
rename to pwiz_tools/Shared/Lib/Microsoft.VC110.CRT/x64/vcomp110.dll
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC110.OPENMP/x86/vcomp110.dll b/pwiz_tools/Shared/Lib/Microsoft.VC110.CRT/x86/vcomp110.dll
similarity index 100%
rename from pwiz_tools/Shared/Lib/Microsoft.VC110.OPENMP/x86/vcomp110.dll
rename to pwiz_tools/Shared/Lib/Microsoft.VC110.CRT/x86/vcomp110.dll
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x64/concrt140.dll b/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x64/concrt140.dll
new file mode 100644
index 0000000000..5e510f4aba
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x64/concrt140.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x64/mfc140.dll b/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x64/mfc140.dll
new file mode 100644
index 0000000000..32e71f6f1c
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x64/mfc140.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x86/mfc140.dll b/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x86/mfc140.dll
new file mode 100644
index 0000000000..c903872725
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC140.CRT/x86/mfc140.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcm90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcm90.dll
new file mode 100644
index 0000000000..45fdb911cf
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcm90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcp90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcp90.dll
new file mode 100644
index 0000000000..a1727ca557
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcp90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcr90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcr90.dll
new file mode 100644
index 0000000000..0ae568a287
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/msvcr90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/vcomp.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/vcomp.dll
new file mode 100644
index 0000000000..40a56d1958
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x64/vcomp.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcm90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcm90.dll
new file mode 100644
index 0000000000..734d86bef7
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcm90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcp90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcp90.dll
new file mode 100644
index 0000000000..70ddf553e8
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcp90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcr90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcr90.dll
new file mode 100644
index 0000000000..072bc0b491
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/msvcr90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/vcomp90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/vcomp90.dll
new file mode 100644
index 0000000000..0c654f7988
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.CRT/x86/vcomp90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x64/mfc90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x64/mfc90.dll
new file mode 100644
index 0000000000..761c5a4e20
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x64/mfc90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/Microsoft.VC90.MFC.manifest b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/Microsoft.VC90.MFC.manifest
index a214daf7eb..2bb6d4def2 100644
--- a/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/Microsoft.VC90.MFC.manifest
+++ b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/Microsoft.VC90.MFC.manifest
@@ -5,7 +5,7 @@
     <assemblyIdentity
         type="win32"
         name="Microsoft.VC90.MFC"
-        version="9.0.21022.8"
+        version="9.0.30729.1"
         processorArchitecture="x86"
         publicKeyToken="1fc8b3b9a1e18e3b"
     />
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/mfc90.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/mfc90.dll
new file mode 100644
index 0000000000..a44a9863be
Binary files /dev/null and b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/mfc90.dll differ
diff --git a/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/mfc90u.dll b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/mfc90u.dll
index e569216bd1..a3824f68cf 100644
Binary files a/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/mfc90u.dll and b/pwiz_tools/Shared/Lib/Microsoft.VC90.MFC/x86/mfc90u.dll differ
diff --git a/pwiz_tools/Skyline/Skyline.csproj b/pwiz_tools/Skyline/Skyline.csproj
index 128b3d2c88..527a5efcda 100644
--- a/pwiz_tools/Skyline/Skyline.csproj
+++ b/pwiz_tools/Skyline/Skyline.csproj
@@ -3794,22 +3794,6 @@
     </FileAssociation>
   </ItemGroup>
   <ItemGroup>
-    <Content Condition="'$(Platform)' == 'x86'" Include="..\Shared\Lib\Microsoft.VC100.CRT\x86\msvcp100.dll">
-      <Link>msvcp100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x86'" Include="..\Shared\Lib\Microsoft.VC100.CRT\x86\msvcr100.dll">
-      <Link>msvcr100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x64'" Include="..\Shared\Lib\Microsoft.VC100.CRT\x64\msvcp100.dll">
-      <Link>msvcp100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x64'" Include="..\Shared\Lib\Microsoft.VC100.CRT\x64\msvcr100.dll">
-      <Link>msvcr100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Condition="'$(Platform)' == 'x86'" Include="..\Shared\Lib\Microsoft.VC90.MFC\x86\mfc90u.dll">
       <Link>Microsoft.VC90.MFC\mfc90u.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -3818,10 +3802,6 @@
       <Link>Microsoft.VC90.MFC\Microsoft.VC90.MFC.manifest</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Condition="'$(Platform)' == 'x64'" Include="..\Shared\Lib\Microsoft.VC100.MFC\x64\mfc100u.dll">
-      <Link>mfc100u.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Condition="'$(Platform)' == 'x86'" Include="..\Shared\Lib\Microsoft.VC110.CRT\x86\msvcp110.dll">
       <Link>msvcp110.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -3830,7 +3810,7 @@
       <Link>msvcr110.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Condition="'$(Platform)' == 'x86'" Include="..\Shared\Lib\Microsoft.VC110.OPENMP\x86\vcomp110.dll">
+    <Content Condition="'$(Platform)' == 'x86'" Include="..\Shared\Lib\Microsoft.VC110.CRT\x86\vcomp110.dll">
       <Link>vcomp110.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -3842,7 +3822,7 @@
       <Link>msvcr110.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Condition="'$(Platform)' == 'x64'" Include="..\Shared\Lib\Microsoft.VC110.OPENMP\x64\vcomp110.dll">
+    <Content Condition="'$(Platform)' == 'x64'" Include="..\Shared\Lib\Microsoft.VC110.CRT\x64\vcomp110.dll">
       <Link>vcomp110.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -4900,4 +4880,4 @@
     </PostBuildEvent>
     <PreBuildEvent>$(ProjectDir)ProtocolBuffers\generatecode.bat</PreBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pwiz_tools/Topograph/TopographApp/TopographApp.csproj b/pwiz_tools/Topograph/TopographApp/TopographApp.csproj
index 5a386be3c2..365f276736 100644
--- a/pwiz_tools/Topograph/TopographApp/TopographApp.csproj
+++ b/pwiz_tools/Topograph/TopographApp/TopographApp.csproj
@@ -861,30 +861,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Content Condition="'$(Platform)' == 'x86'" Include="..\..\Shared\Lib\Microsoft.VC100.CRT\x86\msvcp100.dll">
-      <Link>msvcp100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x64'" Include="..\..\Shared\Lib\Microsoft.VC100.CRT\x64\msvcp100.dll">
-      <Link>msvcp100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x86'" Include="..\..\Shared\Lib\Microsoft.VC100.CRT\x86\msvcr100.dll">
-      <Link>msvcr100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x64'" Include="..\..\Shared\Lib\Microsoft.VC100.CRT\x64\msvcr100.dll">
-      <Link>msvcr100.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x86'" Include="..\..\Shared\Lib\Microsoft.VC100.MFC\x86\mfc100u.dll">
-      <Link>mfc100u.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Condition="'$(Platform)' == 'x64'" Include="..\..\Shared\Lib\Microsoft.VC100.MFC\x64\mfc100u.dll">
-      <Link>mfc100u.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="..\..\Shared\Lib\Microsoft.VC140.CRT\$(Platform)\api-ms-win-core-console-l1-1-0.dll">
       <Link>api-ms-win-core-console-l1-1-0.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1125,10 +1101,6 @@
       <Link>msparserD.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Condition="'$(Platform)' == 'x86'" Include="..\..\Shared\Lib\Microsoft.VC100.MFC\x86\Microsoft.VC100.MFC.manifest">
-      <Link>Microsoft.VC100.MFC\Microsoft.VC100.MFC.manifest</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <None Include="Resources\Collapse.png" />
     <None Include="Resources\Expand.png" />
     <Content Include="Topograph.ico" />
@@ -1270,4 +1242,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/scripts/wix/pwiz-setup.py b/scripts/wix/pwiz-setup.py
index e99d71731c..7510dd12f0 100644
--- a/scripts/wix/pwiz-setup.py
+++ b/scripts/wix/pwiz-setup.py
@@ -79,6 +79,9 @@ def contextMenuRegistries() :
     return registries
 
 wxsTemplate = open(templatePath + "/pwiz-setup.wxs.template").read()
+wxsVendorDlls = open(templatePath + "/vendor-dlls.wxs-fragment").read()
+
+wxsTemplate = wxsTemplate.replace("__VENDOR_DLLS__", wxsVendorDlls)
 wxsTemplate = wxsTemplate.replace("__CONTEXTMENU_PROPERTIES__",contextMenuProperties())
 wxsTemplate = wxsTemplate.replace("__CONTEXTMENU_REGISTRY__",contextMenuRegistries())
 wxsTemplate = wxsTemplate.replace("__CONTEXTMENU_CHECKBOXEN__",contextMenuOptions())
@@ -87,14 +90,6 @@ def contextMenuRegistries() :
 wxsTemplate = wxsTemplate.replace("{numeric-version}", numericVersion)
 wxsTemplate = wxsTemplate.replace("msvc-release", installPath)
 
-# search for VC141 merge modules
-vc141path = os.environ['PROGRAMFILES(x86)'] + "\\Microsoft Visual Studio\\2017\\"
-vc141path += os.listdir(vc141path)[0] # add edition (Community, Enterprise, etc) to path
-vc141path += "\\VC\\Redist\\MSVC\\"
-vc141path += os.listdir(vc141path)[0] + "\\MergeModules"
-wxsTemplate = wxsTemplate.replace("__VC141_MERGEMODULES_PATH__", vc141path)
-
-
 # delete old wxs and wixObj files
 for filepath in glob.glob(buildPath + "/*.wxs"):
     os.remove(filepath)
diff --git a/scripts/wix/pwiz-setup.wxs.template b/scripts/wix/pwiz-setup.wxs.template
index c915db40cb..fab8651d61 100644
--- a/scripts/wix/pwiz-setup.wxs.template
+++ b/scripts/wix/pwiz-setup.wxs.template
@@ -29,14 +29,16 @@
             Manufacturer="ProteoWizard"
             UpgradeCode="$(var.AddressModel)4795C6-012A-49B7-A47F-E46E164D3689">
 
-      <Package Description="ProteoWizard {version} $(var.AddressModel)-bit Installer" Manufacturer="ProteoWizard" InstallerVersion="405" Compressed="yes" />
+      <Package Description="ProteoWizard {version} $(var.AddressModel)-bit Installer" Manufacturer="ProteoWizard" InstallerVersion="500" Compressed="yes" />
       <Media Id="1" Cabinet="ProteoWizard.cab" EmbedCab="yes" />
       <Icon Id="seems_Icon.exe" SourceFile="msvc-release\seems.exe" />
       <Property Id="ARPPRODUCTICON" Value="seems_Icon.exe" />
-      <Property Id="ALLUSERS" Value="1" />
-      <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONROOTDIRECTORY" />
+      <Property Id="ApplicationFolderName" Value="ProteoWizard {numeric-version} $(var.AddressModel)-bit" />
+      <Property Id="WixAppFolder" Value="WixPerUserFolder" />
       <!--<WixVariable Id="WixUIBannerBmp" Value="..\Resources\SetupBanner.bmp" />
       <WixVariable Id="WixUIDialogBmp" Value="..\Resources\SetupBackground.bmp" />-->
+     <WixVariable Id="WixUISupportPerUser" Value="1" />
+     <WixVariable Id="WixUISupportPerMachine" Value="1" />
 
       <?if $(var.AddressModel)=64 ?>
           <?define ProgramFilesFolder="ProgramFiles64Folder"?>
@@ -44,17 +46,19 @@
           <?define ProgramFilesFolder="ProgramFilesFolder"?>
       <?endif?>
 
+
       <PropertyRef Id='NETFRAMEWORK35'/>
       <PropertyRef Id='NETFRAMEWORK35_SP_LEVEL'/>
       <Condition Message="Requires Microsoft .NET 3.5 Framework with Service Pack 1">
           <![CDATA[Installed OR (NETFRAMEWORK35_SP_LEVEL and NOT NETFRAMEWORK35_SP_LEVEL = "#0")]]>
       </Condition>
 
-      <PropertyRef Id='NETFRAMEWORK40FULL'/>
-      <Condition Message="Requires Microsoft .NET 4.0 Framework">
-          <![CDATA[Installed OR (NETFRAMEWORK40FULL = "#1")]]>
+      <PropertyRef Id='NETFRAMEWORK45'/>
+      <Condition Message="Requires Microsoft .NET 4.7.2 Framework">
+          <![CDATA[Installed OR (NETFRAMEWORK45 >= "#461808")]]>
       </Condition>
-      __CONTEXTMENU_PROPERTIES__
+     __CONTEXTMENU_PROPERTIES__
+
       <UI>
         <Dialog Id="PwizOptionsDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
@@ -69,105 +73,24 @@
             __CONTEXTMENU_CHECKBOXEN__
         </Dialog>
       </UI>
-        <UI Id="pwiz_InstallDir">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">NOT Installed</Publish>
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="PwizOptionsDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-
-         <Publish Dialog="PwizOptionsDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="3">1</Publish>
-         <Publish Dialog="PwizOptionsDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="3">1</Publish>
-
-            
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
-        </UI>
-
-        <UIRef Id="WixUI_Common" />  
+     <UIRef Id="WixUI_InstallDirScoped" />
+     <UIRef Id="WixUI_Common" />  
 
       <Directory Id="TARGETDIR" Name="SourceDir">
-         <!-- We need these for Bruker support, but how do we get MSMs without having to install VS 2005?
-            <Merge Id="CRT" Language="0" SourceFile="C:\Users\chambem2\Downloads\Microsoft_VC80_CRT_x86.msm" DiskId="1" />
-            <Merge Id="MFC" Language="0" SourceFile="C:\Users\chambem2\Downloads\Microsoft_VC80_MFC_x86.msm" DiskId="1" />
-         -->
-
-         <?if $(var.AddressModel)=64 ?>
-            <Merge Id="CRT9" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm" DiskId="1" />
-            <Merge Id="MFC9" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_MFC_x86_x64.msm" DiskId="1" />
-            <Merge Id="CRT9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm" DiskId="1" />
-            <Merge Id="MFC9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86_x64.msm" DiskId="1" />
-
-            <Merge Id="CRT11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_CRT_x64.msm" DiskId="1" />
-            <Merge Id="OMP11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_OpenMP_x64.msm" DiskId="1" />
-
-            <Merge Id="CRT12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_CRT_x64.msm" DiskId="1" />
-            <Merge Id="MFC12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_MFC_x64.msm" DiskId="1" />
-
-            <Merge Id="CRT14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_CRT_x64.msm" DiskId="1" />
-            <Merge Id="OMP14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_OpenMP_x64.msm" DiskId="1" />
-         <?else?>
-            <Merge Id="CRT9" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm" DiskId="1" />
-            <Merge Id="MFC9" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_MFC_x86.msm" DiskId="1" />
-            <Merge Id="CRT9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm" DiskId="1" />
-            <Merge Id="MFC9_policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86.msm" DiskId="1" />
-
-            <Merge Id="CRT11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_CRT_x86.msm" DiskId="1" />
-            <Merge Id="OMP11" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC110_OpenMP_x86.msm" DiskId="1" />
-
-            <Merge Id="CRT12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_CRT_x86.msm" DiskId="1" />
-            <Merge Id="MFC12" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC120_MFC_x86.msm" DiskId="1" />
-
-            <Merge Id="CRT14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_CRT_x86.msm" DiskId="1" />
-            <Merge Id="OMP14" Language="0" SourceFile="__VC141_MERGEMODULES_PATH__\Microsoft_VC141_OpenMP_x86.msm" DiskId="1" />
-         <?endif?>
 
          <Directory Id="ProgramMenuFolder">
-            <Directory Id="ProteoWizardStartMenuFolder" Name="ProteoWizard {numeric-version} $(var.AddressModel)-bit" />
+            <Directory Id="ProteoWizardStartMenuFolder" Name="ProteoWizard {numeric-version} $(var.AddressModel)-bit">
+                <Component Feature="MainFeature" Id="ProteoWizardStartMenuFolderComponent">
+                  <RemoveFolder Id="ProteoWizardStartMenuFolderComponent" On="uninstall" />
+                  <RegistryValue Root="HKCU" Key="Software/ProteoWizard/MenuInstalled" Type="string" Value="" KeyPath="yes" />
+                </Component>
+              </Directory>
          </Directory>
 
         <Directory Name="AppDataFolder" Id="AppDataFolder">
           <Directory Name="MSConvertGUI" Id="MSConvertGUI" ComponentGuidGenerationSeed="E31534E2-901E-4850-811D-E4E56FCB1D42">
             <Component Feature="MainFeature" Id="Presets" Guid="D6D81C1D-B8B3-42D1-8152-2D01EC31ECA1">
-              <Registry Root="HKCU" Key="Software/MSConvertGUI" KeyPath="yes">
-              </Registry>
+              <RegistryValue Root="HKCU" Key="Software/MSConvertGUI/PresetsInstalled" Type="string" Value="" KeyPath="yes" />
               <File Source="msvc-release\..\..\pwiz_tools\MSConvertGUI\PASEF MGF.cmdline" />
               <RemoveFolder Id="RemovePresets" On="uninstall" />
             </Component>
@@ -176,19 +99,19 @@
 
          <Directory Id="$(var.ProgramFilesFolder)" Name="PFiles">
             <Directory Id="ProteoWizardFolder" Name="ProteoWizard">
-                <Directory Id="APPLICATIONROOTDIRECTORY" Name="ProteoWizard {version}">
-                    <Component Feature="MainFeature">
-                        <File Source="msvc-release\seems.exe" KeyPath="yes"/>
-                        <Shortcut Id="SeeMSShortcut" Directory="ProteoWizardStartMenuFolder" Name="SeeMS" WorkingDirectory="APPLICATIONROOTDIRECTORY" Icon="seems_Icon.exe" IconIndex="0" Advertise="yes" />
-                        <RemoveFolder Id="RemoveSeeMS" Directory="ProteoWizardStartMenuFolder" On="uninstall" />
-                    </Component>
+                <Directory Id="APPLICATIONFOLDER" Name="ProteoWizard {version}">
+                  <Component Feature="MainFeature">
+                    <File Source="msvc-release\seems.exe" KeyPath="yes">
+                      <Shortcut Id="SeeMSShortcut" Directory="ProteoWizardStartMenuFolder" Name="SeeMS" WorkingDirectory="APPLICATIONFOLDER" Icon="seems_Icon.exe" IconIndex="0" Advertise="yes" />
+                    </File>
+                  </Component>
                     <Component Feature="MainFeature">
                         <File Source="msvc-release\MSConvertGUI.exe" KeyPath="yes"/>
-                        <Shortcut Id="MSConvertShortcut" Directory="ProteoWizardStartMenuFolder" Name="MSConvert" WorkingDirectory="APPLICATIONROOTDIRECTORY" Icon="seems_Icon.exe" IconIndex="0" Advertise="yes" />
-                        <RemoveFolder Id="RemoveMSConvert" Directory="ProteoWizardStartMenuFolder" On="uninstall" />
+                        <Shortcut Id="MSConvertShortcut" Directory="ProteoWizardStartMenuFolder" Name="MSConvert" WorkingDirectory="APPLICATIONFOLDER" Icon="seems_Icon.exe" IconIndex="0" Advertise="yes" />
                     </Component>
                     __CONTEXTMENU_REGISTRY__
-                    <Component Feature="MainFeature"><File Source="msvc-release\CustomDataSourceDialog.dll" KeyPath="yes"/></Component>
+
+                    <Component Feature="MainFeature"><File Source="msvc-release\CustomDataSourceDialog.dll"  KeyPath="yes"/></Component>
                     <Component Feature="MainFeature"><File Source="msvc-release\CustomDataSourceDialog.dll.config" KeyPath="yes"/></Component>
                     <Component Feature="MainFeature"><File Source="msvc-release\DataGridViewAutoFilter.dll" KeyPath="yes"/></Component>
                     <Component Feature="MainFeature"><File Source="msvc-release\DigitalRune.Windows.Docking.dll" KeyPath="yes"/></Component>
@@ -201,210 +124,130 @@
                     <Component Feature="MainFeature"><File Source="msvc-release\seems.exe.manifest" KeyPath="yes"/></Component>
                     <Component Feature="MainFeature"><File Source="msvc-release\STL_Containers.dll" KeyPath="yes"/></Component>
                     <Component Feature="MainFeature"><File Source="msvc-release\ZedGraph.dll" KeyPath="yes"/></Component>
-                    <Component Feature="MainFeature"><File Source="msvc-release\msparser.dll" KeyPath="yes"/></Component>
-                    <Component Feature="MainFeature"><File Source="msvc-release\unimod_2.xsd" KeyPath="yes"/></Component>
-                    
-<!-- Agilent DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\EULA.MHDAC" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\agtsampleinforw.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\MassSpecDataReader.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseCommon.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseDataAccess.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseDataAccess.dll.config" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\MIDAC.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseError.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BaseTof.dll" KeyPath="yes"/></Component>
-
-
-<!-- Bruker DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\EULA.TimsSDK" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Constants.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Interfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Objects.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Calibration.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Constants.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Interfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Objects.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.TemperatureCompensation.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Transformation.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Utilities.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.Factory.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.Interfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.UntU2.dll" KeyPath="yes"/></Component>
-<?if $(var.AddressModel)=64 ?>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_date_time-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_regex-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_system-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_thread-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
-<?else?>   
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_date_time-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_regex-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_system-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\boost_thread-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\msvcr71.dll" KeyPath="yes"/></Component>
-<?endif?>
-<Component Feature="MainFeature"><File Source="msvc-release\CompassXtractMS.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_4F1EA0CB-5A6A-43ED-9562-D6D873034577.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_6BB2E64A-27A0-4575-A66A-4E312C8B9AD7.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_6EEE649E-09AA-4332-8E82-8188652E8AB5.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_7F88E97F-2038-40ba-8F3A-FCA9A9719569.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_382D5134-9727-4be6-B6F8-754F577426D6.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Compressor_12451AC8-3BF1-48e1-8E66-DA05BF3852A0.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\FlexVariableTable.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\HSReadWrite.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.EDAL.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.EDAL.SxS.manifest" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.HSREADWRITELib.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.HSREADWRITELib.SxS.manifest" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\ICRVariableTable.xml" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\mkl_sequential.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\baf2sql_c.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\timsdata.dll" KeyPath="yes"/></Component>
-
-
-<!-- AB Sciex DLLs -->
-<Directory Id="SQLite_v1.0.98" Name="SQLite_v1.0.98">
-<Component Feature="MainFeature"><File Id="Wiff2_System.Data.SQLite.dll" Source="msvc-release\SQLite_v1.0.98\System.Data.SQLite.dll" KeyPath="yes"/></Component>
-</Directory>
-<Component Feature="MainFeature"><File Source="msvc-release\Interop.DataExplorer.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Compression.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Acquisition.Client.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Acquisition.Contracts.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.AnalystDataProvider.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Client.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Common.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.CommonInterfaces.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Contracts.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Core.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Wiff2.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.WiffReader.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.DataService.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Devices.Types.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Domain.Acquisition.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Domain.Acquisition.Methods.MassSpec.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Infrastructure.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.InternalRawXYProcessing.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Muni.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.RawXYProcessing.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.StructuredStorage.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.UserLog.Types.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Utility.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.XmlHelpers.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.Unity.Configuration.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.Unity.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.ServiceLocation.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Core.Contracts.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Core.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.EventServices.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Logging.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\OFX.Security.Core.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\SciexToolKit.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\protobuf-net.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Clearcore.FMan.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.Processing.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.SimpleTypes.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.XYData.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.FMan.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Wiff.dll" KeyPath="yes"/></Component>
-
-
-<!-- Shimadzu DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\EULA.SFCS" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\DataReader.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\CABINET.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\DualProbeInterfaceParametersCS.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Google.Protobuf.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\QTFLProtoCS.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Shimadzu.LabSolutions.IO.IoModule.dll" KeyPath="yes"/></Component>
-<?if $(var.AddressModel)=64 ?>
-<Directory Id="Shimadzu_x64" Name="x64">
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\CLFIO32.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\CRHAKEI2.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\IOModuleQTFL.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\MassCalcWrapObject.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\MSMSDBCntl.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\PeakItgLSS.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x64\QTFLDebugLog.dll" KeyPath="yes"/></Component>
-</Directory>
-<?else?>
-<Directory Id="Shimadzu_x86" Name="x86">
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\CLFIO32.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\CRHAKEI2.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\IOModuleQTFL.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\MassCalcWrapObject.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\MSMSDBCntl.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\PeakItgLSS.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\x86\QTFLDebugLog.dll" KeyPath="yes"/></Component>
-</Directory>
-<?endif?>
-
-
-<!-- Thermo DLLs -->
-<?if $(var.AddressModel)=64 ?>
-    <Component Feature="MainFeature"><File Source="msvc-release\EULA.RawFileReader" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\ThermoFisher.CommonCore.Data.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\ThermoFisher.CommonCore.RawFileReader.dll" KeyPath="yes"/></Component>
-<?else?>
-    <Component Feature="MainFeature"><File Source="msvc-release\EULA.MSFileReader" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\Interop.MSFileReaderLib.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\MSFileReader.XRawfile2.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\MSFileReader.XRawfile2.SxS.manifest" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\fileio.dll" KeyPath="yes"/></Component>
-    <Component Feature="MainFeature"><File Source="msvc-release\fregistry.dll" KeyPath="yes"/></Component>
-<?endif?>
-
-
-<!-- Water DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\MassLynxRaw.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\cdt.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\IdentityModel.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\Newtonsoft.Json.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\System.Runtime.Caching.Generic.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\ParallelExtensionsExtras.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\unifi-protobuf-net.dll" KeyPath="yes"/></Component>
-
                   
-<!-- UIMF DLLs -->
-<Component Feature="MainFeature"><File Source="msvc-release\UIMFLibrary.dll" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\System.Data.SQLite.dll" KeyPath="yes"/></Component>
-
-
-<!-- ProteoWizard executables -->
-<Component Feature="MainFeature"><File Source="msvc-release\chainsaw.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\idcat.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\idconvert.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\msaccess.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\msbenchmark.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\mscat.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\msconvert.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\msistats.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\mspicture.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\peakaboo.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\pepcat.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\pepsum.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\sldout.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\qtofpeakpicker.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\ThermoRawMetaDump.exe" KeyPath="yes"/></Component>
-<Component Feature="MainFeature"><File Source="msvc-release\txt2mzml.exe" KeyPath="yes"/></Component>                
+                    <!-- ProteoWizard executables -->
+                    <Component Feature="MainFeature"><File Source="msvc-release\chainsaw.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\idcat.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\idconvert.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\msaccess.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\msbenchmark.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\mscat.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\msconvert.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\msistats.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\mspicture.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\peakaboo.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\pepcat.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\pepsum.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\sldout.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\qtofpeakpicker.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\ThermoRawMetaDump.exe" KeyPath="yes"/></Component>
+                    <Component Feature="MainFeature"><File Source="msvc-release\txt2mzml.exe" KeyPath="yes"/></Component>
+
+                    __VENDOR_DLLS__
                 </Directory>
             </Directory>
          </Directory>
       </Directory>
 
-      <Feature Id="MainFeature" Title="ProteoWizard {numeric-version} $(var.AddressModel)-bit" Level="1">
-         <MergeRef Id="CRT9" />
-         <MergeRef Id="MFC9" />
-         <MergeRef Id="CRT9_policy" />
-         <MergeRef Id="MFC9_policy" />
-         <MergeRef Id="CRT11" />
-         <MergeRef Id="OMP11" />
-         <MergeRef Id="CRT12" />
-         <MergeRef Id="MFC12" />
-         <MergeRef Id="CRT14" />
-         <MergeRef Id="OMP14" />
-      </Feature>
+      <Feature Id="MainFeature" Title="ProteoWizard {numeric-version} $(var.AddressModel)-bit" Level="1" />
    </Product>
+
+  <Fragment>
+    <WixVariable Id="WixUISupportPerUser" Value="1" Overridable="yes" />
+    <WixVariable Id="WixUISupportPerMachine" Value="1" Overridable="yes" />
+
+    <PropertyRef Id="ApplicationFolderName" />
+
+    <CustomAction Id="WixSetDefaultPerUserFolder2" Property="WixPerUserFolder" Value="[LocalAppDataFolder]Apps\[ApplicationFolderName]" Execute="immediate" />
+    <CustomAction Id="WixSetDefaultPerMachineFolder2" Property="WixPerMachineFolder" Value="[ProgramFilesFolder][ApplicationFolderName]" Execute="immediate" />
+    <CustomAction Id="WixSetPerUserFolder2" Property="APPLICATIONFOLDER" Value="[WixPerUserFolder]" Execute="immediate" />
+    <CustomAction Id="WixSetPerMachineFolder2" Property="APPLICATIONFOLDER" Value="[WixPerMachineFolder]" Execute="immediate" />
+
+    <InstallExecuteSequence>
+      <Custom Action="WixSetDefaultPerUserFolder2" Before="CostFinalize" />
+      <Custom Action="WixSetDefaultPerMachineFolder2" After="WixSetDefaultPerUserFolder2" />
+      <Custom Action="WixSetPerUserFolder2" After="WixSetDefaultPerMachineFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+      <Custom Action="WixSetPerMachineFolder2" After="WixSetPerUserFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
+    </InstallExecuteSequence>
+    <InstallUISequence>
+      <Custom Action="WixSetDefaultPerUserFolder2" Before="CostFinalize" />
+      <Custom Action="WixSetDefaultPerMachineFolder2" After="WixSetDefaultPerUserFolder2" />
+      <Custom Action="WixSetPerUserFolder2" After="WixSetDefaultPerMachineFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged)))</Custom>
+      <Custom Action="WixSetPerMachineFolder2" After="WixSetPerUserFolder2">ACTION="INSTALL" AND APPLICATIONFOLDER="" AND (ALLUSERS=1 OR (ALLUSERS=2 AND Privileged))</Custom>
+    </InstallUISequence>
+
+    <UI Id="WixUI_InstallDirScoped">
+      <TextStyle Id="WixUI_Font_Normal" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Normal_Size)" />
+      <TextStyle Id="WixUI_Font_Bigger" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Bigger_Size)" />
+      <TextStyle Id="WixUI_Font_Title" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Title_Size)" Bold="yes" />
+      <TextStyle Id="WixUI_Font_Emphasized" FaceName="!(loc.Advanced_Font_FaceName)" Size="!(loc.Advanced_Font_Emphasized_Size)" Bold="yes" />
+
+      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+      <Property Id="WixUI_Mode" Value="Advanced" />
+      <Property Id="ALLUSERS" Value="2" />
+
+      <DialogRef Id="BrowseDlg" />
+      <DialogRef Id="InstallScopeDlg" />
+      <DialogRef Id="InstallDirDlg" />
+      <DialogRef Id="ErrorDlg" />
+      <DialogRef Id="FatalError" />
+      <DialogRef Id="FilesInUse" />
+      <DialogRef Id="MsiRMFilesInUse" />
+      <DialogRef Id="PrepareDlg" />
+      <DialogRef Id="ProgressDlg" />
+      <DialogRef Id="ResumeDlg" />
+      <DialogRef Id="UserExit" />
+      <DialogRef Id="WelcomeDlg"/>
+
+      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="1">1</Publish>
+      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="2"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallScopeDlg" Order="1">!(wix.WixUISupportPerMachine) AND !(wix.WixUISupportPerUser)</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">!(wix.WixUISupportPerMachine) AND NOT !(wix.WixUISupportPerUser)</Publish>
+
+      <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+      <!-- override default WixAppFolder of WixPerMachineFolder as standard user won't be shown the radio group to set WixAppFolder -->
+      <Publish Dialog="InstallScopeDlg" Control="Next" Property="WixAppFolder" Value="WixPerUserFolder" Order="1">!(wix.WixUISupportPerUser) AND NOT Privileged</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Property="MSIINSTALLPERUSER" Value="1" Order="2">WixAppFolder = "WixPerUserFolder"</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Property="MSIINSTALLPERUSER" Value="{}" Order="3">WixAppFolder = "WixPerMachineFolder"</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="1" Order="4">WixAppFolder = "WixPerMachineFolder"</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="2" Order="5">WixAppFolder = "WixPerUserFolder"</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerUserFolder]" Order="6">WixAppFolder = "WixPerUserFolder"</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Property="APPLICATIONFOLDER" Value="[WixPerMachineFolder]" Order="7">WixAppFolder = "WixPerMachineFolder"</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="PwizOptionsDlg" Order="8">WixAppFolder = "WixPerUserFolder"</Publish>
+      <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="9">WixAppFolder = "WixPerMachineFolder"</Publish>
+
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">!(wix.WixUISupportPerUser)</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">NOT !(wix.WixUISupportPerUser)</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="PwizOptionsDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+      <Publish Dialog="PwizOptionsDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
+      <Publish Dialog="PwizOptionsDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+      <Publish Dialog="PwizOptionsDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="1">1</Publish>
+
+      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">NOT Installed AND WixAppFolder = "WixPerUserFolder"</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">NOT Installed AND WixAppFolder = "WixPerMachineFolder"</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="PwizOptionsDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish>
+
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+    </UI>
+
+    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
+    <UIRef Id="WixUI_Common" />
+  </Fragment>
 </Wix>
diff --git a/scripts/wix/vendor-dlls.wxs-fragment b/scripts/wix/vendor-dlls.wxs-fragment
new file mode 100644
index 0000000000..d5025aa094
--- /dev/null
+++ b/scripts/wix/vendor-dlls.wxs-fragment
@@ -0,0 +1,289 @@
+<!-- MSVC runtime DLLs -->
+<?if $(var.AddressModel)=64 ?>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp110.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcr110.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcomp110.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp120.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcr120.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-console-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-datetime-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-debug-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-errorhandling-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-file-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-file-l1-2-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-file-l2-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-handle-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-heap-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-interlocked-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-libraryloader-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-localization-l1-2-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-memory-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-namedpipe-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-processenvironment-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-processthreads-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-processthreads-l1-1-1.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-profile-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-rtlsupport-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-string-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-synch-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-synch-l1-2-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-sysinfo-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-timezone-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-util-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-conio-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-convert-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-environment-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-filesystem-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-heap-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-locale-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-math-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-multibyte-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-private-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-process-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-runtime-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-stdio-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-string-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-time-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-utility-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\concrt140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\mfc140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\ucrtbase.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcomp140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcruntime140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcm90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcr90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcomp.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\mfc90.dll" KeyPath="yes"/></Component>
+
+<?else?>
+
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp110.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcr110.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcomp110.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp120.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcr120.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-console-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-datetime-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-debug-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-errorhandling-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-file-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-file-l1-2-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-file-l2-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-handle-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-heap-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-interlocked-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-libraryloader-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-localization-l1-2-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-memory-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-namedpipe-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-processenvironment-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-processthreads-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-processthreads-l1-1-1.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-profile-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-rtlsupport-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-string-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-synch-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-synch-l1-2-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-sysinfo-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-timezone-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-core-util-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-conio-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-convert-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-environment-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-filesystem-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-heap-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-locale-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-math-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-multibyte-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-private-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-process-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-runtime-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-stdio-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-string-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-time-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\api-ms-win-crt-utility-l1-1-0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\mfc140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\ucrtbase.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcomp140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcruntime140.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcm90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcp90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\msvcr90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\vcomp90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\mfc90.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\mfc90u.dll" KeyPath="yes"/></Component>
+<?endif?>
+
+<!-- Agilent DLLs -->
+<Component Feature="MainFeature"><File Source="msvc-release\EULA.MHDAC" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\agtsampleinforw.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\MassSpecDataReader.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BaseCommon.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BaseDataAccess.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BaseDataAccess.dll.config" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\MIDAC.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BaseError.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BaseTof.dll" KeyPath="yes"/></Component>
+
+
+<!-- Bruker DLLs -->
+<Component Feature="MainFeature"><File Source="msvc-release\EULA.TimsSDK" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Constants.xml" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Interfaces.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.BCO.Objects.xml" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Calibration.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Constants.xml" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Interfaces.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Objects.xml" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.TemperatureCompensation.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Transformation.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CCO.Utilities.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.Factory.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.Interfaces.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\BDal.CXt.Lc.UntU2.dll" KeyPath="yes"/></Component>
+<?if $(var.AddressModel)=64 ?>
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_date_time-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_regex-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_system-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_thread-vc90-mt-1_37-x64-BDAL_20091123.dll" KeyPath="yes"/></Component>
+<?else?>   
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_date_time-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_regex-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_system-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\boost_thread-vc90-mt-1_37-BDAL_20091123.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\msvcr71.dll" KeyPath="yes"/></Component>
+<?endif?>
+<Component Feature="MainFeature"><File Source="msvc-release\CompassXtractMS.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Compressor_4F1EA0CB-5A6A-43ED-9562-D6D873034577.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Compressor_6BB2E64A-27A0-4575-A66A-4E312C8B9AD7.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Compressor_6EEE649E-09AA-4332-8E82-8188652E8AB5.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Compressor_7F88E97F-2038-40ba-8F3A-FCA9A9719569.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Compressor_382D5134-9727-4be6-B6F8-754F577426D6.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Compressor_12451AC8-3BF1-48e1-8E66-DA05BF3852A0.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\FlexVariableTable.xml" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\HSReadWrite.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Interop.EDAL.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Interop.EDAL.SxS.manifest" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Interop.HSREADWRITELib.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Interop.HSREADWRITELib.SxS.manifest" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\ICRVariableTable.xml" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\mkl_sequential.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\baf2sql_c.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\timsdata.dll" KeyPath="yes"/></Component>
+
+
+<!-- AB Sciex DLLs -->
+<Directory Id="SQLite_v1.0.98" Name="SQLite_v1.0.98">
+<Component Feature="MainFeature"><File Id="Wiff2_System.Data.SQLite.dll" Source="msvc-release\SQLite_v1.0.98\System.Data.SQLite.dll" KeyPath="yes"/></Component>
+</Directory>
+<Component Feature="MainFeature"><File Source="msvc-release\Interop.DataExplorer.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Compression.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Acquisition.Client.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Acquisition.Contracts.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.AnalystDataProvider.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Client.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Common.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.CommonInterfaces.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Contracts.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Core.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.Wiff2.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Data.WiffReader.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.DataService.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Devices.Types.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Domain.Acquisition.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Domain.Acquisition.Methods.MassSpec.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Infrastructure.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.InternalRawXYProcessing.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Muni.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.RawXYProcessing.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.StructuredStorage.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.UserLog.Types.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.Utility.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Clearcore2.XmlHelpers.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.Unity.Configuration.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.Unity.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Microsoft.Practices.ServiceLocation.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\OFX.Core.Contracts.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\OFX.Core.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\OFX.EventServices.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\OFX.Logging.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\OFX.Security.Core.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\SciexToolKit.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\protobuf-net.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Clearcore.FMan.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.Processing.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.SimpleTypes.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Data.XYData.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Sciex.FMan.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Sciex.Wiff.dll" KeyPath="yes"/></Component>
+
+
+<!-- Shimadzu DLLs -->
+<Component Feature="MainFeature"><File Source="msvc-release\EULA.SFCS" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\DataReader.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\CABINET.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\DualProbeInterfaceParametersCS.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Google.Protobuf.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\QTFLProtoCS.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Shimadzu.LabSolutions.IO.IoModule.dll" KeyPath="yes"/></Component>
+<?if $(var.AddressModel)=64 ?>
+<Directory Id="Shimadzu_x64" Name="x64">
+    <Component Feature="MainFeature"><File Source="msvc-release\x64\CLFIO32.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x64\CRHAKEI2.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x64\IOModuleQTFL.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x64\MassCalcWrapObject.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x64\MSMSDBCntl.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x64\PeakItgLSS.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x64\QTFLDebugLog.dll" KeyPath="yes"/></Component>
+</Directory>
+<?else?>
+<Directory Id="Shimadzu_x86" Name="x86">
+    <Component Feature="MainFeature"><File Source="msvc-release\x86\CLFIO32.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x86\CRHAKEI2.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x86\IOModuleQTFL.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x86\MassCalcWrapObject.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x86\MSMSDBCntl.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x86\PeakItgLSS.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\x86\QTFLDebugLog.dll" KeyPath="yes"/></Component>
+</Directory>
+<?endif?>
+
+
+<!-- Thermo DLLs -->
+<?if $(var.AddressModel)=64 ?>
+    <Component Feature="MainFeature"><File Source="msvc-release\EULA.RawFileReader" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\ThermoFisher.CommonCore.Data.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\ThermoFisher.CommonCore.RawFileReader.dll" KeyPath="yes"/></Component>
+<?else?>
+    <Component Feature="MainFeature"><File Source="msvc-release\EULA.MSFileReader" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\Interop.MSFileReaderLib.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\MSFileReader.XRawfile2.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\MSFileReader.XRawfile2.SxS.manifest" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\fileio.dll" KeyPath="yes"/></Component>
+    <Component Feature="MainFeature"><File Source="msvc-release\fregistry.dll" KeyPath="yes"/></Component>
+<?endif?>
+
+
+<!-- Water DLLs -->
+<Component Feature="MainFeature"><File Source="msvc-release\MassLynxRaw.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\cdt.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\IdentityModel.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\Newtonsoft.Json.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\System.Runtime.Caching.Generic.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\ParallelExtensionsExtras.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\unifi-protobuf-net.dll" KeyPath="yes"/></Component>
+
+                  
+<!-- UIMF DLLs -->
+<Component Feature="MainFeature"><File Source="msvc-release\UIMFLibrary.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\System.Data.SQLite.dll" KeyPath="yes"/></Component>
+
+<!-- Mascot Parser -->
+<Component Feature="MainFeature"><File Source="msvc-release\msparser.dll" KeyPath="yes"/></Component>
+<Component Feature="MainFeature"><File Source="msvc-release\unimod_2.xsd" KeyPath="yes"/></Component>