From d1abc2bb1b8dbc81f32b67716ba5cbf273d28e2e Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Thu, 3 Aug 2023 09:03:39 +0200
Subject: [PATCH] update installer

---
 app/Setup_NoUpdaterVS19/Config.wxi  |   6 +-
 app/Setup_NoUpdaterVS19/Product.wxs | 665 ++++++++++++++--------------
 2 files changed, 340 insertions(+), 331 deletions(-)

diff --git a/app/Setup_NoUpdaterVS19/Config.wxi b/app/Setup_NoUpdaterVS19/Config.wxi
index 0b80a76..bb09a59 100644
--- a/app/Setup_NoUpdaterVS19/Config.wxi
+++ b/app/Setup_NoUpdaterVS19/Config.wxi
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
   <?define ProgramName="DD-Record-Organizer"?>
-  <?define ProductName="Record Organizer"?>
+  <?define ProductName="OrgFlow"?>
   <?define Manufacturer="Digital Data"?>
-  <?define Description="Record Organizer"?>
-  <?define Comments="Record Organizer"?>
+  <?define Description="OrgFlow"?>
+  <?define Comments="OrgFlow"?>
   <?define UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}"?>
 
   <?define SourceDir="..\$(var.ProgramName)\bin\$(var.Configuration)\"?>
diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs
index bd6c296..457a9ed 100644
--- a/app/Setup_NoUpdaterVS19/Product.wxs
+++ b/app/Setup_NoUpdaterVS19/Product.wxs
@@ -1,337 +1,346 @@
 <?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="$(var.Description)"
-      Comments="$(var.Comments)"
-      Manufacturer="$(var.Manufacturer)"
-      InstallerVersion="100"
-      Languages="1031"
-      Compressed="yes"
-      SummaryCodepage="1252"
-      InstallScope="perMachine"
+	<Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+		<Package
+		  Id="*"
+		  Keywords="Installer"
+		  Description="$(var.Description)"
+		  Comments="$(var.Comments)"
+		  Manufacturer="$(var.Manufacturer)"
+		  InstallerVersion="100"
+		  Languages="1031"
+		  Compressed="yes"
+		  SummaryCodepage="1252"
+		  InstallScope="perMachine"
     />
 
-    <Media Id='1' Cabinet='RecordOrganizer.cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
-    <Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
+		<Media Id='1' Cabinet='RecordOrganizer.cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
+		<Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
 
-    <MajorUpgrade
-      AllowDowngrades="no"
-      AllowSameVersionUpgrades="no"
-      DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
+		<MajorUpgrade
+		  AllowDowngrades="no"
+		  AllowSameVersionUpgrades="no"
+		  DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
     />
 
