From 136c4dec6e3b65f28d4901e92fe7627dfd9ff914 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Mon, 28 Jun 2021 10:25:26 +0200
Subject: [PATCH] Update Installer

---
 app/Setup_NoUpdaterVS19/Config.wxi            |  11 +
 app/Setup_NoUpdaterVS19/Product.wxs           | 514 +++++++++---------
 .../Setup_NoUpdaterVS19.wixproj               |   3 +
 3 files changed, 279 insertions(+), 249 deletions(-)
 create mode 100644 app/Setup_NoUpdaterVS19/Config.wxi

diff --git a/app/Setup_NoUpdaterVS19/Config.wxi b/app/Setup_NoUpdaterVS19/Config.wxi
new file mode 100644
index 0000000..0b80a76
--- /dev/null
+++ b/app/Setup_NoUpdaterVS19/Config.wxi
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <?define ProgramName="DD-Record-Organizer"?>
+  <?define ProductName="Record Organizer"?>
+  <?define Manufacturer="Digital Data"?>
+  <?define Description="Record Organizer"?>
+  <?define Comments="Record Organizer"?>
+  <?define UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}"?>
+
+  <?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
+</Include>
\ No newline at end of file
diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs
index 0315fa6..98e0c0f 100644
--- a/app/Setup_NoUpdaterVS19/Product.wxs
+++ b/app/Setup_NoUpdaterVS19/Product.wxs
@@ -1,50 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+<?include Config.wxi?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
     <Package
       Id="*"
       Keywords="Installer"
-      Description="Digital Data Record Organizer Setup"
-      Comments="Record Organizer 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"
       SummaryCodepage="1252"
       InstallScope="perMachine"
     />
-    <!-- 
-      InstallScrope="perMachine" - sorgt dafür, dass das Programm für jeden Benutzer installiert wird
-    -->
-
-    <!-- Nicht entfernen! -->
-    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
-    <Property Id='DiskPrompt' Value="Record Organizer Install" />
-
-    <!-- UPGRADE -->
-    <!-- 
-      Bei neuer Version muss die Versionsnummer unter 
-      My Project >> Anwendung >> Assemblyinformationen und unter Product/@Version geändert werden.
-      Hier die Assemblyversion UND Dateiversion ändern.
-      
-      NICHT den UpdateCode ändern!
-      Darf sich NIE MEHR ändern!
-    -->
+
+    <Media Id='1' Cabinet='RecordOrganizer.cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
+    <Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
+
     <MajorUpgrade
       AllowDowngrades="no"
       AllowSameVersionUpgrades="no"
-      DowngradeErrorMessage="A newer version of [ProductName] is already installed. The setup will terminate."
+      DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
     />
+    
+    
 
     <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}">
+    <Upgrade Id="$(var.UpgradeCode)">
       <UpgradeVersion
         Minimum="1.0.0.0" Maximum="99.0.0.0"
         Property="PREVIOUSVERSIONSINSTALLED"
         IncludeMinimum="yes" IncludeMaximum="no" />
     </Upgrade>
-    <!-- UPGRADE END -->
 
     <!-- Legt das Icon fest -->
     <Icon Id="DDRecordOrganizer.exe" SourceFile="DD-Record-Organizer.exe" />
@@ -53,232 +41,239 @@
     <Property Id="ARPPRODUCTICON" Value="DDRecordOrganizer.exe" />
 
     <!-- Liest den Installationsort über die Registry aus -->
-    <Property Id="APPLICATIONFOLDER">
-      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+    <Property Id="INSTALLDIR">
+      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" 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">
-
-          <!-- Das Installationsverzeichnis -->
-          <Directory Id="INSTALLDIR" Name="Record Organizer">
-
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="DD" Name="$(var.Manufacturer)">
+          <Directory Id="INSTALLDIR" Name="$(var.ProductName)">
             <Directory Id="ADDONDIR" Name="Addons">
