From df2b0a6dd0b66f90879f61af9699a4d21dd41c38 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Fri, 28 Jun 2019 11:50:03 +0200
Subject: [PATCH] modernize setup

---
 SetupWix/Config.wxi       |  10 ++
 SetupWix/Product.wxs      | 364 +++++++++++++++++++++-----------------
 SetupWix/SetupWix.wixproj |   3 +
 3 files changed, 215 insertions(+), 162 deletions(-)
 create mode 100644 SetupWix/Config.wxi

diff --git a/SetupWix/Config.wxi b/SetupWix/Config.wxi
new file mode 100644
index 0000000..966c724
--- /dev/null
+++ b/SetupWix/Config.wxi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+	<!-- TODO: Put your code here. -->
+  <?define ProgramName="Global_Indexer"?>
+  <?define ProductName="Global Indexer"?>
+  <?define Manufacturer="Digital Data"?>
+  <?define Description="Beschreibung des Programms"?>
+  <?define Comments="Kommentar wie Copyright-Hinweis"?>
+  <?define UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}"?>
+</Include>
diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs
index 6c18b91..5f4414f 100644
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?include Config.wxi?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Global Indexer" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+  <Product Name="$(var.ProductName)" Id="*" UpgradeCode="{930076B5-9D2B-455F-920F-9718ED091D0C}" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" Language="1031" Codepage="1252">
     <Package 
       Id="*" 
       Keywords="Installer"
-      Description="Digital Data Global Indexer Setup" 
-      Comments="Global Indexer is a registered Trademark of Digital Data" 
-      Manufacturer="Digital Data" 
+      Description="$(var.Description)" 
+      Comments="$(var.Comments)" 
+      Manufacturer="$(var.Manufacturer)" 
       InstallerVersion="100" 
       Languages="1031" 
       Compressed="yes" 
@@ -35,7 +36,7 @@
     />
 
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="{930076B5-9D2B-455F-920F-9718ED091D0C}">
+    <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion
         Minimum="1.0.0" Maximum="99.0.0"
         Property="PREVIOUSVERSIONSINSTALLED"
@@ -54,161 +55,176 @@
       <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
     </Property>
 