-    <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="$(var.UpgradeCode)">
-      <UpgradeVersion
-        Minimum="1.0.0.0" Maximum="99.0.0.0"
-        Property="PREVIOUSVERSIONSINSTALLED"
-        IncludeMinimum="yes" IncludeMaximum="no" />
-    </Upgrade>
-
-    <!-- Legt das Icon fest -->
-    <Icon Id="DDRecordOrganizer.exe" SourceFile="OrgFlow.exe" />
-
-    <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
-    <Property Id="ARPPRODUCTICON" Value="DDRecordOrganizer.exe" />
-
-    <!-- Liest den Installationsort über die Registry aus -->
-    <Property Id="INSTALLDIR">
-      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
-    </Property>
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <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" />
-              <Directory Id="VERSIONCHECKERDIR" Name="VERSION_CHECKER" />
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
-      </Directory>
-
-      <Directory Id="DesktopFolder" />
-    </Directory>
-
-    <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.v21.2_" Name="DevExpress.Data.v21.2.dll"  KeyPath="yes" />
-        <File Id="DevExpress.Sparkline.v21.2_" Name="DevExpress.Sparkline.v21.2.Core.dll"  />
-        <File Id="DevExpress.Printing.v21.2.Core_" Name="DevExpress.Printing.v21.2.Core.dll"  />
-        <File Id="DevExpress.Utils.v21.2_" Name="DevExpress.Utils.v21.2.dll"  />
-        <File Id="DevExpress.XtraEditors.v21.2_" Name="DevExpress.XtraEditors.v21.2.dll"  />
-        <File Id="DevExpress.XtraGrid.v21.2_" Name="DevExpress.XtraGrid.v21.2.dll"  />
-        <File Id="DevExpress.XtraLayout.v21.2_" Name="DevExpress.XtraLayout.v21.2.dll"  />
-        <File Id="DevExpress.XtraPrinting.v21.2_" Name="DevExpress.XtraPrinting.v21.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="OrgFlow.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>
-          </RegistryKey>
-        </RegistryKey>
-      </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="ERPConnect35" Name="ERPConnect35.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.Charts.v21.2.Core" Name="DevExpress.Charts.v21.2.Core.dll" KeyPath="yes" />
-        <File Id="DevExpress.CodeParser.v21.2" Name="DevExpress.CodeParser.v21.2.dll"  />
-        <File Id="DevExpress.Data.v21.2" Name="DevExpress.Data.v21.2.dll" />
-        <File Id="DevExpress.Data.Desktop.v21.2" Name="DevExpress.Data.Desktop.v21.2.dll" />
-        <File Id="DevExpress.DataAccess.v21.2" Name="DevExpress.DataAccess.v21.2.dll" />
-		<File Id="DevExpress.DataAccess.v21.2.UI" Name="DevExpress.DataAccess.v21.2.UI.dll" />
-        <File Id="DevExpress.DataVisualization.v21.2.Core" Name="DevExpress.DataVisualization.v21.2.Core.dll" />
-        <File Id="DevExpress.Diagram.v21.2.Core" Name="DevExpress.Diagram.v21.2.Core.dll" />
-        <File Id="DevExpress.Images.v21.2" Name="DevExpress.Images.v21.2.dll" />
-        <File Id="DevExpress.Map.v21.2.Core" Name="DevExpress.Map.v21.2.Core.dll" />
-        <File Id="DevExpress.Office.v21.2.Core" Name="DevExpress.Office.v21.2.Core.dll" />
-        <File Id="DevExpress.Pdf.v21.2.Core" Name="DevExpress.Pdf.v21.2.Core.dll" />
-        <File Id="DevExpress.Pdf.v21.2.Drawing" Name="DevExpress.Pdf.v21.2.Drawing.dll" />
-        <File Id="DevExpress.PivotGrid.v21.2.Core" Name="DevExpress.PivotGrid.v21.2.Core.dll" />
-        <File Id="DevExpress.Printing.v21.2.Core" Name="DevExpress.Printing.v21.2.Core.dll" />
-        <File Id="DevExpress.RichEdit.v21.2.Core" Name="DevExpress.RichEdit.v21.2.Core.dll" />
-        <File Id="DevExpress.RichEdit.v21.2.Export" Name="DevExpress.RichEdit.v21.2.Export.dll" />
-        <File Id="DevExpress.Sparkline.v21.2.Core" Name="DevExpress.Sparkline.v21.2.Core.dll" />
-        <File Id="DevExpress.SpellChecker.v21.2.Core" Name="DevExpress.SpellChecker.v21.2.Core.dll" />
-        <File Id="DevExpress.Utils.v21.2" Name="DevExpress.Utils.v21.2.dll" />
-        <File Id="DevExpress.Xpo.v21.2" Name="DevExpress.Xpo.v21.2.dll" />
-        <File Id="DevExpress.XtraBars.v21.2" Name="DevExpress.XtraBars.v21.2.dll" />
-        <File Id="DevExpress.XtraCharts.v21.2" Name="DevExpress.XtraCharts.v21.2.dll" />
-        <File Id="DevExpress.XtraCharts.v21.2.Extensions_" Name="DevExpress.XtraCharts.v21.2.Extensions.dll"  />
-        <File Id="DevExpress.XtraCharts.v21.2.UI" Name="DevExpress.XtraCharts.v21.2.UI.dll"  />
-        <File Id="DevExpress.XtraCharts.Wizard.v21.2" Name="DevExpress.XtraCharts.v21.2.Wizard.dll"  />
-        <File Id="DevExpress.XtraDiagram.v21.2" Name="DevExpress.XtraDiagram.v21.2.dll"  />
-        <File Id="DevExpress.XtraEditors.v21.2" Name="DevExpress.XtraEditors.v21.2.dll"  />
-        <File Id="DevExpress.XtraGauges.v21.2.Core" Name="DevExpress.XtraGauges.v21.2.Core.dll"  />
-        <File Id="DevExpress.XtraGrid.v21.2" Name="DevExpress.XtraGrid.v21.2.dll"  />
-        <File Id="DevExpress.XtraLayout.v21.2" Name="DevExpress.XtraLayout.v21.2.dll"  />
-        <File Id="DevExpress.XtraMap.v21.2" Name="DevExpress.XtraMap.v21.2.dll"  />
-        <File Id="DevExpress.XtraNavBar.v21.2" Name="DevExpress.XtraNavBar.v21.2.dll"  />
-        <File Id="DevExpress.XtraPdfViewer.v21.2" Name="DevExpress.XtraPdfViewer.v21.2.dll"  />
-        <File Id="DevExpress.XtraPivotGrid.v21.2" Name="DevExpress.XtraPivotGrid.v21.2.dll"  />
-        <File Id="DevExpress.XtraPrinting.v21.2" Name="DevExpress.XtraPrinting.v21.2.dll"  />
-        <File Id="DevExpress.XtraReports.v21.2" Name="DevExpress.XtraReports.v21.2.dll"  />
-        <File Id="DevExpress.XtraReports.v21.2.Extensions" Name="DevExpress.XtraReports.v21.2.Extensions.dll"  />
-        <File Id="DevExpress.XtraRichEdit.v21.2" Name="DevExpress.XtraRichEdit.v21.2.dll"  />
-        <File Id="DevExpress.XtraScheduler.v21.2" Name="DevExpress.XtraScheduler.v21.2.dll"  />
-        <File Id="DevExpress.XtraScheduler.v21.2.Core" Name="DevExpress.XtraScheduler.v21.2.Core.dll"  />
-        <File Id="DevExpress.XtraScheduler.v21.2.Core.Desktop" Name="DevExpress.XtraScheduler.v21.2.Core.Desktop.dll"  />
-        <File Id="DevExpress.XtraScheduler.v21.2.Extensions" Name="DevExpress.XtraScheduler.v21.2.Extensions.dll"  />
-        <File Id="DevExpress.XtraScheduler.v21.2.Reporting" Name="DevExpress.XtraScheduler.v21.2.Reporting.dll"  />
-        <File Id="DevExpress.XtraScheduler.v21.2.Reporting.Extensions" Name="DevExpress.XtraScheduler.v21.2.Reporting.Extensions.dll"  />
-        <File Id="DevExpress.XtraSpellChecker.v21.2" Name="DevExpress.XtraSpellChecker.v21.2.dll"  />
-        <File Id="DevExpress.XtraTreeList.v21.2" Name="DevExpress.XtraTreeList.v21.2.dll"  />
-        <File Id="DevExpress.XtraVerticalGrid.v21.2" Name="DevExpress.XtraVerticalGrid.v21.2.dll"  />
-        <File Id="DevExpress.XtraWizard.v21.2" Name="DevExpress.XtraWizard.v21.2.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="OrgFlow.resources.dll" Source="de\OrgFlow.resources.dll"></File>
-        </Component>
-
-        <Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
-          <File Id="DevExpress.XtraScheduler.v21.2.Core.resources" Name="DevExpress.XtraScheduler.v21.2.Core.resources.dll" ></File>
-          <File Id="DevExpress.XtraScheduler.v21.2.Extensions.resources" Name="DevExpress.XtraScheduler.v21.2.Extensions.resources.dll" ></File>
-          <File Id="DevExpress.XtraScheduler.v21.2.resources" Name="DevExpress.XtraScheduler.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.Data.v21.2.resources" Name="DevExpress.Data.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.Office.v21.2.Core.resources" Name="DevExpress.Office.v21.2.Core.resources.dll" ></File>
-          <File Id="DevExpress.Printing.v21.2.Core.resources" Name="DevExpress.Printing.v21.2.Core.resources.dll" ></File>
-          <File Id="DevExpress.RichEdit.v21.2.Core.resources" Name="DevExpress.RichEdit.v21.2.Core.resources.dll" ></File>
-          <File Id="DevExpress.Utils.v21.2.resources" Name="DevExpress.Utils.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraBars.v21.2.resources" Name="DevExpress.XtraBars.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraEditors.v21.2.resources" Name="DevExpress.XtraEditors.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraGrid.v21.2.resources" Name="DevExpress.XtraGrid.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraLayout.v21.2.resources" Name="DevExpress.XtraLayout.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraNavBar.v21.2.resources" Name="DevExpress.XtraNavBar.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraPrinting.v21.2.resources" Name="DevExpress.XtraPrinting.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraRichEdit.v21.2.resources" Name="DevExpress.XtraRichEdit.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraTreeList.v21.2.resources" Name="DevExpress.XtraTreeList.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraVerticalGrid.v21.2.resources" Name="DevExpress.XtraVerticalGrid.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraWizard.v21.2.resources" Name="DevExpress.XtraWizard.v21.2.resources.dll" ></File>
-          <File Id="DevExpress.XtraCharts.v21.2.resources" Name="DevExpress.XtraCharts.v21.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\OrgFlow.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\OrgFlow.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" Title="$(var.ProductName)" Level="1">
-      <ComponentRef Id="MainExecutable" />
-      <ComponentRef Id="WindreamLibs" />
-      <ComponentRef Id="DDLibs" />
-      <ComponentRef Id="IndependentsoftLibs" />
-      <ComponentRef Id="Scheduler.Locales" />
-      <ComponentRef Id="RecordOrganizer.Locales.de" />
-      <ComponentRef Id="RecordOrganizer.Locales.en_gb" />
-      <ComponentRef Id="RecordOrganizer.Locales.en_us" />
-      <ComponentRef Id="DevExpressLibs" />
-      <ComponentRef Id="DevExpressLibs_RightsManager" />
-      <ComponentRef Id="BasicLibs" />
-      <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"/>
-    </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_FeatureTree"/>
-      <UIRef Id="WixUI_ErrorProgressText" />
-      <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>
-      <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>
+		<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+		<Upgrade Id="$(var.UpgradeCode)">
+			<UpgradeVersion
+			  Minimum="1.0.0.0" Maximum="99.0.0.0"
+			  Property="PREVIOUSVERSIONSINSTALLED"
+			  IncludeMinimum="yes" IncludeMaximum="no" />
+		</Upgrade>
+
+		<!-- Legt das Icon fest -->
+		<Icon Id="DDRecordOrganizer.exe" SourceFile="OrgFlow.exe" />
+
+		<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
+		<Property Id="ARPPRODUCTICON" Value="DDRecordOrganizer.exe" />
+
+		<!-- Liest den Installationsort über die Registry aus -->
+		<Property Id="INSTALLDIR">
+			<RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKLM" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+		</Property>
+
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<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" />
+							<Directory Id="VERSIONCHECKERDIR" Name="VERSION_CHECKER" />
+						</Directory>
+					</Directory>
+				</Directory>
+			</Directory>
+
+			<Directory Id="ProgramMenuFolder">
+				<Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+			</Directory>
+
+			<Directory Id="DesktopFolder" />
+		</Directory>
+
+		<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.v21.2_" Name="DevExpress.Data.v21.2.dll"  KeyPath="yes" />
+				<File Id="DevExpress.Sparkline.v21.2_" Name="DevExpress.Sparkline.v21.2.Core.dll"  />
+				<File Id="DevExpress.Printing.v21.2.Core_" Name="DevExpress.Printing.v21.2.Core.dll"  />
+				<File Id="DevExpress.Utils.v21.2_" Name="DevExpress.Utils.v21.2.dll"  />
+				<File Id="DevExpress.XtraEditors.v21.2_" Name="DevExpress.XtraEditors.v21.2.dll"  />
+				<File Id="DevExpress.XtraGrid.v21.2_" Name="DevExpress.XtraGrid.v21.2.dll"  />
+				<File Id="DevExpress.XtraLayout.v21.2_" Name="DevExpress.XtraLayout.v21.2.dll"  />
+				<File Id="DevExpress.XtraPrinting.v21.2_" Name="DevExpress.XtraPrinting.v21.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="OrgFlow.exe" Source="OrgFlow.exe" KeyPath="yes" />
+				<File Id="PMOEXECONFIG" Name="OrgFlow.exe.config" Source="OrgFlow.exe.config" KeyPath="no" />
+				<!-- 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]OrgFlow.exe,0&quot;" />
+							<RegistryValue Key="shell\open\command" Type="string" Value="&quot;[INSTALLDIR]OrgFlow.exe&quot; --data %1" />
+						</RegistryKey>
+					</RegistryKey>
+				</RegistryKey>
+			</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"/>
+				<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDWindream" Name="DigitalData.Modules.Windream.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDConfig" Name="DigitalData.Modules.Config.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDBase" Name="DigitalData.Modules.Base.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll"  KeyPath="no" Checksum="yes"/>
+				<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.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="ERPConnect35" Name="ERPConnect35.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.Charts.v21.2.Core" Name="DevExpress.Charts.v21.2.Core.dll" KeyPath="yes" />
+				<File Id="DevExpress.CodeParser.v21.2" Name="DevExpress.CodeParser.v21.2.dll"  />
+				<File Id="DevExpress.Data.v21.2" Name="DevExpress.Data.v21.2.dll" />
+				<File Id="DevExpress.Data.Desktop.v21.2" Name="DevExpress.Data.Desktop.v21.2.dll" />
+				<File Id="DevExpress.DataAccess.v21.2" Name="DevExpress.DataAccess.v21.2.dll" />
+				<File Id="DevExpress.DataAccess.v21.2.UI" Name="DevExpress.DataAccess.v21.2.UI.dll" />
+				<File Id="DevExpress.DataVisualization.v21.2.Core" Name="DevExpress.DataVisualization.v21.2.Core.dll" />
+				<File Id="DevExpress.Diagram.v21.2.Core" Name="DevExpress.Diagram.v21.2.Core.dll" />
+				<File Id="DevExpress.Images.v21.2" Name="DevExpress.Images.v21.2.dll" />
+				<File Id="DevExpress.Map.v21.2.Core" Name="DevExpress.Map.v21.2.Core.dll" />
+				<File Id="DevExpress.Office.v21.2.Core" Name="DevExpress.Office.v21.2.Core.dll" />
+				<File Id="DevExpress.Pdf.v21.2.Core" Name="DevExpress.Pdf.v21.2.Core.dll" />
+				<File Id="DevExpress.Pdf.v21.2.Drawing" Name="DevExpress.Pdf.v21.2.Drawing.dll" />
+				<File Id="DevExpress.PivotGrid.v21.2.Core" Name="DevExpress.PivotGrid.v21.2.Core.dll" />
+				<File Id="DevExpress.Printing.v21.2.Core" Name="DevExpress.Printing.v21.2.Core.dll" />
+				<File Id="DevExpress.RichEdit.v21.2.Core" Name="DevExpress.RichEdit.v21.2.Core.dll" />
+				<File Id="DevExpress.RichEdit.v21.2.Export" Name="DevExpress.RichEdit.v21.2.Export.dll" />
+				<File Id="DevExpress.Sparkline.v21.2.Core" Name="DevExpress.Sparkline.v21.2.Core.dll" />
+				<File Id="DevExpress.SpellChecker.v21.2.Core" Name="DevExpress.SpellChecker.v21.2.Core.dll" />
+				<File Id="DevExpress.Utils.v21.2" Name="DevExpress.Utils.v21.2.dll" />
+				<File Id="DevExpress.Xpo.v21.2" Name="DevExpress.Xpo.v21.2.dll" />
+				<File Id="DevExpress.XtraBars.v21.2" Name="DevExpress.XtraBars.v21.2.dll" />
+				<File Id="DevExpress.XtraCharts.v21.2" Name="DevExpress.XtraCharts.v21.2.dll" />
+				<File Id="DevExpress.XtraCharts.v21.2.Extensions_" Name="DevExpress.XtraCharts.v21.2.Extensions.dll"  />
+				<File Id="DevExpress.XtraCharts.v21.2.UI" Name="DevExpress.XtraCharts.v21.2.UI.dll"  />
+				<File Id="DevExpress.XtraCharts.Wizard.v21.2" Name="DevExpress.XtraCharts.v21.2.Wizard.dll"  />
+				<File Id="DevExpress.XtraDiagram.v21.2" Name="DevExpress.XtraDiagram.v21.2.dll"  />
+				<File Id="DevExpress.XtraEditors.v21.2" Name="DevExpress.XtraEditors.v21.2.dll"  />
+				<File Id="DevExpress.XtraGauges.v21.2.Core" Name="DevExpress.XtraGauges.v21.2.Core.dll"  />
+				<File Id="DevExpress.XtraGrid.v21.2" Name="DevExpress.XtraGrid.v21.2.dll"  />
+				<File Id="DevExpress.XtraLayout.v21.2" Name="DevExpress.XtraLayout.v21.2.dll"  />
+				<File Id="DevExpress.XtraMap.v21.2" Name="DevExpress.XtraMap.v21.2.dll"  />
+				<File Id="DevExpress.XtraNavBar.v21.2" Name="DevExpress.XtraNavBar.v21.2.dll"  />
+				<File Id="DevExpress.XtraPdfViewer.v21.2" Name="DevExpress.XtraPdfViewer.v21.2.dll"  />
+				<File Id="DevExpress.XtraPivotGrid.v21.2" Name="DevExpress.XtraPivotGrid.v21.2.dll"  />
+				<File Id="DevExpress.XtraPrinting.v21.2" Name="DevExpress.XtraPrinting.v21.2.dll"  />
+				<File Id="DevExpress.XtraReports.v21.2" Name="DevExpress.XtraReports.v21.2.dll"  />
+				<File Id="DevExpress.XtraReports.v21.2.Extensions" Name="DevExpress.XtraReports.v21.2.Extensions.dll"  />
+				<File Id="DevExpress.XtraRichEdit.v21.2" Name="DevExpress.XtraRichEdit.v21.2.dll"  />
+				<File Id="DevExpress.XtraScheduler.v21.2" Name="DevExpress.XtraScheduler.v21.2.dll"  />
+				<File Id="DevExpress.XtraScheduler.v21.2.Core" Name="DevExpress.XtraScheduler.v21.2.Core.dll"  />
+				<File Id="DevExpress.XtraScheduler.v21.2.Core.Desktop" Name="DevExpress.XtraScheduler.v21.2.Core.Desktop.dll"  />
+				<File Id="DevExpress.XtraScheduler.v21.2.Extensions" Name="DevExpress.XtraScheduler.v21.2.Extensions.dll"  />
+				<File Id="DevExpress.XtraScheduler.v21.2.Reporting" Name="DevExpress.XtraScheduler.v21.2.Reporting.dll"  />
+				<File Id="DevExpress.XtraScheduler.v21.2.Reporting.Extensions" Name="DevExpress.XtraScheduler.v21.2.Reporting.Extensions.dll"  />
+				<File Id="DevExpress.XtraSpellChecker.v21.2" Name="DevExpress.XtraSpellChecker.v21.2.dll"  />
+				<File Id="DevExpress.XtraTreeList.v21.2" Name="DevExpress.XtraTreeList.v21.2.dll"  />
+				<File Id="DevExpress.XtraVerticalGrid.v21.2" Name="DevExpress.XtraVerticalGrid.v21.2.dll"  />
+				<File Id="DevExpress.XtraWizard.v21.2" Name="DevExpress.XtraWizard.v21.2.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="OrgFlow.resources.dll" Source="de\OrgFlow.resources.dll"></File>
+				</Component>
+
+				<Component Id="Scheduler.Locales" Guid="84335DB2-F5D2-496B-9318-2BD1B1ACA391">
+					<File Id="DevExpress.XtraScheduler.v21.2.Core.resources" Name="DevExpress.XtraScheduler.v21.2.Core.resources.dll" ></File>
+					<File Id="DevExpress.XtraScheduler.v21.2.Extensions.resources" Name="DevExpress.XtraScheduler.v21.2.Extensions.resources.dll" ></File>
+					<File Id="DevExpress.XtraScheduler.v21.2.resources" Name="DevExpress.XtraScheduler.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.Data.v21.2.resources" Name="DevExpress.Data.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.Office.v21.2.Core.resources" Name="DevExpress.Office.v21.2.Core.resources.dll" ></File>
+					<File Id="DevExpress.Printing.v21.2.Core.resources" Name="DevExpress.Printing.v21.2.Core.resources.dll" ></File>
+					<File Id="DevExpress.RichEdit.v21.2.Core.resources" Name="DevExpress.RichEdit.v21.2.Core.resources.dll" ></File>
+					<File Id="DevExpress.Utils.v21.2.resources" Name="DevExpress.Utils.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraBars.v21.2.resources" Name="DevExpress.XtraBars.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraEditors.v21.2.resources" Name="DevExpress.XtraEditors.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraGrid.v21.2.resources" Name="DevExpress.XtraGrid.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraLayout.v21.2.resources" Name="DevExpress.XtraLayout.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraNavBar.v21.2.resources" Name="DevExpress.XtraNavBar.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraPrinting.v21.2.resources" Name="DevExpress.XtraPrinting.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraRichEdit.v21.2.resources" Name="DevExpress.XtraRichEdit.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraTreeList.v21.2.resources" Name="DevExpress.XtraTreeList.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraVerticalGrid.v21.2.resources" Name="DevExpress.XtraVerticalGrid.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraWizard.v21.2.resources" Name="DevExpress.XtraWizard.v21.2.resources.dll" ></File>
+					<File Id="DevExpress.XtraCharts.v21.2.resources" Name="DevExpress.XtraCharts.v21.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\OrgFlow.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\OrgFlow.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]OrgFlow.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]OrgFlow.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" Title="$(var.ProductName)" Level="1">
+			<ComponentRef Id="MainExecutable" />
+			<ComponentRef Id="WindreamLibs" />
+			<ComponentRef Id="DDLibs" />
+			<ComponentRef Id="IndependentsoftLibs" />
+			<ComponentRef Id="Scheduler.Locales" />
+			<ComponentRef Id="RecordOrganizer.Locales.de" />
+			<ComponentRef Id="RecordOrganizer.Locales.en_gb" />
+			<ComponentRef Id="RecordOrganizer.Locales.en_us" />
+			<ComponentRef Id="DevExpressLibs" />
+			<ComponentRef Id="DevExpressLibs_RightsManager" />
+			<ComponentRef Id="BasicLibs" />
+			<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"/>
+		</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_FeatureTree"/>
+			<UIRef Id="WixUI_ErrorProgressText" />
+			<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>
+			<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>