-              <Directory Id="RIGHTMANAGERDIR" Name="RightManager">
-
-                <Component Id="RecordOrganizer_RightManager" Guid="BD73A9BB-89FD-4F4C-85B8-F31C97296745">
-                  <File Id="RecordOrganizer_RightManager.exe" Name="RecordOrganizer_RightManager.exe" Source="RecordOrganizer_RightManager.exe" />
-                  <File Id="DD_Rights.dll" Name="DD_Rights.dll" Source="DD_Rights.dll" />
-                  <File Id="Interop.WINDREAMLib.dll" Name="Interop.WINDREAMLib.dll" Source="Interop.WINDREAMLib.dll" />
-                </Component>
-
-                <!-- DEVEXPRESS Bibliotheken for RightsManager -->
-                <Component Id="DevExpressLibs_RightsManager" Guid="739740F2-1576-4416-8E3E-748F65358B65">
-                  <File Id="DevExpress.Data.v19.2_" Name="DevExpress.Data.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Data.v19.2.dll" KeyPath="yes" />
-                  <File Id="DevExpress.Sparkline.v19.2_" Name="DevExpress.Sparkline.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Sparkline.v19.2.Core.dll" />
-                  <File Id="DevExpress.Printing.v19.2.Core_" Name="DevExpress.Printing.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Printing.v19.2.Core.dll" />
-                  <File Id="DevExpress.Utils.v19.2_" Name="DevExpress.Utils.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Utils.v19.2.dll" />
-                  <File Id="DevExpress.XtraEditors.v19.2_" Name="DevExpress.XtraEditors.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraEditors.v19.2.dll" />
-                  <File Id="DevExpress.XtraGrid.v19.2_" Name="DevExpress.XtraGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraGrid.v19.2.dll" />
-                  <File Id="DevExpress.XtraLayout.v19.2_" Name="DevExpress.XtraLayout.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraLayout.v19.2.dll" />
-                  <File Id="DevExpress.XtraPrinting.v19.2_" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPrinting.v19.2.dll" />
-                </Component>
-                
-               <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
-                  <File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="yes" Checksum="yes"/>
-                </Component>
-
-              </Directory>
-
-              <!--<Directory Id="VERSIONCHECKER" Name="VERSION_CHECKER">
-                
-                <Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
-                  -->
-              <!--<File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe">
-                    <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-                    <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-                  </File>-->
-              <!--
-                  <File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe" Source="VERSION_CHECKER.exe" />
-               
-                  <File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
-                </Component>
-            
-              </Directory>-->
-            </Directory>
-
-            <!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
-            <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
-              <File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes">
-                <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-                <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
-              </File>
-              <!-- Programmordner bei Deinstallation entfernen-->
-              <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
-            </Component>
-            <Component Id="Docu" Guid="D6FAF95B-3CF0-4504-B18B-E1181E92DC91">
-              <File Id="releaseNote.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD - RECORD ORGANIZER\ChangeLog.txt" KeyPath="yes"/>
-            </Component>
-            <!-- WINDREAM Bibliotheken -->
-            <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-              <File Id="INDEXLibDLL" Name="AxInterop.INDEXLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.INDEXLib.dll" KeyPath="yes" />
-              <File Id="AxOBJECTLISTCONTROLLibDLL" Name="AxInterop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="OBJECTLISTCONTROLLibDLL" Name="Interop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
-              <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WINDREAMLib.dll" KeyPath="no" />
-              <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
-              <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
-              <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
-            </Component>
-
-            <!-- Oracle-Bibliothek -->
-            <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
-              <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
-            </Component>
-
-            <!-- Commandline Bibliothek -->
-            <Component Id="Commandline" Guid="53F9734C-F020-4885-96DC-D8CD880E8446">
-              <File Id="Commandline" Name="Commandline.dll" Source="Commandline.dll" KeyPath="yes" />
-            </Component>
-
-            <!-- DD Bibliotheken -->
-            <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-              <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
-              <File Id="DD_Rights" Name="DD_Rights.dll" Source="DD_Rights.dll" KeyPath="no" />
-              <File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" KeyPath="no" />
-              <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
-            </Component>
-            <!-- DD Bibliotheken -->
-            <Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
-              <File Id="OfficeLib" 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" />
-              <File Id="Microsoft.Office.Interop.Word" Name="Microsoft.Office.Interop.Word.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Word\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Word.dll" KeyPath="no" />
-            </Component>
-
-            <!-- MAIL.NET Bibliothek -->
-            <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-              <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="Independentsoft.Msg.dll" KeyPath="yes" />
-            </Component>
-            <!-- MAIL.NET Bibliothek -->
-            <Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
-              <File Id="ERPConnect45" Name="ERPConnect45.dll" Source="ERPConnect45.dll" KeyPath="yes" />
-            </Component>
-
-            <!-- DEVEXPRESS Bibliotheken -->
-            <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-              <File Id="DevExpress.Data.v19.2" Name="DevExpress.Data.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Data.v19.2.dll" KeyPath="yes" />
-              <File Id="DevExpress.Office.v19.2.Core" Name="DevExpress.Office.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Office.v19.2.Core.dll" />
-              <File Id="DevExpress.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Printing.v19.2.Core.dll" />
-              <File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.RichEdit.v19.2.Core.dll" />
-              <File Id="DevExpress.Utils.v19.2" Name="DevExpress.Utils.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Utils.v19.2.dll" />
-              <File Id="DevExpress.XtraBars.v19.2" Name="DevExpress.XtraBars.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraBars.v19.2.dll" />
-              <File Id="DevExpress.XtraEditors.v19.2" Name="DevExpress.XtraEditors.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraEditors.v19.2.dll" />
-              <File Id="DevExpress.XtraGrid.v19.2" Name="DevExpress.XtraGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraGrid.v19.2.dll" />
-              <File Id="DevExpress.XtraLayout.v19.2" Name="DevExpress.XtraLayout.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraLayout.v19.2.dll" />
-              <File Id="DevExpress.XtraNavBar.v19.2" Name="DevExpress.XtraNavBar.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraNavBar.v19.2.dll" />
-              <File Id="DevExpress.XtraPrinting.v19.2" Name="DevExpress.XtraPrinting.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPrinting.v19.2.dll" />
-              <!--<File Id="DevExpress.XtraRichEdit.v19.2" Name="DevExpress.XtraRichEdit.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraRichEdit.v19.2.dll" />-->
-              <File Id="DevExpress.XtraScheduler.v19.2" Name="DevExpress.XtraScheduler.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraScheduler.v19.2.dll" />
-              <File Id="DevExpress.XtraScheduler.v19.2.Core" Name="DevExpress.XtraScheduler.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraScheduler.v19.2.Core.dll" />
-              <File Id="DevExpress.XtraScheduler.v19.2.Extensions" Name="DevExpress.XtraScheduler.v19.2.Extensions.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraScheduler.v19.2.Extensions.dll" />
-              <File Id="DevExpress.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraTreeList.v19.2.dll" />
-              <File Id="DevExpress.XtraVerticalGrid.v19.2" Name="DevExpress.XtraVerticalGrid.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraVerticalGrid.v19.2.dll" />
-              <File Id="DevExpress.XtraWizard.v19.2" Name="DevExpress.XtraWizard.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraWizard.v19.2.dll" />
-              <File Id="DevExpress.Pdf.v19.2.Core" Name="DevExpress.Pdf.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Pdf.v19.2.Core.dll" />
-              <File Id="DevExpress.Pdf.v19.2.Drwawing" Name="DevExpress.Pdf.v19.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Pdf.v19.2.Drawing.dll" />
-              <File Id="DevExpress.XtraPdfViewer.v19.2" Name="DevExpress.XtraPdfViewer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraPdfViewer.v19.2.dll" />
-              <File Id="DevExpress.Sparkline.v19.2" Name="DevExpress.Sparkline.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Sparkline.v19.2.Core.dll" />
-              <!--<File Id="DevExpress.Charts.Designer.v19.2_" Name="DevExpress.Charts.Designer.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Charts.Designer.v19.2.dll" />-->
-              <File Id="DevExpress.Charts.v19.2.Core_" Name="DevExpress.Charts.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Charts.v19.2.Core.dll" />
-              <File Id="DevExpress.XtraCharts.v19.2_" Name="DevExpress.XtraCharts.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.dll" />
-              <File Id="DevExpress.XtraCharts.v19.2.Extensions_" Name="DevExpress.XtraCharts.v19.2.Extensions.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.Extensions.dll" />
-              <File Id="DevExpress.XtraCharts.v19.2.UI_" Name="DevExpress.XtraCharts.v19.2.UI.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.UI.dll" />
-              <File Id="DevExpress.XtraDiagram.v19.2_" Name="DevExpress.XtraDiagram.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraDiagram.v19.2.dll" />
-              <File Id="DevExpress.XtraCharts.Wizard" Name="DevExpress.XtraCharts.v19.2.Wizard.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraCharts.v19.2.Wizard.dll" />
-              <File Id="DevExpress.XtraMap.v19.2" Name="DevExpress.XtraMap.v19.2.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.XtraMap.v19.2.dll" />
-              <File Id="DevExpress.Map.v19.2.Core" Name="DevExpress.Map.v19.2.Core.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\devExpress.Map.v19.2.Core.dll" />
-            </Component>
-
-            <!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
-            <Directory Id="LOCALE_DE" Name="de">
-              <Component Id="RecordOrganizer.Locales.de" Guid="C9476586-46A4-450A-88F4-BE416B7AD21C">
-                <File Id="DDRecordOrganizer.resource.de" Name="DD-Record-Organizer.resources.dll" Source="de\DD-Record-Organizer.resources.dll"></File>
-              </Component>
-
-              <Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
-                <File Id="DevExpress.XtraScheduler.v19.2.Core.resources" Name="DevExpress.XtraScheduler.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Core.resources.dll"></File>
-                <File Id="DevExpress.XtraScheduler.v19.2.Extensions.resources" Name="DevExpress.XtraScheduler.v19.2.Extensions.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Extensions.resources.dll"></File>
-                <File Id="DevExpress.XtraScheduler.v19.2.resources" Name="DevExpress.XtraScheduler.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.resources.dll"></File>
-                <File Id="DevExpress.Data.v19.2.resources" Name="DevExpress.Data.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Data.v19.2.resources.dll"></File>
-                <File Id="DevExpress.Office.v19.2.Core.resources" Name="DevExpress.Office.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Office.v19.2.Core.resources.dll"></File>
-                <File Id="DevExpress.Printing.v19.2.Core.resources" Name="DevExpress.Printing.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraScheduler.v19.2.Reporting.resources.dll"></File>
-                <File Id="DevExpress.RichEdit.v19.2.Core.resources" Name="DevExpress.RichEdit.v19.2.Core.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.RichEdit.v19.2.Core.resources.dll"></File>
-                <File Id="DevExpress.Utils.v19.2.resources" Name="DevExpress.Utils.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Utils.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraBars.v19.2.resources" Name="DevExpress.XtraBars.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraBars.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraEditors.v19.2.resources" Name="DevExpress.XtraEditors.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraEditors.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraGrid.v19.2.resources" Name="DevExpress.XtraGrid.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraGrid.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraLayout.v19.2.resources" Name="DevExpress.XtraLayout.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraLayout.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraNavBar.v19.2.resources" Name="DevExpress.XtraNavBar.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraNavBar.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraPrinting.v19.2.resources" Name="DevExpress.XtraPrinting.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraPrinting.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraRichEdit.v19.2.resources" Name="DevExpress.XtraRichEdit.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraRichEdit.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraTreeList.v19.2.resources" Name="DevExpress.XtraTreeList.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraTreeList.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraVerticalGrid.v19.2.resources" Name="DevExpress.XtraVerticalGrid.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraVerticalGrid.v19.2.resources.dll"></File>
-                <File Id="DevExpress.XtraWizard.v19.2.resources" Name="DevExpress.XtraWizard.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraWizard.v19.2.resources.dll"></File>
-                <File Id="DevExpress.Charts.Designer.v19.2.resources" Name="DevExpress.Charts.Designer.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.Charts.Designer.v19.2.resources.dll" />
-                <File Id="DevExpress.XtraCharts.v19.2.resources" Name="DevExpress.XtraCharts.v19.2.resources.dll" Source="D:\ProgramFiles\DevExpress 19.2\Components\Bin\Framework\de\DevExpress.XtraCharts.v19.2.resources.dll" />
-              </Component>
-            </Directory>
-
-            <Directory Id="LOCALE_EN_GB" Name="en-GB">
-              <Component Id="RecordOrganizer.Locales.en_gb" Guid="7FAA9173-9012-4EBB-A408-04AB25D3C9DF">
-                <File Id="DDRecordOrganizer.resource.en_gb" Name="DD-Record-Organizer.resources.dll" Source="en-GB\DD-Record-Organizer.resources.dll"></File>
-              </Component>
-            </Directory>
-
-            <Directory Id="LOCALE_EN_US" Name="en-US">
-              <Component Id="RecordOrganizer.Locales.en_us" Guid="AC6E160E-8FDE-41F4-98FD-41FD668AF320">
-                <File Id="DDRecordOrganizer.resource.en_us" Name="DD-Record-Organizer.resources.dll" Source="en-US\DD-Record-Organizer.resources.dll"></File>
-              </Component>
+              <Directory Id="RIGHTMANAGERDIR" Name="RightManager" />
+              <Directory Id="VERSIONCHECKERDIR" Name="VERSION_CHECKER" />
             </Directory>
           </Directory>
         </Directory>
       </Directory>
 