-    <!-- Legt die Ordner Struktur fest -->
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder" Name="Pfiles">
-        <Directory Id="DD" Name="Digital Data">
-          <!-- Speichert den Installationsort in der Registry -->
-          <Component Id="RegistryEntries" Guid="57CCE36E-F152-4D17-81A0-CCAAEFA777A3">
-            <RegistryKey Root="HKCU" Key="Software\[Manufacturer]\[ProductName]">
-              <RegistryValue Type="string" Name="Path" Value="[INSTALLDIR]" KeyPath="yes" />
-            </RegistryKey>
-          </Component>
-
-          <!-- Das Installationsverzeichnis -->
-          <Directory Id="INSTALLDIR" Name="Global Indexer">
-
-            <!-- Die DD-Record-Organiser.exe und Shortcuts für Desktop und Startmenü -->
-            <Component Id="MainExecutable" Guid="EE8034F0-A2DE-4C38-A961-7F7668229416">
-              <File Id="GIEXE" Name="Global_Indexer.exe" Source="Global_Indexer.exe" KeyPath="yes">
-                <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="Global Indexer" WorkingDirectory="INSTALLDIR" Icon="GlobalIndexer.exe" IconIndex="0" Advertise="yes" />
-                <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="Global Indexer" WorkingDirectory="INSTALLDIR" Icon="GlobalIndexer.exe" IconIndex="0" Advertise="yes" />
-              </File>
-               <!--Programmordner bei Deinstallation entfernen-->
-               <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
-            </Component>
-            <!-- Die ReleaseNotes -->
-            <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
-              <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD GlobalIndexer\Release Notes.txt" KeyPath="yes">
-              </File>
-            </Component>
-            <!-- Die ApplicationIco -->
-            <Component Id="ApplicationIco" Guid="5C2EEA18-0718-41E9-A8C6-38D3C622921B">
-              <File Id="ApplicationIco" Name="DD_Icons_ICO_GLOBIX_128.ico" Source="S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_GLOBIX_128.ico" KeyPath="yes">
-              </File>
-            </Component>
-
-            <!--WINDREAM Bibliotheken--> 
-            <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-              <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes" />
-              <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
-              <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
-              <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
-            </Component>
-
-            <!-- MAIL.NET Bibliothek -->
-            <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes" />
-            </Component>
-
-            <!-- DEVEXPRESS Bibliotheken -->
-            <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-              <File Id="DevExpress.Charts.v15.2.Core" Name="DevExpress.Charts.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll" KeyPath="yes" />
-              <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.DataAccess.v15.2" Name="DevExpress.DataAccess.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.DataAccess.v15.2.UI.dll" Name="DevExpress.DataAccess.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll" KeyPath="no" />
-              <File Id="DevExpress.Office.v15.2.Core" Name="DevExpress.Office.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.dll" KeyPath="no"/>
-              <File Id="DevExpress.Pdf.v15.2.Core" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll" KeyPath="no"/>
-              <File Id="DevExpress.Pdf.v15.2.Drawing" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" KeyPath="no" />
-              <File Id="DevExpress.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.RichEdit.v15.2.Core" Name="DevExpress.RichEdit.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.Sparkline.v15.2.Core" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.Spreadsheet.v15.2.Core" Name="DevExpress.Spreadsheet.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll" KeyPath="no" />
-              <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.Utils.v15.2.UI" Name="DevExpress.Utils.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraCharts.v15.2" Name="DevExpress.XtraCharts.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraBars.v15.2" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraEditors.v15.2" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraGrid.v15.2" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraNavBar.v15.2" Name="DevExpress.XtraNavBar.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraPdfViewer.v15.2" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraRichEdit.v15.2" Name="DevExpress.XtraRichEdit.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraSpreadsheet.v15.2" Name="DevExpress.XtraSpreadsheet.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraTreeList.v15.2" Name="DevExpress.XtraTreeList.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll" KeyPath="no" />
-              <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" KeyPath="no" />
-            </Component>
-            <!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
-            <Directory Id="LOCALE_EN_US" Name="en-US">
-              <Component Id="GlobalIndexer.Locales.en_us" Guid="6FC6DC57-6D61-49EE-B490-CEE054BE911A">
-                <File Id="Global_Indexer.resource.en_us" Name="Global_Indexer.resources.dll" Source="en-US\Global_Indexer.resources.dll"></File>
-              </Component>
-            </Directory>
-
-            <Directory Id="LOCALE_EN" Name="en">
-              <Component Id="GlobalIndexer.Locales.en" Guid="3bba6463-aa8d-4cff-b4e0-7941491260db">
-                <File Id="Global_Indexer.resource.en" Name="Global_Indexer.resources.dll" Source="en\Global_Indexer.resources.dll"></File>
-              </Component>
-            </Directory>
-            
-            <Directory Id="LOCALE_DE" Name="de-DE">
-              <Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
-                <File Id="Global_Indexer.resources.de" Name="Global_Indexer.resources.dll" Source="de-DE\Global_Indexer.resources.dll"></File>
-              </Component>
-
-              <Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
-                <File Id="DevExpress.Charts.v15.2.Core.resources" Name="DevExpress.Charts.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll" KeyPath="yes" />
-                <File Id="DevExpress.Data.v15.2.resources" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.DataAccess.v15.2.resources" Name="DevExpress.DataAccess.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.DataAccess.v15.2..resources" Name="DevExpress.DataAccess.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll" KeyPath="no" />
-                <File Id="DevExpress.Office.v15.2.Core.resources" Name="DevExpress.Office.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.dll" KeyPath="no"/>
-                <File Id="DevExpress.Pdf.v15.2.Core.resources" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll" KeyPath="no"/>
-                <File Id="DevExpress.Pdf.v15.2.Drawing.resources" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" KeyPath="no" />
-                <File Id="DevExpress.Printing.v15.2.Core.resources" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll" KeyPath="no" />
-                <File Id="DevExpress.RichEdit.v15.2.Core.resources" Name="DevExpress.RichEdit.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll" KeyPath="no" />
-                <File Id="DevExpress.Sparkline.v15.2.Core.resources" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" KeyPath="no" />
-                <File Id="DevExpress.Spreadsheet.v15.2.Core.resources" Name="DevExpress.Spreadsheet.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll" KeyPath="no" />
-                <File Id="DevExpress.Utils.v15.2.resources" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.Utils.v15.2.UI.resources" Name="DevExpress.Utils.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraCharts.v15.2.resources" Name="DevExpress.XtraCharts.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraBars.v15.2.resources" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraEditors.v15.2.resources" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraGrid.v15.2.resources" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraNavBar.v15.2.resources" Name="DevExpress.XtraNavBar.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraPdfViewer.v15.2.resources" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraPrinting.v15.2.resources" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraRichEdit.v15.2.resources" Name="DevExpress.XtraRichEdit.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraSpreadsheet.v15.2.resources" Name="DevExpress.XtraSpreadsheet.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll" KeyPath="no" />
-                <File Id="DevExpress.XtraTreeList.v15.2.resources" Name="DevExpress.XtraTreeList.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll" KeyPath="no" />
-              </Component>
-            </Directory>
-            
-             <!-- Digital-Data DLLS -->
-            <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-              <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes" />
-            </Component>
-            
-           <!-- Office-Bibliotheken -->
-            <Component Id="Microsoft.Office" Guid="D600FF38-E549-4CBA-BB33-09B0BD0C8C26">
-              <File Id="Office" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
-              <File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
-            </Component>
-          
-           <!-- Oracle-Bibliothek -->
-            <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
-              <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="Oracle.ManagedDataAccess.dll" KeyPath="yes" />
-            </Component>
-          </Directory>
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="DDDIR" Name="$(var.Manufacturer)">
+          <Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
         </Directory>
       </Directory>
 
