From 54da4ed2a35069d8777845b905d6d3099c24858e Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 15 Jun 2022 11:19:28 +0200
Subject: [PATCH] FIx installer, first complete version

---
 Zooflow.Setup/Product.wxs           | 91 ++++++++++++++++++++++++++---
 Zooflow.Setup/Zooflow.Setup.wixproj |  2 +-
 2 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/Zooflow.Setup/Product.wxs b/Zooflow.Setup/Product.wxs
index 4c6b7bf..0b01e35 100644
--- a/Zooflow.Setup/Product.wxs
+++ b/Zooflow.Setup/Product.wxs
@@ -79,8 +79,8 @@
 		<DirectoryRef Id="INSTALLDIR">
 			<Component Id="MainApplicationExe" Guid="ac6b7460-9c48-47b3-a590-da0905dd433a">
 				<File Id="MainApplicationExe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
-					<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-					<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
+				<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
+				<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
 				</File>
 			</Component>
 
@@ -96,17 +96,92 @@
 				<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
 			</Component>
 
-		<!-- Für weitere Dateien hier Component Elemente anlegen!! -->
-		<!--
-        <Component Id="FirmaXYLib" Guid="PUT-GUID-HERE">
-          <File Id="FirmaXYLib" Name="FirmaXYLib.dll" KeyPath="yes" Checksum="yes"/>
-        </Component>
-		-->
+			<Component Id="Libraries" Guid="38154538-ccbb-4984-b229-e2ac9ba68177">
+				<File Id="DevExpress.BonusSkins.v21.2.dll" Name="DevExpress.BonusSkins.v21.2.dll" KeyPath="yes" Checksum="yes" />
+				<File Id="DevExpress.Charts.v21.2.Core.dll" Name="DevExpress.Charts.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.CodeParser.v21.2.dll" Name="DevExpress.CodeParser.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Data.Desktop.v21.2.dll" Name="DevExpress.Data.Desktop.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Data.v21.2.dll" Name="DevExpress.Data.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.DataAccess.v21.2.dll" Name="DevExpress.DataAccess.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.DataAccess.v21.2.UI.dll" Name="DevExpress.DataAccess.v21.2.UI.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.DataVisualization.v21.2.Core.dll" Name="DevExpress.DataVisualization.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Diagram.v21.2.Core.dll" Name="DevExpress.Diagram.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Dialogs.v21.2.Core.dll" Name="DevExpress.Dialogs.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Images.v21.2.dll" Name="DevExpress.Images.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Office.v21.2.Core.dll" Name="DevExpress.Office.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Pdf.v21.2.Core.dll" Name="DevExpress.Pdf.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Pdf.v21.2.Drawing.dll" Name="DevExpress.Pdf.v21.2.Drawing.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Printing.v21.2.Core.dll" Name="DevExpress.Printing.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.RichEdit.v21.2.Core.dll" Name="DevExpress.RichEdit.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Sparkline.v21.2.Core.dll" Name="DevExpress.Sparkline.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Spreadsheet.v21.2.Core.dll" Name="DevExpress.Spreadsheet.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.TreeMap.v21.2.Core.dll" Name="DevExpress.TreeMap.v21.2.Core.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Utils.v21.2.dll" Name="DevExpress.Utils.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Utils.v21.2.UI.dll" Name="DevExpress.Utils.v21.2.UI.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.Xpo.v21.2.dll" Name="DevExpress.Xpo.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraBars.v21.2.dll" Name="DevExpress.XtraBars.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraCharts.v21.2.dll" Name="DevExpress.XtraCharts.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraDiagram.v21.2.dll" Name="DevExpress.XtraDiagram.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraDialogs.v21.2.dll" Name="DevExpress.XtraDialogs.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraEditors.v21.2.dll" Name="DevExpress.XtraEditors.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraGrid.v21.2.dll" Name="DevExpress.XtraGrid.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraLayout.v21.2.dll" Name="DevExpress.XtraLayout.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraNavBar.v21.2.dll" Name="DevExpress.XtraNavBar.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraPrinting.v21.2.dll" Name="DevExpress.XtraPrinting.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraRichEdit.v21.2.dll" Name="DevExpress.XtraRichEdit.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraSpreadsheet.v21.2.dll" Name="DevExpress.XtraSpreadsheet.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraTreeList.v21.2.dll" Name="DevExpress.XtraTreeList.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraTreeMap.v21.2.dll" Name="DevExpress.XtraTreeMap.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DevExpress.XtraVerticalGrid.v21.2.dll" Name="DevExpress.XtraVerticalGrid.v21.2.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Controls.DocumentViewer.dll" Name="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Controls.LookupGrid.dll" Name="DigitalData.Controls.LookupGrid.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Controls.RegexEditor.dll" Name="DigitalData.Controls.RegexEditor.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Controls.SnapPanel.dll" Name="DigitalData.Controls.SnapPanel.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Controls.SQLConfig.dll" Name="DigitalData.Controls.SQLConfig.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.GUIs.ClipboardWatcher.dll" Name="DigitalData.GUIs.ClipboardWatcher.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.GUIs.Common.dll" Name="DigitalData.GUIs.Common.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.GUIs.GlobalIndexer.dll" Name="DigitalData.GUIs.GlobalIndexer.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Base.dll" Name="DigitalData.Modules.Base.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Config.dll" Name="DigitalData.Modules.Config.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Database.dll" Name="DigitalData.Modules.Database.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.EDMI.API.dll" Name="DigitalData.Modules.EDMI.API.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Encryption.dll" Name="DigitalData.Modules.Encryption.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Filesystem.dll" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Interfaces.dll" Name="DigitalData.Modules.Interfaces.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Language.dll" Name="DigitalData.Modules.Language.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Logging.dll" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Messaging.dll" Name="DigitalData.Modules.Messaging.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Patterns.dll" Name="DigitalData.Modules.Patterns.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.Windows.dll" Name="DigitalData.Modules.Windows.dll" KeyPath="no" Checksum="yes" />
+				<File Id="DigitalData.Modules.ZooFlow.dll" Name="DigitalData.Modules.ZooFlow.dll" KeyPath="no" Checksum="yes" />
+				<File Id="Independentsoft.Msg.dll" Name="Independentsoft.Msg.dll" KeyPath="no" Checksum="yes" />
+				<File Id="Mail.dll" Name="Mail.dll" KeyPath="no" Checksum="yes" />
+				<File Id="NLog.dll" Name="NLog.dll" KeyPath="no" Checksum="yes" />
+				<File Id="Oracle.ManagedDataAccess.dll" Name="Oracle.ManagedDataAccess.dll" KeyPath="no" Checksum="yes" />
+			</Component>
+
+			<Component Id="GDPictureExternal" Guid="fe785ceb-09fe-40fa-988d-011ebd574f81">
+				<File Id="GdPicture.NET.14.filters.64.dll" Name="GdPicture.NET.14.filters.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.64.dll" KeyPath="yes" Checksum="yes" />
+				<File Id="GdPicture.NET.14.filters.dll" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" KeyPath="no" Checksum="yes" />
+				<File Id="GdPicture.NET.14.image.gdimgplug.64.dll" Name="GdPicture.NET.14.image.gdimgplug.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.64.dll" KeyPath="no" Checksum="yes" />
+				<File Id="GdPicture.NET.14.image.gdimgplug.dll" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" KeyPath="no" Checksum="yes" />
+				<File Id="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" KeyPath="no" Checksum="yes" />
+				<File Id="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" KeyPath="no" Checksum="yes" />
+			</Component>
+
+			<!-- Für weitere Dateien hier Component Elemente anlegen!! -->
+			<!--
+			<Component Id="FirmaXYLib" Guid="PUT-GUID-HERE">
+				<File Id="FirmaXYLib" Name="FirmaXYLib.dll" KeyPath="yes" Checksum="yes"/>
+			</Component>
+			-->
 		</DirectoryRef>
 
 		<Feature Id="MainApplication" Title="Main Application" Level="1">
 			<ComponentRef Id="MainApplicationExe" />
 			<ComponentRef Id="RegistryKeys" />
+			<ComponentRef Id="Libraries" />
+			<ComponentRef Id="GDPictureExternal" />
 			<!-- Weitere Komponenten hier hinzufügen! -->
 		</Feature>
 
diff --git a/Zooflow.Setup/Zooflow.Setup.wixproj b/Zooflow.Setup/Zooflow.Setup.wixproj
index 18b474f..21396e3 100644
--- a/Zooflow.Setup/Zooflow.Setup.wixproj
+++ b/Zooflow.Setup/Zooflow.Setup.wixproj
@@ -16,7 +16,7 @@
     <LinkerAdditionalOptions>
 			-b "$(SolutionDir)Zooflow\bin\$(Configuration)"
 		</LinkerAdditionalOptions>
-    <Cultures>de-DE;en-US</Cultures>
+    <Cultures>de-DE</Cultures>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>