-      <!-- Startmenü Ordner -->
-      <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="Record Organizer">
-          <Component Id="ProgramMenuDir" Guid="5200DF59-FED6-4C5A-8393-90B8ED526432">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-
-            <RegistryKey Root="HKCU" Key="Software">
-
-              <RegistryKey Key="[Manufacturer]">
-                <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
-                  <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
-                </RegistryKey>
-              </RegistryKey>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+      </Directory>
 
-              <RegistryKey Key="Classes">
-                <RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
-                  <RegistryValue Type="string" Name="URL Protocol" Value="" />
-                  <RegistryValue Key="DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe,0&quot;" />
-                  <RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe&quot; --data %1" />
-                </RegistryKey>
-              </RegistryKey>
+      <Directory Id="DesktopFolder" />
+    </Directory>
 
+    <DirectoryRef Id="VERSIONCHECKERDIR">
+
+      <Component Id="RecordOrganizer_VersionChecker" Guid="37D17685-E588-4BC6-A15E-570DE749852A">
+        <File Id="VERSION_CHECKER.exe" Name="VERSION_CHECKER.exe">
+          <Shortcut Id="ApplicationStartMenuShortcut_StartMenu_Update" Directory="ProgramMenuFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="ApplicationStartMenuShortcut_Desktop_Update" Directory="DesktopFolder" Name="ADDI-RecordOrganizer" WorkingDirectory="INSTALLDIR" Icon="DDRecordOrganizer.exe" IconIndex="0" Advertise="yes" />
+        </File>
+        <File Id="DD_LIB_Standards.dll" Name="DD_LIB_Standards.dll" Source="DD_LIB_Standards.dll" />
+      </Component>
+
+    </DirectoryRef>
+
+    <DirectoryRef Id="RIGHTMANAGERDIR">
+      <Component Id="RecordOrganizer_RightManager" Guid="BD73A9BB-89FD-4F4C-85B8-F31C97296745">
+        <File Id="RecordOrganizer_RightManager.exe" Name="RecordOrganizer_RightManager.exe" KeyPath="yes" />
+        <File Id="DD_Rights.dll" Name="DD_Rights.dll" />
+        <File Id="Interop.WINDREAMLib.dll" Name="Interop.WINDREAMLib.dll" />
+      </Component>
+
+      <!-- DEVEXPRESS Bibliotheken for RightsManager -->
+      <Component Id="DevExpressLibs_RightsManager" Guid="739740F2-1576-4416-8E3E-748F65358B65">
+        <File Id="DevExpress.Data.v19.2_" Name="DevExpress.Data.v19.2.dll"  KeyPath="yes" />
+        <File Id="DevExpress.Sparkline.v19.2_" Name="DevExpress.Sparkline.v19.2.Core.dll"  />
+        <File Id="DevExpress.Printing.v19.2.Core_" Name="DevExpress.Printing.v19.2.Core.dll"  />
+        <File Id="DevExpress.Utils.v19.2_" Name="DevExpress.Utils.v19.2.dll"  />
+        <File Id="DevExpress.XtraEditors.v19.2_" Name="DevExpress.XtraEditors.v19.2.dll"  />
+        <File Id="DevExpress.XtraGrid.v19.2_" Name="DevExpress.XtraGrid.v19.2.dll"  />
+        <File Id="DevExpress.XtraLayout.v19.2_" Name="DevExpress.XtraLayout.v19.2.dll"  />
+        <File Id="DevExpress.XtraPrinting.v19.2_" Name="DevExpress.XtraPrinting.v19.2.dll"  />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="INSTALLDIR">
+      <!-- Die DD-Record-Organizer.exe und Shortcuts für Desktop und Startmenü -->
+      <Component Id="MainExecutable" Guid="9CC5D446-F056-4A09-995D-9DF53A7F0E38">
+        <File Id="PMOEXE" Name="DD-Record-Organizer.exe" Source="DD-Record-Organizer.exe" KeyPath="yes" />
+        <!-- Programmordner bei Deinstallation entfernen-->
+        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      </Component>
+
+      <Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}">
+        <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 Key="Classes">
+            <RegistryKey Key="pmo" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYCUSTOMURLHANDLER">
+              <RegistryValue Type="string" Name="URL Protocol" Value="" />
+              <RegistryValue Key="DefaultIcon" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe,0&quot;" />
+              <RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]DD-Record-Organizer.exe&quot; --data %1" />
             </RegistryKey>