-      <!-- Startmenü Ordner -->
-      <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="Global Indexer">
-          <Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes" />
-          </Component>
-        </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
       </Directory>
 
-      <!-- Desktop Ordner -->
-      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="DesktopFolder" />
     </Directory>
 
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="ApplicationShortcut_StartMenu" Guid="f09edfce-71ac-4c79-ae46-8a5ae1a2b84c">
+        <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
+             Name="$(var.ProductName)"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
+             WorkingDirectory="INSTALLDIR"/>
+        <RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DesktopFolder">
+      <Component Id="ApplicationShortcut_Desktop" Guid="e88a7cdb-00c7-4ecb-864e-d182e099eea2">
+        <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
+             Name="$(var.ProductName)"
+             Target="[INSTALLDIR]$(var.ProgramName).exe"
+             WorkingDirectory="INSTALLDIR"/>
+        <RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="INSTALLDIR">
+      <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
+        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
+      </Component>
+
+      <!-- Die ReleaseNotes -->
+      <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
+        <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD GlobalIndexer\Release Notes.txt" KeyPath="yes">
+        </File>
+      </Component>
+      <!-- Die ApplicationIco -->
+      <Component Id="ApplicationIco" Guid="5C2EEA18-0718-41E9-A8C6-38D3C622921B">
+        <File Id="ApplicationIco" Name="DD_Icons_ICO_GLOBIX_128.ico" Source="S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_GLOBIX_128.ico" KeyPath="yes">
+        </File>
+      </Component>
+
+      <!--WINDREAM Bibliotheken-->
+      <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
+        <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes" />
+        <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
+        <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
+        <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
+      </Component>
+
+      <!-- MAIL.NET Bibliothek -->
+      <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
+        <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll" KeyPath="yes" />
+      </Component>
+
+      <!-- DEVEXPRESS Bibliotheken -->
+      <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
+        <File Id="DevExpress.Charts.v15.2.Core" Name="DevExpress.Charts.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll" KeyPath="yes" />
+        <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.DataAccess.v15.2" Name="DevExpress.DataAccess.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.DataAccess.v15.2.UI.dll" Name="DevExpress.DataAccess.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll" KeyPath="no" />
+        <File Id="DevExpress.Office.v15.2.Core" Name="DevExpress.Office.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.dll" KeyPath="no"/>
+        <File Id="DevExpress.Pdf.v15.2.Core" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll" KeyPath="no"/>
+        <File Id="DevExpress.Pdf.v15.2.Drawing" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" KeyPath="no" />
+        <File Id="DevExpress.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll" KeyPath="no" />
+        <File Id="DevExpress.RichEdit.v15.2.Core" Name="DevExpress.RichEdit.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll" KeyPath="no" />
+        <File Id="DevExpress.Sparkline.v15.2.Core" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" KeyPath="no" />
+        <File Id="DevExpress.Spreadsheet.v15.2.Core" Name="DevExpress.Spreadsheet.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll" KeyPath="no" />
+        <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.Utils.v15.2.UI" Name="DevExpress.Utils.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraCharts.v15.2" Name="DevExpress.XtraCharts.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraBars.v15.2" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraEditors.v15.2" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraGrid.v15.2" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraNavBar.v15.2" Name="DevExpress.XtraNavBar.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraPdfViewer.v15.2" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraPrinting.v15.2" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraRichEdit.v15.2" Name="DevExpress.XtraRichEdit.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraSpreadsheet.v15.2" Name="DevExpress.XtraSpreadsheet.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraTreeList.v15.2" Name="DevExpress.XtraTreeList.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll" KeyPath="no" />
+        <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll" KeyPath="no" />
+      </Component>
+      
+      <!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
+      <Directory Id="LOCALE_EN_US" Name="en-US">
+        <Component Id="GlobalIndexer.Locales.en_us" Guid="6FC6DC57-6D61-49EE-B490-CEE054BE911A">
+          <File Id="Global_Indexer.resource.en_us" Name="Global_Indexer.resources.dll" Source="en-US\Global_Indexer.resources.dll"></File>
+        </Component>
+      </Directory>
+
+      <Directory Id="LOCALE_EN" Name="en">
+        <Component Id="GlobalIndexer.Locales.en" Guid="3bba6463-aa8d-4cff-b4e0-7941491260db">
+          <File Id="Global_Indexer.resource.en" Name="Global_Indexer.resources.dll" Source="en\Global_Indexer.resources.dll"></File>
+        </Component>
+      </Directory>
+
+      <Directory Id="LOCALE_DE" Name="de-DE">
+        <Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
+          <File Id="Global_Indexer.resources.de" Name="Global_Indexer.resources.dll" Source="de-DE\Global_Indexer.resources.dll"></File>
+        </Component>
+
+        <Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
+          <File Id="DevExpress.Charts.v15.2.Core.resources" Name="DevExpress.Charts.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll" KeyPath="yes" />
+          <File Id="DevExpress.Data.v15.2.resources" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.DataAccess.v15.2.resources" Name="DevExpress.DataAccess.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.DataAccess.v15.2..resources" Name="DevExpress.DataAccess.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll" KeyPath="no" />
+          <File Id="DevExpress.Office.v15.2.Core.resources" Name="DevExpress.Office.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.dll" KeyPath="no"/>
+          <File Id="DevExpress.Pdf.v15.2.Core.resources" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll" KeyPath="no"/>
+          <File Id="DevExpress.Pdf.v15.2.Drawing.resources" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" KeyPath="no" />
+          <File Id="DevExpress.Printing.v15.2.Core.resources" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll" KeyPath="no" />
+          <File Id="DevExpress.RichEdit.v15.2.Core.resources" Name="DevExpress.RichEdit.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll" KeyPath="no" />
+          <File Id="DevExpress.Sparkline.v15.2.Core.resources" Name="DevExpress.Sparkline.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll" KeyPath="no" />
+          <File Id="DevExpress.Spreadsheet.v15.2.Core.resources" Name="DevExpress.Spreadsheet.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll" KeyPath="no" />
+          <File Id="DevExpress.Utils.v15.2.resources" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.Utils.v15.2.UI.resources" Name="DevExpress.Utils.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraCharts.v15.2.resources" Name="DevExpress.XtraCharts.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraBars.v15.2.resources" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraEditors.v15.2.resources" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraGrid.v15.2.resources" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraNavBar.v15.2.resources" Name="DevExpress.XtraNavBar.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraPdfViewer.v15.2.resources" Name="DevExpress.XtraPdfViewer.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraPrinting.v15.2.resources" Name="DevExpress.XtraPrinting.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraRichEdit.v15.2.resources" Name="DevExpress.XtraRichEdit.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraSpreadsheet.v15.2.resources" Name="DevExpress.XtraSpreadsheet.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll" KeyPath="no" />
+          <File Id="DevExpress.XtraTreeList.v15.2.resources" Name="DevExpress.XtraTreeList.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll" KeyPath="no" />
+        </Component>
+      </Directory>
+
+      <!-- Digital-Data DLLS -->
+      <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
+        <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes" />
+      </Component>
+
+      <!-- Office-Bibliotheken -->
+      <Component Id="Microsoft.Office" Guid="D600FF38-E549-4CBA-BB33-09B0BD0C8C26">
+        <File Id="Office" Name="Office.dll" Source="C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll" KeyPath="yes" />
+        <File Id="Microsoft.Office.Interop.Outlook" Name="Microsoft.Office.Interop.Outlook.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll" KeyPath="no" />
+      </Component>
+
+      <!-- Oracle-Bibliothek -->
+      <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+        <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="Oracle.ManagedDataAccess.dll" KeyPath="yes" />
+      </Component>
+
+      <Component Id="RegistryKeys" Guid="92d8072d-172e-43e2-93e2-535715eb11ce">
+        <RegistryKey Root="HKLM" Key="Software">
+          <RegistryKey Key="[Manufacturer]">
+            <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
+              <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
+            </RegistryKey>
+          </RegistryKey>
+        </RegistryKey>
+
+        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      </Component>
+    </DirectoryRef>
+
     <!-- Installierte Features -->