-
-          </Component>
-        </Directory>
+          </RegistryKey>
+        </RegistryKey>
+      </Component>
+
+      <Component Id="Docu" Guid="D6FAF95B-3CF0-4504-B18B-E1181E92DC91">
+        <File Id="releaseNote.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD - RECORD ORGANIZER\ChangeLog.txt" KeyPath="yes"/>
+      </Component>
+
+      <!-- WINDREAM Bibliotheken -->
+      <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
+        <File Id="INDEXLibDLL" Name="AxInterop.INDEXLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.INDEXLib.dll" KeyPath="yes" />
+        <File Id="AxOBJECTLISTCONTROLLibDLL" Name="AxInterop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\AxInterop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
+        <File Id="OBJECTLISTCONTROLLibDLL" Name="Interop.OBJECTLISTCONTROLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.OBJECTLISTCONTROLLib.dll" KeyPath="no" />
+        <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WINDREAMLib.dll" KeyPath="no" />
+        <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOTOOLLib.dll" KeyPath="no" />
+        <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOBRWSLib.dll" KeyPath="no" />
+        <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="..\..\..\..\..\DD3rdPartyLibs\Windream\Interop.WMOSRCHLib.dll" KeyPath="no" />
+      </Component>
+
+      <!-- Oracle-Bibliothek -->
+      <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
+        <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
+      </Component>
+
+      <!-- Commandline Bibliothek -->
+      <Component Id="Commandline" Guid="53F9734C-F020-4885-96DC-D8CD880E8446">
+        <File Id="Commandline" Name="Commandline.dll"  KeyPath="yes" />
+      </Component>
+
+      <!-- DD Bibliotheken -->
+      <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
+        <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll"  KeyPath="no" />
+        <File Id="DD_Rights" Name="DD_Rights.dll"  KeyPath="no" />
+        <File Id="DD_LIB_Standards" Name="DD_LIB_Standards.dll"  KeyPath="no" />
+        <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll"  KeyPath="no" Checksum="yes"/>
+      </Component>
+      <!-- DD Bibliotheken -->
+      <Component Id="BasicLibs" Guid="37238CB0-6DC3-4B1B-9438-52FA7D478897">
+        <File Id="OfficeLib" 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" />
+        <File Id="Microsoft.Office.Interop.Word" Name="Microsoft.Office.Interop.Word.dll" Source="C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Word\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Word.dll" KeyPath="no" />
+      </Component>
+
+      <!-- MAIL.NET Bibliothek -->
+      <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
+        <File Id="MSGLib" Name="Independentsoft.Msg.dll"  KeyPath="yes" />
+      </Component>
+      <!-- MAIL.NET Bibliothek -->
+      <Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
+        <File Id="ERPConnect45" Name="ERPConnect45.dll"  KeyPath="yes" />
+      </Component>
+
+      <!-- Logging -->
+      <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
+        <File Id="NLog" Name="NLog.dll"  KeyPath="yes" Checksum="yes"/>
+      </Component>
+
+      <!-- DEVEXPRESS Bibliotheken -->
+      <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
+        <File Id="DevExpress.Data.v19.2" Name="DevExpress.Data.v19.2.dll"  KeyPath="yes" />
+        <File Id="DevExpress.Office.v19.2.Core" Name="DevExpress.Office.v19.2.Core.dll"  />
+        <File Id="DevExpress.Printing.v19.2.Core" Name="DevExpress.Printing.v19.2.Core.dll"  />
+        <File Id="DevExpress.RichEdit.v19.2.Core" Name="DevExpress.RichEdit.v19.2.Core.dll"  />
+        <File Id="DevExpress.Utils.v19.2" Name="DevExpress.Utils.v19.2.dll"  />
+        <File Id="DevExpress.XtraBars.v19.2" Name="DevExpress.XtraBars.v19.2.dll"  />
+        <File Id="DevExpress.XtraEditors.v19.2" Name="DevExpress.XtraEditors.v19.2.dll"  />
+        <File Id="DevExpress.XtraGrid.v19.2" Name="DevExpress.XtraGrid.v19.2.dll"  />
+        <File Id="DevExpress.XtraLayout.v19.2" Name="DevExpress.XtraLayout.v19.2.dll"  />
+        <File Id="DevExpress.XtraNavBar.v19.2" Name="DevExpress.XtraNavBar.v19.2.dll"  />
+        <File Id="DevExpress.XtraPrinting.v19.2" Name="DevExpress.XtraPrinting.v19.2.dll"  />
+        <File Id="DevExpress.XtraScheduler.v19.2" Name="DevExpress.XtraScheduler.v19.2.dll"  />
+        <File Id="DevExpress.XtraScheduler.v19.2.Core" Name="DevExpress.XtraScheduler.v19.2.Core.dll"  />
+        <File Id="DevExpress.XtraScheduler.v19.2.Extensions" Name="DevExpress.XtraScheduler.v19.2.Extensions.dll"  />
+        <File Id="DevExpress.XtraTreeList.v19.2" Name="DevExpress.XtraTreeList.v19.2.dll"  />
+        <File Id="DevExpress.XtraVerticalGrid.v19.2" Name="DevExpress.XtraVerticalGrid.v19.2.dll"  />
+        <File Id="DevExpress.XtraWizard.v19.2" Name="DevExpress.XtraWizard.v19.2.dll"  />
+        <File Id="DevExpress.Pdf.v19.2.Core" Name="DevExpress.Pdf.v19.2.Core.dll"  />
+        <File Id="DevExpress.Pdf.v19.2.Drwawing" Name="DevExpress.Pdf.v19.2.Drawing.dll"  />
+        <File Id="DevExpress.XtraPdfViewer.v19.2" Name="DevExpress.XtraPdfViewer.v19.2.dll"  />
+        <File Id="DevExpress.Sparkline.v19.2" Name="DevExpress.Sparkline.v19.2.Core.dll"  />
+        <File Id="DevExpress.Charts.v19.2.Core_" Name="DevExpress.Charts.v19.2.Core.dll"  />
+        <File Id="DevExpress.XtraCharts.v19.2_" Name="DevExpress.XtraCharts.v19.2.dll"  />
+        <File Id="DevExpress.XtraCharts.v19.2.Extensions_" Name="DevExpress.XtraCharts.v19.2.Extensions.dll"  />
+        <File Id="DevExpress.XtraCharts.v19.2.UI_" Name="DevExpress.XtraCharts.v19.2.UI.dll"  />
+        <File Id="DevExpress.XtraDiagram.v19.2_" Name="DevExpress.XtraDiagram.v19.2.dll"  />
+        <File Id="DevExpress.XtraCharts.Wizard" Name="DevExpress.XtraCharts.v19.2.Wizard.dll"  />
+        <File Id="DevExpress.XtraMap.v19.2" Name="DevExpress.XtraMap.v19.2.dll"  />
+        <File Id="DevExpress.Map.v19.2.Core" Name="DevExpress.Map.v19.2.Core.dll"  />
+      </Component>
+
+      <!-- Lokalisierung für DEVEXPRESS Bibliotheken-->
+      <Directory Id="LOCALE_DE" Name="de">
+        <Component Id="RecordOrganizer.Locales.de" Guid="C9476586-46A4-450A-88F4-BE416B7AD21C">
+          <File Id="DDRecordOrganizer.resource.de" Name="DD-Record-Organizer.resources.dll" Source="de\DD-Record-Organizer.resources.dll"></File>
+        </Component>
+
+        <Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
+          <File Id="DevExpress.XtraScheduler.v19.2.Core.resources" Name="DevExpress.XtraScheduler.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.XtraScheduler.v19.2.Extensions.resources" Name="DevExpress.XtraScheduler.v19.2.Extensions.resources.dll" ></File>
+          <File Id="DevExpress.XtraScheduler.v19.2.resources" Name="DevExpress.XtraScheduler.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.Data.v19.2.resources" Name="DevExpress.Data.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.Office.v19.2.Core.resources" Name="DevExpress.Office.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.Printing.v19.2.Core.resources" Name="DevExpress.Printing.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.RichEdit.v19.2.Core.resources" Name="DevExpress.RichEdit.v19.2.Core.resources.dll" ></File>
+          <File Id="DevExpress.Utils.v19.2.resources" Name="DevExpress.Utils.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraBars.v19.2.resources" Name="DevExpress.XtraBars.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraEditors.v19.2.resources" Name="DevExpress.XtraEditors.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraGrid.v19.2.resources" Name="DevExpress.XtraGrid.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraLayout.v19.2.resources" Name="DevExpress.XtraLayout.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraNavBar.v19.2.resources" Name="DevExpress.XtraNavBar.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraPrinting.v19.2.resources" Name="DevExpress.XtraPrinting.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraRichEdit.v19.2.resources" Name="DevExpress.XtraRichEdit.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraTreeList.v19.2.resources" Name="DevExpress.XtraTreeList.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraVerticalGrid.v19.2.resources" Name="DevExpress.XtraVerticalGrid.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraWizard.v19.2.resources" Name="DevExpress.XtraWizard.v19.2.resources.dll" ></File>
+          <File Id="DevExpress.XtraCharts.v19.2.resources" Name="DevExpress.XtraCharts.v19.2.resources.dll"  />
+        </Component>
       </Directory>
 
-      <!-- Desktop Ordner -->
-      <Directory Id="DesktopFolder" Name="Desktop" />
-    </Directory>
+      <Directory Id="LOCALE_EN_GB" Name="en-GB">
+        <Component Id="RecordOrganizer.Locales.en_gb" Guid="7FAA9173-9012-4EBB-A408-04AB25D3C9DF">
+          <File Id="DDRecordOrganizer.resource.en_gb" Name="DD-Record-Organizer.resources.dll" Source="en-GB\DD-Record-Organizer.resources.dll"></File>
+        </Component>
+      </Directory>
 
+      <Directory Id="LOCALE_EN_US" Name="en-US">
+        <Component Id="RecordOrganizer.Locales.en_us" Guid="AC6E160E-8FDE-41F4-98FD-41FD668AF320">
+          <File Id="DDRecordOrganizer.resource.en_us" Name="DD-Record-Organizer.resources.dll" Source="en-US\DD-Record-Organizer.resources.dll"></File>
+        </Component>
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="ApplicationShortcut_StartMenu" Guid="508a08d6-73fc-43d4-8861-b432ba92e44e">
+        <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="89ff1c33-08f7-4270-a858-2d6c7cbf9ba1">
+        <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>
+    
     <!-- Installierte Features -->
-    <Feature Id="Complete" Level="1">
+    <Feature Id="Complete" Title="$(var.ProductName)" Level="1">
       <ComponentRef Id="MainExecutable" />
       <ComponentRef Id="WindreamLibs" />
       <ComponentRef Id="Docu" />