-    <Feature Id="Complete" Level="1">
-      <ComponentRef Id="MainExecutable" />
+    <Feature Id="Complete" Title="Main Application" Level="1">
+      <ComponentRef Id="MainApplicationExe" />
       <ComponentRef Id="ReleaseNotes"/>
       <ComponentRef Id="WindreamLibs" />
       <ComponentRef Id="DDLibs" />
@@ -216,22 +232,32 @@
       <ComponentRef Id="Microsoft.Office" />
       <ComponentRef Id="Oracle" />
       <ComponentRef Id="DevExpressLibs" />
-      <ComponentRef Id="ProgramMenuDir"/>
-      <ComponentRef Id="RegistryEntries"/>
+      <ComponentRef Id="RegistryKeys"/>
       <ComponentRef Id="ApplicationIco"/>
       <ComponentRef Id="GlobalIndexer.Locales.de" />
       <ComponentRef Id="GlobalIndexer.Locales.en"/>
       <ComponentRef Id="GlobalIndexer.Locales.en_us" />
-      <ComponentRef Id="Scheduler.Locales" />
-      
+      <ComponentRef Id="Scheduler.Locales" />      
+    </Feature>
+
+    <Feature Id="DesktopShortcut" Title="Desktop Shortcut">
+      <Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
+      <ComponentRef Id="ApplicationShortcut_Desktop"/>
+    </Feature>
+
+    <Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
+      <Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
+      <ComponentRef Id="ApplicationShortcut_StartMenu" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+    <Property Id="_BrowseProperty" Value="INSTALLDIR" />
 
     <!-- OBERFLÄCHE -->
     <UI>