@@ -291,33 +286,54 @@
       <ComponentRef Id="DevExpressLibs" />
       <ComponentRef Id="DevExpressLibs_RightsManager" />
       <ComponentRef Id="BasicLibs" />
-      <ComponentRef Id="ProgramMenuDir"/>
-      <!--<ComponentRef Id="RegistryEntries"/>-->
+      <ComponentRef Id="RegistryKeys"/>
       <ComponentRef Id="Oracle" />
       <ComponentRef Id="Commandline" />
       <ComponentRef Id="ERPConnectLibs" />
+      <ComponentRef Id="ApplicationShortcut_Desktop" />
+      <ComponentRef Id="ApplicationShortcut_StartMenu" />
       <ComponentRef Id="RecordOrganizer_RightManager"/>
       <ComponentRef Id="NLog"/>
-      <!--<ComponentRef Id="RecordOrganizer_VersionChecker" />-->
+    </Feature>
+
+    <Feature Id="Update_Checker" Title="UpdateChecker" Level="0">
+      <ComponentRef Id="RecordOrganizer_VersionChecker" />
     </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"
-               Event="NewDialog"
-               Value="InstallDirDlg"
-               Order="2">1</Publish>
+            Control="Next"
+            Event="NewDialog"
+            Value="InstallDirDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            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="Back"
-               Event="NewDialog"
-               Value="WelcomeDlg"
-               Order="2">1</Publish>
+            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>
diff --git a/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj b/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj
index e555dd3..d4aff50 100644
--- a/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj
+++ b/app/Setup_NoUpdaterVS19/Setup_NoUpdaterVS19.wixproj
@@ -37,6 +37,9 @@
       <Name>WixUIExtension</Name>
     </WixExtension>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Config.wxi" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">