-      <UIRef Id="WixUI_InstallDir" />
+      <!--<UIRef Id="WixUI_InstallDir" />-->
+      <UIRef Id="WixUI_FeatureTree"/>
       <UIRef Id="WixUI_ErrorProgressText" />
       <Publish Dialog="WelcomeDlg"
             Control="Next"
@@ -239,11 +265,25 @@
             Value="InstallDirDlg"
             Order="2">1</Publish>
       <Publish Dialog="InstallDirDlg"
-                Control="Back"
-                Event="NewDialog"
-                Value="WelcomeDlg"
-                Order="2">1</Publish>
+            Control="Back"
+            Event="NewDialog"
+            Value="WelcomeDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="Next"
+            Event="NewDialog"
+            Value="FeaturesDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="ChangeFolder"
+            Event="NewDialog"
+            Value="BrowseDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="FeaturesDlg"
+              Control="Back"
+              Event="NewDialog"
+              Value="InstallDirDlg"
+              Order="2">1</Publish>
     </UI>
-    <!-- OBERFLÄCHE END -->
   </Product>
 </Wix>
\ No newline at end of file
diff --git a/SetupWix/SetupWix.wixproj b/SetupWix/SetupWix.wixproj
index ab4e401..2d03c8f 100644
--- a/SetupWix/SetupWix.wixproj
+++ b/SetupWix/SetupWix.wixproj
@@ -39,6 +39,9 @@
       <Name>WixUIExtension</Name>
     </WixExtension>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Config.wxi" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.