Merge branch 'master' of http://git.dd:3000/AppStd/Monorepo

DocumentViewer Debug

ConfigCreator/MonoRepoUtils.vbproj

@@ -66,15 +66,15 @@
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

Controls.ChatAddUser/ChatAddUser.vbproj

@@ -61,11 +61,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Controls.ChatControl/ChatControl.vbproj

@@ -61,11 +61,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Controls.ChatNewConv/ChatNewConv.vbproj

@@ -61,11 +61,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Controls.DocumentViewer/App.config

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
+    <startup>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </startup>
-  </configSections>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-  </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -33,29 +29,18 @@
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-  <entityFramework>
+</configuration>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
-    </providers>
-    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
-  </entityFramework>
-</configuration>

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -26,7 +26,6 @@ Partial Class DocumentViewer
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer))
         Me.GdViewer = New GdPicture14.GdViewer()
         Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog()
-        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
         Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar()
         Me.buttonPrint = New DevExpress.XtraBars.BarButtonItem()
@@ -64,6 +63,7 @@ Partial Class DocumentViewer
         Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
         Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
         Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
+        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -153,19 +153,6 @@ Partial Class DocumentViewer
         '
         Me.OpenFileDialog.FileName = "OpenFileDialog1"
         '
-        'RichEditControl1
-        '
-        Me.RichEditControl1.Location = New System.Drawing.Point(616, 270)
-        Me.RichEditControl1.MenuManager = Me.BarManager1
-        Me.RichEditControl1.Name = "RichEditControl1"
-        Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
-        Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
-        Me.RichEditControl1.ReadOnly = True
-        Me.RichEditControl1.Size = New System.Drawing.Size(249, 161)
-        Me.RichEditControl1.TabIndex = 0
-        Me.RichEditControl1.TabStop = False
-        Me.RichEditControl1.Visible = False
-        '
         'BarManager1
         '
         Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.ToolbarDocumentViewer})
@@ -435,7 +422,7 @@ Partial Class DocumentViewer
         '
         'SpreadsheetControl1
         '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(316, 270)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(147, 190)
         Me.SpreadsheetControl1.MenuManager = Me.BarManager1
         Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
         Me.SpreadsheetControl1.ReadOnly = True
@@ -464,12 +451,21 @@ Partial Class DocumentViewer
         Me.lbFileNotLoaded.Text = "Die Datei konnte nicht geladen werden"
         Me.lbFileNotLoaded.Visible = False
         '
+        'RichEditControl1
+        '
+        Me.RichEditControl1.Location = New System.Drawing.Point(571, 238)
+        Me.RichEditControl1.MenuManager = Me.BarManager1
+        Me.RichEditControl1.Name = "RichEditControl1"
+        Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
+        Me.RichEditControl1.TabIndex = 5
+        Me.RichEditControl1.Visible = False
+        '
         'DocumentViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.Controls.Add(Me.lbFileNotLoaded)
         Me.Controls.Add(Me.RichEditControl1)
+        Me.Controls.Add(Me.lbFileNotLoaded)
         Me.Controls.Add(Me.SpreadsheetControl1)
         Me.Controls.Add(Me.GdViewer)
         Me.Controls.Add(Me.barDockControlLeft)
@@ -492,7 +488,6 @@ Partial Class DocumentViewer
 
     Friend WithEvents GdViewer As GdPicture14.GdViewer
     Friend WithEvents OpenFileDialog As OpenFileDialog
-    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
     Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
     Friend WithEvents PrintDocument1 As Printing.PrintDocument
     Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
@@ -530,4 +525,5 @@ Partial Class DocumentViewer
     Friend WithEvents lbFileNotLoaded As DevExpress.XtraEditors.LabelControl
     Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
 End Class

Controls.DocumentViewer/DocumentViewer.vb

@@ -22,8 +22,8 @@ Public Class DocumentViewer
 
     Private Enum ViewerMode
         GDPicture
-        RichText
         Excel
+        Richtext
     End Enum
 
     Private Enum FileLoadMode
@@ -55,10 +55,12 @@ Public Class DocumentViewer
 
     Private _hide_file_info_from_user As Boolean = False
 
+
     Private _FileStream As Stream
     Private _FilePath As String
     Private _FileInfo As FileInfo
     Private _FileLoadMode As FileLoadMode = FileLoadMode.File
+    Private _ViewOverride As String = ""
 
     ' List of all created temp files when converting msg files
     Private _TempFiles As New List(Of String)
@@ -66,7 +68,7 @@ Public Class DocumentViewer
     Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load
         UpdateMainUi()
     End Sub
-
+    'hallo
     Public Class ToolbarSettings
         Public Property ShowPrintButton As Boolean = True
         Public Property ShowFitWidthButton As Boolean = True
@@ -79,6 +81,7 @@ Public Class DocumentViewer
     End Class
 
     Public Property FileLoaded As Boolean = False
+    Public Property Viewer_ForceTemporaryMode As Boolean = False
     Public ReadOnly Property AnnotationsSaved As Boolean
         Get
             Return Not _AnnotationsPending
@@ -90,30 +93,40 @@ Public Class DocumentViewer
     ''' </summary>
     ''' <param name="pLogConfig">A LogConfig object</param>
     ''' <param name="pLicenseKey">The GDPicture.NET License Key</param>
-    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String, pToolbarSettings As ToolbarSettings)
+    Public Function Init(pLogConfig As LogConfig, pLicenseKey As String, Optional pToolbarSettings As ToolbarSettings = Nothing) As Boolean
         _logConfig = pLogConfig
         _logger = pLogConfig.GetLogger()
-        _email = New Email2(pLogConfig)
-        _licenseKey = pLicenseKey
-        _licenseManager.RegisterKEY(_licenseKey)
-        _Annotations = New Annotations(pLogConfig)
-        _Search = New Search(pLogConfig, GdViewer)
-        _ToolbarSettings = pToolbarSettings
 
-        Dim oConfigPath = ConfigPath()
+        If pToolbarSettings Is Nothing Then
-        _Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath)
+            pToolbarSettings = New ToolbarSettings
-    End Sub
+        End If
 
-    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String)
+        Try
-        Init(pLogConfig, pLicenseKey, New ToolbarSettings())
+            _email = New Email2(pLogConfig)
-    End Sub
+            If pLicenseKey = String.Empty Then
+                _logger.Warn("License key was not provided during init-process!")
+                Return False
+            End If
+            _licenseKey = pLicenseKey
+            _licenseManager.RegisterKEY(_licenseKey)
+            _Annotations = New Annotations(pLogConfig)
+            _Search = New Search(pLogConfig, GdViewer)
+            _ToolbarSettings = pToolbarSettings
+
+            Dim oConfigPath = ConfigPath()
+            _Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath)
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
 
     ''' <summary>
     ''' Load a file from a path and display it
     ''' </summary>
     Public Sub LoadFile(FilePath As String)
         FileLoaded = False
-
         If _licenseKey = String.Empty Then
             _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
             Exit Sub
@@ -128,10 +141,9 @@ Public Class DocumentViewer
         _FileLoadMode = FileLoadMode.File
         _FileInfo = New FileInfo(FilePath)
 
-        _logger.Info("Loading File [{0}] from Filesystem", FilePath)
+        _logger.Info("Loading file [{0}] from Filesystem", FilePath)
-        FileLoaded = DoLoadFile(FilePath)
-
         SetViewerMode(_FileInfo.Extension)
+        FileLoaded = DoLoadFile(FilePath)
         UpdateMainUi()
     End Sub
 
@@ -141,10 +153,7 @@ Public Class DocumentViewer
     Public Sub LoadFile(FileName As String, Stream As Stream)
         FileLoaded = False
 
-        If _licenseKey = String.Empty Then
+
-            _logger.Warn("License key was not provided. File [{0}] not loaded.", FileName)
-            Exit Sub
-        End If
 
         Dim oExtension As String = FileName.Substring(FileName.LastIndexOf("."))
 
@@ -279,12 +288,6 @@ Public Class DocumentViewer
         _Config.Save()
     End Sub
 
-    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
-        Dim oControlWidth = RichEditControl1.Width - 100
-        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
-        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
-    End Sub
-
     Private Sub btnOpen_Click(sender As Object, e As EventArgs)
         GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
         GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
@@ -301,21 +304,11 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrevPage.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.DisplayPreviousPage()
-            GdViewer.DisplayPreviousPage()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New PreviousPageCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
     End Sub
 
     Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.DisplayNextPage()
-            GdViewer.DisplayNextPage()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New NextPageCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
     End Sub
 
     Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick
@@ -344,21 +337,11 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnZoomOut_Click(sender As Object, e As EventArgs) Handles buttonZoomOut.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.ZoomOUT()
-            GdViewer.ZoomOUT()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New ZoomOutCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
     End Sub
 
     Private Sub btnZoomIn_Click(sender As Object, e As EventArgs) Handles buttonZoomIn.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.ZoomIN()
-            GdViewer.ZoomIN()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New ZoomInCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
     End Sub
 
     Private Sub btnPrint_Click(sender As Object, e As EventArgs) Handles buttonPrint.ItemClick
@@ -452,16 +435,18 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub SetViewerMode(Extension As String)
-        Select Case Extension.ToUpper
+        If _ViewOverride = "Richtext" Then
-            Case ".MSG"
+            _ViewerMode = ViewerMode.Richtext
-                _ViewerMode = ViewerMode.RichText
+        Else
-            Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+            Select Case Extension.ToUpper
-                _ViewerMode = ViewerMode.RichText
+                Case "CSV"
-            Case ".XLSX", ".XLS", "CSV"
+                    _ViewerMode = ViewerMode.Excel
-                _ViewerMode = ViewerMode.Excel
+                    'Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-            Case Else
+                    '   _ViewerMode = ViewerMode.RichText
-                _ViewerMode = ViewerMode.GDPicture
+                Case Else
-        End Select
+                    _ViewerMode = ViewerMode.GDPicture
+            End Select
+        End If
     End Sub
     Private Sub FreeFile()
         Try
@@ -470,76 +455,97 @@ Public Class DocumentViewer
             End If
             Dim oExtension As String = _FileInfo.Extension.ToUpper
             Select Case _ViewerMode
-                Case ViewerMode.RichText
-                    _logger.Debug("Closing RichText Editor")
-                    RichEditControl1.CreateNewDocument()
-
                 Case ViewerMode.Excel
                     _logger.Debug("Closing Excel Editor")
                     SpreadsheetControl1.CreateNewDocument()
-
                 Case Else
                     _logger.Debug("Closing GDPicture Viewer")
                     GdViewer.CloseDocument()
-
             End Select
         Catch ex As Exception
             _logger.Warn($"Unexpected error in FreeFile: {ex.Message}")
         End Try
     End Sub
-    Private Function DoLoadFile(FilePath As String) As Boolean
+    Private Function DoLoadFile(FilePath As String, Optional ViewOverride As String = "") As Boolean
         Try
-            _logger.Debug($"Starting DoLoadFile with [{FilePath}] ...")
             Dim oFileInfo = New FileInfo(FilePath)
             Dim oExtension As String = oFileInfo.Extension.ToUpper
 
             lbFileNotLoaded.Visible = False
 
+            SpreadsheetControl1.Visible = False
             RichEditControl1.Visible = False
+
+            SpreadsheetControl1.Dock = DockStyle.None
             RichEditControl1.Dock = DockStyle.None
 
-            SpreadsheetControl1.Visible = False
+            If ViewOverride = "Richtext" Then
-            SpreadsheetControl1.Dock = DockStyle.None
+                RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+                RichEditControl1.Visible = True
+                GdViewer.Visible = False
+                RichEditControl1.Dock = DockStyle.Fill
+                _ViewOverride = "Richtext"
+                _ViewerMode = ViewerMode.Richtext
+                MsgBox("This docx-file contains a generic error and will be displayed in a reduced viewer." & vbNewLine &
+                       "Please try to open the file in WORD", MsgBoxStyle.Exclamation, "Error opening docx-file")
+            Else
+                _ViewOverride = ""
+                Select Case oExtension.ToUpper
+                    Case ".CSV"
+                        Dim oFormat = GetSpreadsheetFormat(oExtension)
+                        SpreadsheetControl1.LoadDocument(FilePath, oFormat)
 
-            Select Case oExtension.ToUpper
+                        Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
-                Case ".MSG"
+                        oRange.AutoFitColumns()
-                    'msg is converted to eml and then displayed in GDPicture
-                    Dim oEmlPath As String = _email.Convert_ToEml(FilePath)
-                    _TempFiles.Add(oEmlPath)
-                    DoLoadFile(oEmlPath)
 
-                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                        SpreadsheetControl1.Visible = True
-                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+                        GdViewer.Visible = False
+                        SpreadsheetControl1.Dock = DockStyle.Fill
 
-                    RichEditControl1.Visible = True
+                        'Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                    RichEditControl1.Dock = DockStyle.Fill
+                        '    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
 
-                Case ".XLSX", ".XLS", ".CSV"
+                        '    RichEditControl1.Visible = True
-                    Dim oFormat = GetSpreadsheetFormat(oExtension)
+                        '    GdViewer.Visible = False
-                    SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+                        '    RichEditControl1.Dock = DockStyle.Fill
+                    Case Else
+                        Select Case oExtension.ToUpper
+                            Case ".EML", ".DOC", ".DOCX", ".XLS", ".XLSX", ".ODT", ".RTF", ".TXT"
+                                GdViewer.ForceTemporaryMode = False
+                        End Select
 
-                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-                    oRange.AutoFitColumns()
+                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                        If Viewer_ForceTemporaryMode = True Then
+                            GdViewer.ForceTemporaryMode = True
+                        End If
 
-                    SpreadsheetControl1.Visible = True
+                        GdViewer.AnnotationDropShadow = True
-                    SpreadsheetControl1.Dock = DockStyle.Fill
+                        GdViewer.BackColor = Color.White
 
-                Case Else
+                        Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath)
-                    _logger.Debug($"Loading GDViewer with extension [{oExtension}] ...")
+                        If oGDPState <> GdPictureStatus.OK Then
-                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                            _logger.Warn($"GdPictureStatus is [{oGDPState}]")
-                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                            If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then
-                    GdViewer.ForceTemporaryMode = True
+                                DoLoadFile(FilePath, "Richtext")
-                    GdViewer.AnnotationDropShadow = True
+                            Else
+                                Dim oFileName = IO.Path.GetFileName(FilePath)
+                                lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
+                                lbFileNotLoaded.Visible = True
+                            End If
 
-                    If GdViewer.DisplayFromFile(FilePath) <> GdPictureStatus.OK Then
+                        Else
-                        Dim oFileName = IO.Path.GetFileName(FilePath)
+                            If GdViewer.Visible = False Then
-                        lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
+                                GdViewer.Visible = True
-                        lbFileNotLoaded.Visible = True
+                            End If
-                    End If
+                        End If
 
-            End Select
+                End Select
+            End If
+            If _ViewOverride = "Richtext" Then
+                _ViewerMode = ViewerMode.Richtext
+            End If
 
-            UpdateMainUi()
 
             Return True
         Catch ex As Exception
@@ -549,52 +555,22 @@ Public Class DocumentViewer
     End Function
 
     Private Sub FitToPage()
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
-            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New FitToPageCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
     End Sub
 
     Private Sub FitToWidth()
-        If _ViewerMode = ViewerMode.GDPicture Then
+        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New FitWidthCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
     End Sub
 
     Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
         Try
-            RichEditControl1.Visible = False
-            RichEditControl1.Dock = DockStyle.None
 
             SpreadsheetControl1.Visible = False
             SpreadsheetControl1.Dock = DockStyle.None
 
             Select Case Extension.ToUpper
-                Case ".MSG"
 
-                    Dim oTempFileName = Path.Combine(IO.Path.GetTempPath(), Guid.NewGuid.ToString & ".msg")
+                Case ".CSV"
-                    Using oFileStream As New FileStream(oTempFileName, FileMode.Create)
-                        Stream.Seek(0, SeekOrigin.Begin)
-                        Stream.CopyTo(oFileStream)
-                        Stream.Flush()
-                    End Using
-
-                    Dim oEmlPath As String = _email.Convert_ToEml(oTempFileName)
-                    DoLoadFile(oEmlPath)
-
-                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                    RichEditControl1.LoadDocument(Stream, GetDocumentFormat(Extension))
-
-                    RichEditControl1.ActiveViewType = XtraRichEdit.RichEditViewType.PrintLayout
-                    RichEditControl1.Visible = True
-                    RichEditControl1.Dock = DockStyle.Fill
-
-                Case ".XLSX", ".XLS", ".CSV"
                     SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
 
                     Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
@@ -606,7 +582,9 @@ Public Class DocumentViewer
                 Case Else
                     GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                    GdViewer.ForceTemporaryMode = True
+                    If Viewer_ForceTemporaryMode = True Then
+                        GdViewer.ForceTemporaryMode = True
+                    End If
                     GdViewer.AnnotationDropShadow = True
 
                     GdViewer.DisplayFromStream(Stream)
@@ -696,29 +674,6 @@ Public Class DocumentViewer
                 buttonLastPage.Visibility = ToVisibility(True)
                 txtCurrentPage.Visibility = ToVisibility(True)
 
-            Case ViewerMode.RichText
-                ToolbarDocumentViewer.Visible = True
-
-                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
-                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
-                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
-                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
-                buttonNextPage.Visibility = ToVisibility(True)
-                buttonPrevPage.Visibility = ToVisibility(True)
-                buttonPrint.Visibility = ToVisibility(False)
-                buttonRotateLeft.Visibility = ToVisibility(False)
-                buttonRotateRight.Visibility = ToVisibility(False)
-                buttonFlipX.Visibility = ToVisibility(False)
-                buttonFlipY.Visibility = ToVisibility(False)
-                buttonFirstPage.Visibility = ToVisibility(False)
-                buttonLastPage.Visibility = ToVisibility(False)
-                buttonSettings.Visibility = ToVisibility(False)
-                txtCurrentPage.Visibility = ToVisibility(False)
-                txtSearch.Visibility = ToVisibility(False)
-                btnSearch2.Visibility = ToVisibility(False)
-                btnNextHighlight.Visibility = ToVisibility(False)
-                btnPrevHighlight.Visibility = ToVisibility(False)
-
             Case ViewerMode.Excel
                 ToolbarDocumentViewer.Visible = False
 
@@ -741,9 +696,8 @@ Public Class DocumentViewer
                 btnSearch2.Visibility = ToVisibility(False)
                 btnNextHighlight.Visibility = ToVisibility(False)
                 btnPrevHighlight.Visibility = ToVisibility(False)
-
+            Case Else
-
+                ToolbarDocumentViewer.Visible = False
-
         End Select
     End Sub
 

Controls.DocumentViewer/DocumentViewer.vbproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -79,23 +78,17 @@
     <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Base">
-      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Messaging">
-      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+      <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
@@ -103,18 +96,6 @@
     <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-    </Reference>
-    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
-      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
-    </Reference>
     <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
       <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
     </Reference>
@@ -179,19 +160,16 @@
       <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="IndexRange, Version=1.0.3.0, Culture=neutral, PublicKeyToken=35e6a3c4212514c6, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\packages\IndexRange.1.0.3\lib\net45\IndexRange.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -201,8 +179,8 @@
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+    <Reference Include="OpenMcdf, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+      <HintPath>..\packages\OpenMcdf.3.0.0\lib\netstandard2.0\OpenMcdf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -215,34 +193,23 @@
     <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
       <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
     </Reference>
-    <Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
-    <Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
+      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
-    </Reference>
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IdentityModel" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
+      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -260,15 +227,15 @@
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
     </Reference>
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
+      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -385,19 +352,12 @@
     <None Include="Resources\rotateclockwise.svg" />
     <None Include="Resources\rotatecounterclockwise.svg" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="MailLicense.xml" />
-    <Content Include="README.txt" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
 </Project>

Controls.DocumentViewer/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.9.8.0")>
+<Assembly: AssemblyVersion("2.3.0.0")>
-<Assembly: AssemblyFileVersion("1.9.8.0")>
+<Assembly: AssemblyFileVersion("2.3.0.0")>

Controls.DocumentViewer/packages.config

@@ -1,49 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
-  <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
-  <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
-  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
-  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
-  <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
-  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
-  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
-  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
   <package id="GdPicture" version="14.3.3" targetFramework="net462" />
   <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="IndexRange" version="1.0.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
-  <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
-  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
+  <package id="OpenMcdf" version="3.0.0" targetFramework="net462" />
-  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
   <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
-  <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
   <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
-  <package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
   <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
-  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
-  <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
+  <package id="System.Management" version="8.0.0" targetFramework="net462" />
-  <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
-  <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
-  <package id="System.Management" version="9.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />
   <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
-  <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
-  <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

Controls.LookupGrid/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("LookupGrid")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("3.4.0.0")>
+<Assembly: AssemblyTrademark("3.4.3.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.4.4.0")>
+<Assembly: AssemblyVersion("3.4.3.0")>
-<Assembly: AssemblyFileVersion("3.4.4.0")>
+<Assembly: AssemblyFileVersion("3.4.3.0")>

Controls.LookupGrid/frmLookupGrid.Designer.vb

@@ -50,6 +50,7 @@ Partial Class frmLookupGrid
         '
         Me.viewLookup.GridControl = Me.gridLookup
         Me.viewLookup.Name = "viewLookup"
+        Me.viewLookup.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
         Me.viewLookup.OptionsView.ShowGroupPanel = False
         '
         'Panel1
@@ -74,8 +75,6 @@ Partial Class frmLookupGrid
         '
         'frmLookupGrid
         '
-        Me.Appearance.BackColor = System.Drawing.Color.White
-        Me.Appearance.Options.UseBackColor = True
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.gridLookup)

Controls.LookupGrid/frmLookupGrid.resx

@@ -147,7 +147,7 @@
     <value>12, 2</value>
   </data>
   <data name="gridLookup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>469, 260</value>
+    <value>364, 225</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="gridLookup.TabIndex" type="System.Int32, mscorlib">
@@ -165,14 +165,11 @@
   <data name="&gt;&gt;gridLookup.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
   <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 10</value>
+    <value>12, 10</value>
   </data>
   <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>117, 32</value>
+    <value>117, 23</value>
   </data>
   <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -193,13 +190,13 @@
     <value>0</value>
   </data>
   <data name="btnClear.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
+    <value>Top, Right</value>
   </data>
   <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
-    <value>135, 10</value>
+    <value>240, 10</value>
   </data>
   <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
-    <value>117, 32</value>
+    <value>136, 23</value>
   </data>
   <data name="btnClear.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -223,13 +220,13 @@
     <value>Bottom</value>
   </data>
   <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 271</value>
+    <value>0, 236</value>
   </data>
   <data name="Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>6, 6, 6, 6</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>493, 45</value>
+    <value>388, 45</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -253,7 +250,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>493, 316</value>
+    <value>388, 281</value>
   </data>
   <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
     <value>390, 293</value>

Controls.LookupGrid/frmLookupGrid.vb

@@ -98,10 +98,16 @@ Public Class frmLookupGrid
         _View.BestFitColumns()
 
         ' Datenspalte zusätzlich in der Breite anpassen
-        If _View.Columns.Count = 0 Then
+        Try
-            Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn)
+            If _View.Columns.Count = 0 Then
-            oDataColumn.BestFit()
+                Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn)
-        End If
+                oDataColumn.BestFit()
+            End If
+        Catch ex As ArgumentOutOfRangeException
+
+        Catch ex As Exception
+
+        End Try
     End Sub
     Private Sub frmLookupGrid_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         BringToFront()

Controls.RegexEditor/RegexEditor.vbproj

@@ -62,10 +62,10 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />

DBCleaner/DBCleaner.vbproj

@@ -50,14 +50,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

DBCleaner/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net48" />
 </packages>

GUIs.ClipboardWatcher/ClipboardWatcher.vbproj

@@ -58,36 +58,39 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="DigitalData.Controls.DocumentViewer">
+      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.GUIs.Common">
       <HintPath>..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API, Version=0.0.0.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns, Version=1.1.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Windows, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
+      <HintPath>..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.ZooFlow, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
+      <HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

GUIs.Common/ControlHelper.vb

@@ -1,6 +1,5 @@
 Imports System.Windows.Forms
 Imports DigitalData.Modules.Base
-Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Logging
 
 Public Class ControlHelper

GUIs.Common/DataResultList/frmDataResultList.vb

@@ -7,7 +7,6 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.ZooFlow
-Imports DigitalData.Modules.Language
 Imports DevExpress.XtraPrinting
 Imports DigitalData.GUIs.Common
 Imports System.ComponentModel

GUIs.Common/DocumentResultList/Watcher.vb

@@ -3,7 +3,6 @@ Imports System.Text
 Imports System.Timers
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Base
-Imports DigitalData.Modules.Language.DateTimeEx
 
 Namespace DocumentResultList
     Public Class Watcher

GUIs.Common/DocumentResultList/Workspace.vb

@@ -5,8 +5,6 @@ Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Filesystem
-Imports DigitalData.Modules.Language
-
 Namespace DocumentResultList
     Public Class Workspace(Of TConfig)
         Inherits BaseClass

GUIs.Common/DocumentResultList/frmDocumentResultList.vb

@@ -182,7 +182,12 @@ Public Class frmDocumentResultList
 
             ' Initialize Viewer with GDPicture.NET License
             If Environment.Settings.GdPictureKey <> String.Empty Then
-                DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey)
+                DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        })
             End If
 
             ' Hide options relating to a filepath for zooflow

GUIs.Common/NNfrmNotification_Startup.vb

@@ -50,7 +50,12 @@ Public Class NNfrmNotification_Startup
 
     Private Sub frmNotification_Startup_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
-            DocumentViewer1.Init(LogConfig, GDPictureKey)
+            DocumentViewer1.Init(LogConfig, GDPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        })
             OperationMode = GetOperationMode()
             Client = Environment.Service.Client
             Me.Text = MyCaption

GUIs.Common/frmNotification_Startup.vb

@@ -55,7 +55,12 @@ Public Class frmNotification_Startup
 
     Private Sub frmNotification_Startup_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
-            DocumentViewer1.Init(LogConfig, _GDPictureKey)
+            DocumentViewer1.Init(LogConfig, _GDPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        })
             OperationMode = GetOperationMode()
             Client = _Environment.Service.Client
             Me.Text = _FormCaption

GUIs.GlobalIndexer/GlobalIndexer.vbproj

@@ -60,7 +60,7 @@
     <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

GUIs.Test.ADSyncTest/ADSyncTest.vbproj

@@ -49,19 +49,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Jobs">
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj

@@ -64,11 +64,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="GdPicture.NET.14">
       <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>

GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj

@@ -56,22 +56,22 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns">
-      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

GUIs.Test.TestGUI/App.config

@@ -25,7 +25,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
@@ -35,6 +35,46 @@
         <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

GUIs.Test.TestGUI/TestGUI.vbproj

@@ -53,6 +53,9 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -82,20 +85,25 @@
     <Reference Include="DigitalData.GUIs.Common">
       <HintPath>..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Encryption">
+      <HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Filesystem">
-      <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces">
       <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Jobs, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Jobs">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
@@ -110,25 +118,119 @@
     <Reference Include="DigitalData.Modules.Windream">
       <HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14">
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>..\GUIs.Test.ZUGFeRDTest\bin\Debug\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Mail">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Quartz, Version=3.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
       <HintPath>..\packages\Quartz.3.5.0\lib\net462\Quartz.dll</HintPath>
     </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -138,26 +240,50 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
@@ -383,11 +509,11 @@
     <None Include="Resources\actions_send.svg" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
 </Project>

GUIs.Test.TestGUI/frmDocView.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmDocView
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmDocView
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.Button2 = New System.Windows.Forms.Button()
@@ -28,7 +28,7 @@ Partial Class frmDocView
         Me.Button4 = New System.Windows.Forms.Button()
         Me.Button3 = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.txtfilepath = New System.Windows.Forms.TextBox()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.MyDocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer()
         Me.Panel1.SuspendLayout()
@@ -41,7 +41,7 @@ Partial Class frmDocView
         Me.Panel1.Controls.Add(Me.Button4)
         Me.Panel1.Controls.Add(Me.Button3)
         Me.Panel1.Controls.Add(Me.Button1)
-        Me.Panel1.Controls.Add(Me.TextBox1)
+        Me.Panel1.Controls.Add(Me.txtfilepath)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
@@ -93,25 +93,25 @@ Partial Class frmDocView
         Me.Button1.Text = "Open File"
         Me.Button1.UseVisualStyleBackColor = True
         '
-        'TextBox1
+        'txtfilepath
         '
-        Me.TextBox1.Location = New System.Drawing.Point(12, 12)
+        Me.txtfilepath.Location = New System.Drawing.Point(12, 12)
-        Me.TextBox1.Name = "TextBox1"
+        Me.txtfilepath.Name = "txtfilepath"
-        Me.TextBox1.Size = New System.Drawing.Size(524, 20)
+        Me.txtfilepath.Size = New System.Drawing.Size(524, 20)
-        Me.TextBox1.TabIndex = 0
+        Me.txtfilepath.TabIndex = 0
         '
         'OpenFileDialog1
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
-        'DocumentViewer1
+        'MyDocumentViewer
         '
         Me.MyDocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill
         Me.MyDocumentViewer.FileLoaded = False
         Me.MyDocumentViewer.Location = New System.Drawing.Point(0, 43)
-        Me.MyDocumentViewer.Name = "DocumentViewer1"
+        Me.MyDocumentViewer.Name = "MyDocumentViewer"
         Me.MyDocumentViewer.Size = New System.Drawing.Size(1079, 463)
-        Me.MyDocumentViewer.TabIndex = 0
+        Me.MyDocumentViewer.TabIndex = 2
         '
         'frmDocView
         '
@@ -127,14 +127,13 @@ Partial Class frmDocView
         Me.ResumeLayout(False)
 
     End Sub
-
-    Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer
     Friend WithEvents Panel1 As Panel
     Friend WithEvents Button1 As Button
-    Friend WithEvents TextBox1 As TextBox
+    Friend WithEvents txtfilepath As TextBox
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
     Friend WithEvents Button2 As Button
     Friend WithEvents Button3 As Button
     Friend WithEvents Button4 As Button
     Friend WithEvents Button5 As Button
+    Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer
 End Class

GUIs.Test.TestGUI/frmDocView.vb

@@ -5,16 +5,17 @@ Imports GdPicture14
 Public Class frmDocView
     Private LogConfig As LogConfig
 
-    Private Const GDPICTURE_KEY = "21182889975216572111813147150675976632"
+    Private Const GDPICTURE_KEY = "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q=="
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        If String.IsNullOrEmpty(TextBox1.Text) Then
+        If String.IsNullOrEmpty(txtfilepath.Text) Then
             If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
-                TextBox1.Text = OpenFileDialog1.FileName
+                txtfilepath.Text = OpenFileDialog1.FileName
-                MyDocumentViewer.LoadFile(TextBox1.Text)
+                MyDocumentViewer.LoadFile(txtfilepath.Text)
+                txtfilepath.Text = ""
             End If
         Else
-            MyDocumentViewer.LoadFile(TextBox1.Text)
+            MyDocumentViewer.LoadFile(txtfilepath.Text)
         End If
 
     End Sub
@@ -24,13 +25,13 @@ Public Class frmDocView
         MyDocumentViewer.Init(LogConfig, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
             .ShowPrintButton = False,
             .ShowRotateButton = False,
-            .ShowFlipButton = False,
+            .ShowFlipButton = False
-            .ShowSettingButton = False
         })
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         MyDocumentViewer.Done()
+        txtfilepath.Text = ""
     End Sub
 
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
@@ -47,7 +48,7 @@ Public Class frmDocView
         licenseManager.RegisterKEY(GDPICTURE_KEY)
 
         Dim oPDFConverter = New PDFConverter(LogConfig)
-        Dim oResult = oPDFConverter.ConvertPDFADocumentToPDFDocument(TextBox1.Text, TextBox1.Text & ".cloned.pdf")
+        Dim oResult = oPDFConverter.ConvertPDFADocumentToPDFDocument(txtfilepath.Text, txtfilepath.Text & ".cloned.pdf")
 
         If oResult = True Then
             MsgBox("Document was successfully cloned!")

GUIs.Test.TestGUI/packages.config

@@ -1,13 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net461" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net472" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
   <package id="Quartz" version="3.5.0" targetFramework="net462" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
+  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net461" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
+  <package id="System.Management" version="8.0.0" targetFramework="net462" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

GUIs.Test.ZUGFeRDTest/App.config

@@ -83,10 +83,6 @@
         <assemblyIdentity name="IKVM.OpenJDK.Jdbc" publicKeyToken="13235d27fcbfff58" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -111,10 +107,6 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />

GUIs.Test.ZUGFeRDTest/Form1.Designer.vb

@@ -25,23 +25,22 @@ Partial Class Form1
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.btRunJob = New System.Windows.Forms.Button()
         Me.ListBox1 = New System.Windows.Forms.ListBox()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btValidateSerializePDF = New System.Windows.Forms.Button()
-        Me.Button3 = New System.Windows.Forms.Button()
+        Me.btValidateSerializeParseProps = New System.Windows.Forms.Button()
-        Me.Button4 = New System.Windows.Forms.Button()
+        Me.btCreateMD5Checksum = New System.Windows.Forms.Button()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.ButtonValidateXMLOnly = New System.Windows.Forms.Button()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.Button7 = New System.Windows.Forms.Button()
+        Me.btExtractPDFAttachments = New System.Windows.Forms.Button()
         Me.GroupBox3 = New System.Windows.Forms.GroupBox()
         Me.txtMD5Checksum = New System.Windows.Forms.TextBox()
         Me.txtPropName = New System.Windows.Forms.TextBox()
         Me.GroupBox4 = New System.Windows.Forms.GroupBox()
-        Me.Button6 = New System.Windows.Forms.Button()
+        Me.btFindExtractXMLValue = New System.Windows.Forms.Button()
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
-        Me.Button5 = New System.Windows.Forms.Button()
+        Me.btWriteBinary = New System.Windows.Forms.Button()
         Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog()
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.GroupBox1.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
         Me.GroupBox3.SuspendLayout()
@@ -73,43 +72,43 @@ Partial Class Form1
         Me.ListBox1.Size = New System.Drawing.Size(532, 602)
         Me.ListBox1.TabIndex = 1
         '
-        'Button2
+        'btValidateSerializePDF
         '
-        Me.Button2.Location = New System.Drawing.Point(6, 19)
+        Me.btValidateSerializePDF.Location = New System.Drawing.Point(6, 19)
-        Me.Button2.Name = "Button2"
+        Me.btValidateSerializePDF.Name = "btValidateSerializePDF"
-        Me.Button2.Size = New System.Drawing.Size(246, 23)
+        Me.btValidateSerializePDF.Size = New System.Drawing.Size(246, 23)
-        Me.Button2.TabIndex = 2
+        Me.btValidateSerializePDF.TabIndex = 2
-        Me.Button2.Text = "Validate and Serialize PDF"
+        Me.btValidateSerializePDF.Text = "Validate and Serialize PDF"
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btValidateSerializePDF.UseVisualStyleBackColor = True
         '
-        'Button3
+        'btValidateSerializeParseProps
         '
-        Me.Button3.Location = New System.Drawing.Point(6, 48)
+        Me.btValidateSerializeParseProps.Location = New System.Drawing.Point(6, 48)
-        Me.Button3.Name = "Button3"
+        Me.btValidateSerializeParseProps.Name = "btValidateSerializeParseProps"
-        Me.Button3.Size = New System.Drawing.Size(246, 23)
+        Me.btValidateSerializeParseProps.Size = New System.Drawing.Size(246, 23)
-        Me.Button3.TabIndex = 3
+        Me.btValidateSerializeParseProps.TabIndex = 3
-        Me.Button3.Text = "Validate and Serialize PDF and Parse Props"
+        Me.btValidateSerializeParseProps.Text = "Validate and Serialize PDF and Parse Props"
-        Me.Button3.UseVisualStyleBackColor = True
+        Me.btValidateSerializeParseProps.UseVisualStyleBackColor = True
         '
-        'Button4
+        'btCreateMD5Checksum
         '
-        Me.Button4.Location = New System.Drawing.Point(6, 19)
+        Me.btCreateMD5Checksum.Location = New System.Drawing.Point(6, 19)
-        Me.Button4.Name = "Button4"
+        Me.btCreateMD5Checksum.Name = "btCreateMD5Checksum"
-        Me.Button4.Size = New System.Drawing.Size(221, 23)
+        Me.btCreateMD5Checksum.Size = New System.Drawing.Size(221, 23)
-        Me.Button4.TabIndex = 4
+        Me.btCreateMD5Checksum.TabIndex = 4
-        Me.Button4.Text = "Create MD5 Checksum for PDF"
+        Me.btCreateMD5Checksum.Text = "Create MD5 Checksum for PDF"
-        Me.Button4.UseVisualStyleBackColor = True
+        Me.btCreateMD5Checksum.UseVisualStyleBackColor = True
         '
         'GroupBox1
         '
         Me.GroupBox1.Controls.Add(Me.ButtonValidateXMLOnly)
         Me.GroupBox1.Controls.Add(Me.btRunJob)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 58)
+        Me.GroupBox1.Location = New System.Drawing.Point(12, 12)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(360, 92)
         Me.GroupBox1.TabIndex = 7
         Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Run Job like in ZUGFeRD Service"
+        Me.GroupBox1.Text = "Run Job like in eInvoice Service"
         '
         'ButtonValidateXMLOnly
         '
@@ -122,28 +121,28 @@ Partial Class Form1
         '
         'GroupBox2
         '
-        Me.GroupBox2.Controls.Add(Me.Button2)
+        Me.GroupBox2.Controls.Add(Me.btValidateSerializePDF)
-        Me.GroupBox2.Controls.Add(Me.Button7)
+        Me.GroupBox2.Controls.Add(Me.btExtractPDFAttachments)
-        Me.GroupBox2.Controls.Add(Me.Button3)
+        Me.GroupBox2.Controls.Add(Me.btValidateSerializeParseProps)
-        Me.GroupBox2.Location = New System.Drawing.Point(12, 156)
+        Me.GroupBox2.Location = New System.Drawing.Point(12, 110)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(360, 109)
+        Me.GroupBox2.Size = New System.Drawing.Size(360, 155)
         Me.GroupBox2.TabIndex = 8
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
         '
-        'Button7
+        'btExtractPDFAttachments
         '
-        Me.Button7.Location = New System.Drawing.Point(6, 77)
+        Me.btExtractPDFAttachments.Location = New System.Drawing.Point(6, 77)
-        Me.Button7.Name = "Button7"
+        Me.btExtractPDFAttachments.Name = "btExtractPDFAttachments"
-        Me.Button7.Size = New System.Drawing.Size(246, 23)
+        Me.btExtractPDFAttachments.Size = New System.Drawing.Size(246, 23)
-        Me.Button7.TabIndex = 3
+        Me.btExtractPDFAttachments.TabIndex = 3
-        Me.Button7.Text = "Extract PDF Attachments"
+        Me.btExtractPDFAttachments.Text = "Extract PDF Attachments"
-        Me.Button7.UseVisualStyleBackColor = True
+        Me.btExtractPDFAttachments.UseVisualStyleBackColor = True
         '
         'GroupBox3
         '
-        Me.GroupBox3.Controls.Add(Me.Button4)
+        Me.GroupBox3.Controls.Add(Me.btCreateMD5Checksum)
         Me.GroupBox3.Controls.Add(Me.txtMD5Checksum)
         Me.GroupBox3.Location = New System.Drawing.Point(12, 271)
         Me.GroupBox3.Name = "GroupBox3"
@@ -170,27 +169,27 @@ Partial Class Form1
         '
         'GroupBox4
         '
-        Me.GroupBox4.Controls.Add(Me.Button6)
+        Me.GroupBox4.Controls.Add(Me.btFindExtractXMLValue)
         Me.GroupBox4.Controls.Add(Me.txtPropName)
         Me.GroupBox4.Location = New System.Drawing.Point(12, 362)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Size = New System.Drawing.Size(360, 80)
+        Me.GroupBox4.Size = New System.Drawing.Size(360, 122)
         Me.GroupBox4.TabIndex = 11
         Me.GroupBox4.TabStop = False
         Me.GroupBox4.Text = "GroupBox4"
         '
-        'Button6
+        'btFindExtractXMLValue
         '
-        Me.Button6.Location = New System.Drawing.Point(6, 19)
+        Me.btFindExtractXMLValue.Location = New System.Drawing.Point(6, 19)
-        Me.Button6.Name = "Button6"
+        Me.btFindExtractXMLValue.Name = "btFindExtractXMLValue"
-        Me.Button6.Size = New System.Drawing.Size(221, 23)
+        Me.btFindExtractXMLValue.Size = New System.Drawing.Size(221, 23)
-        Me.Button6.TabIndex = 11
+        Me.btFindExtractXMLValue.TabIndex = 11
-        Me.Button6.Text = "Find and Extract XML Path Value"
+        Me.btFindExtractXMLValue.Text = "Find and Extract XML Path Value"
-        Me.Button6.UseVisualStyleBackColor = True
+        Me.btFindExtractXMLValue.UseVisualStyleBackColor = True
         '
         'GroupBox5
         '
-        Me.GroupBox5.Controls.Add(Me.Button5)
+        Me.GroupBox5.Controls.Add(Me.btWriteBinary)
         Me.GroupBox5.Location = New System.Drawing.Point(12, 490)
         Me.GroupBox5.Name = "GroupBox5"
         Me.GroupBox5.Size = New System.Drawing.Size(360, 122)
@@ -198,35 +197,25 @@ Partial Class Form1
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "GroupBox5"
         '
-        'Button5
+        'btWriteBinary
         '
-        Me.Button5.Location = New System.Drawing.Point(6, 19)
+        Me.btWriteBinary.Location = New System.Drawing.Point(6, 19)
-        Me.Button5.Name = "Button5"
+        Me.btWriteBinary.Name = "btWriteBinary"
-        Me.Button5.Size = New System.Drawing.Size(221, 23)
+        Me.btWriteBinary.Size = New System.Drawing.Size(221, 23)
-        Me.Button5.TabIndex = 11
+        Me.btWriteBinary.TabIndex = 11
-        Me.Button5.Text = "Write Binary to PDF"
+        Me.btWriteBinary.Text = "Write Binary to PDF"
-        Me.Button5.UseVisualStyleBackColor = True
+        Me.btWriteBinary.UseVisualStyleBackColor = True
         '
         'OpenFileDialog2
         '
         Me.OpenFileDialog2.FileName = "OpenFileDialog2"
         Me.OpenFileDialog2.Filter = "XML files (*.xml)|*.xml"
         '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(18, 12)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(180, 23)
-        Me.Button1.TabIndex = 13
-        Me.Button1.Text = "Open Logpath"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
         'Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(916, 633)
-        Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.GroupBox5)
         Me.Controls.Add(Me.GroupBox4)
         Me.Controls.Add(Me.GroupBox3)
@@ -234,7 +223,7 @@ Partial Class Form1
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.ListBox1)
         Me.Name = "Form1"
-        Me.Text = "Form1"
+        Me.Text = "E-Invoice-TEST-Tool"
         Me.GroupBox1.ResumeLayout(False)
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox3.ResumeLayout(False)
@@ -249,21 +238,20 @@ Partial Class Form1
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
     Friend WithEvents btRunJob As Button
     Friend WithEvents ListBox1 As ListBox
-    Friend WithEvents Button2 As Button
+    Friend WithEvents btValidateSerializePDF As Button
-    Friend WithEvents Button3 As Button
+    Friend WithEvents btValidateSerializeParseProps As Button
-    Friend WithEvents Button4 As Button
+    Friend WithEvents btCreateMD5Checksum As Button
     Friend WithEvents txtMD5Checksum As TextBox
     Friend WithEvents GroupBox1 As GroupBox
     Friend WithEvents GroupBox2 As GroupBox
     Friend WithEvents GroupBox3 As GroupBox
     Friend WithEvents txtPropName As TextBox
     Friend WithEvents GroupBox4 As GroupBox
-    Friend WithEvents Button6 As Button
+    Friend WithEvents btFindExtractXMLValue As Button
-    Friend WithEvents Button7 As Button
+    Friend WithEvents btExtractPDFAttachments As Button
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
     Friend WithEvents GroupBox5 As GroupBox
-    Friend WithEvents Button5 As Button
+    Friend WithEvents btWriteBinary As Button
     Friend WithEvents ButtonValidateXMLOnly As Button
     Friend WithEvents OpenFileDialog2 As OpenFileDialog
-    Friend WithEvents Button1 As Button
 End Class

GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj

@@ -50,21 +50,16 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Interfaces">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Jobs, Version=1.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Jobs">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
@@ -76,9 +71,6 @@
     <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
-    </Reference>
     <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
       <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
     </Reference>
@@ -140,9 +132,9 @@
       <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+	<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+		<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
-    </Reference>
+	</Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -292,7 +284,7 @@
   <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>

GUIs.Test.ZUGFeRDTest/packages.config

@@ -13,7 +13,6 @@
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.1.0" targetFramework="net461" />
-  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
   <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
   <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />

Service.EDMIService/EDMIService.vbproj

@@ -79,10 +79,10 @@
       <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Filesystem">
-      <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Language">
-      <HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>

Service.JobRunner/JobRunner.vbproj

@@ -53,19 +53,19 @@
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Jobs, Version=1.8.6.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">

Services.EmailService/DDEmailService.vbproj

@@ -54,20 +54,16 @@
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Encryption, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Encryption">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Logging">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Messaging">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">

Services.EmailService/EmailService.vb

@@ -14,7 +14,7 @@ Public Class EmailService
     Private _ConfigManager As ConfigManager(Of Config)
     Private _Config As Config
 
-    ' Private _Firebird As Firebird
+    Private _Firebird As Firebird
     Private _MSSQL As MSSQLServer
     Private _MSSQL_Test As MSSQLServer
     Private _Encryption As EncryptionLegacy
@@ -79,7 +79,7 @@ Public Class EmailService
                 End If
             End If
 
-            _AnyDatabaseInitialized = _MSSQL?.DBInitialized Or _MSSQL_Test?.DBInitialized
+            _AnyDatabaseInitialized = _Firebird?._DBInitialized Or _MSSQL?.DBInitialized Or _MSSQL_Test?.DBInitialized
             _TempFiles = New TempFiles(_LogConfig)
             _TempFiles.Create()
             ' === Initialize Email ===
@@ -119,6 +119,7 @@ Public Class EmailService
 
             If _AnyDatabaseInitialized Then
                 _Logger.Info("Starting Initial Run...")
+                _ConfigManager.Save()
                 _EmailQueue.RunWorkerAsync()
             End If
         Catch ex As Exception
@@ -198,9 +199,9 @@ Public Class EmailService
             Dim oAccounts As New List(Of EmailAccount)
 
             Select Case Database
-                'Case DatabaseType.Firebird
+                Case DatabaseType.Firebird
-                '    oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True"
+                    oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True"
-                '    oEmailAccounts = _Firebird.GetDatatable(oSQL)
+                    oEmailAccounts = _Firebird.GetDatatable(oSQL)
                 Case DatabaseType.MSSQL
                     oSQL = "SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1"
                     oEmailAccounts = MSSQLInstance.GetDatatable(oSQL)
@@ -275,10 +276,10 @@ Public Class EmailService
         End Try
     End Function
 
-    Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer)
+    Private Function SendEmailFrom(pDatabase As DatabaseType, pMSSQLInstance As MSSQLServer)
         Try
             Dim oSQL As String = String.Empty
-            Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(Database, MSSQLInstance)
+            Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(pDatabase, pMSSQLInstance)
             Dim oEmailQueue As DataTable = Nothing
 
             If IsNothing(oEmailAccounts) Then
@@ -291,19 +292,19 @@ Public Class EmailService
                 Return False
             End If
 
-            Select Case Database
+            Select Case pDatabase
-                'Case DatabaseType.Firebird
+                Case DatabaseType.Firebird
-                '    oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
+                    oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
-                '    oEmailQueue = _Firebird.GetDatatable(oSQL)
+                    oEmailQueue = _Firebird.GetDatatable(oSQL)
                 Case DatabaseType.MSSQL
                     If My.Settings.MSSQL_SELECT <> String.Empty Then
                         _Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
                         oSQL = My.Settings.MSSQL_SELECT
                     Else
-                        oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
+                        oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> '' ORDER BY GUID"
                     End If
 
-                    oEmailQueue = MSSQLInstance.GetDatatable(oSQL)
+                    oEmailQueue = pMSSQLInstance.GetDatatable(oSQL)
             End Select
 
             If IsNothing(oEmailQueue) Then
@@ -326,7 +327,7 @@ Public Class EmailService
 
                     Dim oAccountQueue As DataRow()
 
-                    Select Case Database
+                    Select Case pDatabase
                         Case DatabaseType.Firebird
                             oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC")
                         Case Else
@@ -339,7 +340,7 @@ Public Class EmailService
                         Continue For
                     End If
 
-                    _Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count)
+                    _Logger.Info("Preparing to send [{0}] mails for Email-Account [{1}]", oAccountQueue.Count, oAccount.Guid)
 
                     ' ======= Initialize Sender =======
 
@@ -356,7 +357,7 @@ Public Class EmailService
                     Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(oAccount.Server, oAccount.Port, oAccount.Username, oAccount.Password, oAccount.AuthType, oOptions)
 
                     If oResult.Connected = False Then
-                        _Logger.Warn("Could not connect to server. Skipping.")
+                        _Logger.Warn("Could not connect to server! (Method: Mail.MailSession.SessionInfo) # Skipping...")
                         Continue For
 
                     End If
@@ -379,7 +380,7 @@ Public Class EmailService
                         Dim ATT1_RELATED_ID = String.Empty
                         Dim ATT1_REL_TYPE = String.Empty
 
-                        Select Case Database
+                        Select Case pDatabase
                             Case DatabaseType.Firebird
                                 oGuid = oRow.Item("GUID")
 
@@ -421,15 +422,11 @@ Public Class EmailService
                         If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then
                             _Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...")
                             If ATT1_REL_TYPE = "EnvelopeResult" Then
-                                GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, MSSQLInstance)
+                                GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, pMSSQLInstance)
                             End If
                             If IsNothing(_AttachmentByteData) = False Then
                                 Dim oTempFolder = _TempFiles.TempPath
                                 Dim oTempFilename = String.Concat(oTempFolder, "\", $"SigningReport_{ATT1_RELATED_ID}.pdf")
-                                If Not Directory.Exists(oTempFolder) Then
-                                    Directory.CreateDirectory(oTempFolder)
-                                    _Logger.Info($"created directory [{oTempFolder}]!")
-                                End If
                                 Dim oFileFromByteData = CreateTempFileFromByte(oTempFilename)
                                 If Not IsNothing(oFileFromByteData) Then
                                     _Logger.Info($"oFileFromByteData is  [{oFileFromByteData}]!")
@@ -459,13 +456,13 @@ Public Class EmailService
                             oTotalSent.Add(oEmailTo)
                             oSuccessfulSent.Add(oEmailTo)
 
-                            Select Case Database
+                            Select Case pDatabase
-                                'Case DatabaseType.Firebird
+                                Case DatabaseType.Firebird
-                                '    oSQL = GetFirebirdUpdateString(oComment, oGuid)
+                                    oSQL = GetFirebirdUpdateString(oComment, oGuid)
-                                '    _Firebird.ExecuteNonQuery(oSQL)
+                                    _Firebird.ExecuteNonQuery(oSQL)
                                 Case DatabaseType.MSSQL
                                     oSQL = GetSQLUpdateString(oComment, oGuid)
-                                    MSSQLInstance.ExecuteNonQuery(oSQL)
+                                    pMSSQLInstance.ExecuteNonQuery(oSQL)
                             End Select
                             _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}")
 
@@ -473,7 +470,7 @@ Public Class EmailService
                             oTotalSent.Add(oEmailTo)
                             oFailedSent.Add(oEmailTo)
 
-                            Select Case Database
+                            Select Case pDatabase
                                 Case DatabaseType.MSSQL
                                     Dim oErrorMessage As String
                                     If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then
@@ -482,7 +479,7 @@ Public Class EmailService
                                         oErrorMessage = $"Could not sent email to email adress. Check log!"
                                     End If
                                     oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} "
-                                    MSSQLInstance.ExecuteNonQuery(oSQL)
+                                    pMSSQLInstance.ExecuteNonQuery(oSQL)
 
                             End Select
                         End If
@@ -565,11 +562,6 @@ Public Class EmailService
     End Sub
     Private Function CreateTempFileFromByte(ByVal sFileName As String) As String
         Try
-            Dim oTempFolder = _TempFiles.TempPath
-            If Not Directory.Exists(oTempFolder) Then
-                Directory.CreateDirectory(oTempFolder)
-                _Logger.Info($"created directory [{oTempFolder}]!")
-            End If
             If Not _AttachmentByteData Is Nothing Then
                 'Read image data into a file stream 
                 Using fs As New FileStream(sFileName, FileMode.OpenOrCreate, FileAccess.Write)

Services.EmailService/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.7.4.0")>
+<Assembly: AssemblyVersion("1.7.3.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.7.3.0")>

Services.LicenseService/DDEDMLicenseService.vbproj

@@ -50,11 +50,11 @@
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

Services.ZUGFeRDService/Config.vb

@@ -71,6 +71,8 @@
 
         Public Property AllowZugferd2x As Boolean = True
 
+        Public Property AllowZugferd23x As Boolean = True
+
         Public Property AllowPeppolBISBill3x As Boolean = False
     End Class
 End Class

Services.ZUGFeRDService/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("DDZUGFeRDService")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.8.9.0")>
+<Assembly: AssemblyTrademark("2.9.3.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.8.9.0")>
+<Assembly: AssemblyVersion("2.9.3.0")>
-<Assembly: AssemblyFileVersion("2.8.9.0")>
+<Assembly: AssemblyFileVersion("2.9.3.0")>

Services.ZUGFeRDService/ThreadRunner.vb

@@ -52,13 +52,14 @@ Public Class ThreadRunner
             .AllowXRechnung = _config.Config.Custom.AllowXRechnung,
             .AllowZugferd10 = _config.Config.Custom.AllowZugferd10,
             .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x,
+            .AllowZugferd23x = _config.Config.Custom.AllowZugferd23x,
             .AllowPeppolBISBill3x = _config.Config.Custom.AllowPeppolBISBill3x,
             .RejectionTemplateId = _config.Config.Custom.RejectionTemplateId,
             .GDPictureVersion = _config.Config.Custom.GDPictureVersion
         }
 
         oArgs = LoadFolderConfig(oArgs)
-        oArgs = LoadPropertyMap(oArgs)
+        oArgs = LoadPropertyMapListFor(oArgs)
 
         _logger.Debug("Custom Options:")
         _logger.Debug("ExceptionEmailAddress: [{0}]", oArgs.ExceptionEmailAddress)
@@ -171,34 +172,44 @@ Public Class ThreadRunner
         Return pArgs
     End Function
 
-    Private Function LoadPropertyMap(pArgs As WorkerArgs) As WorkerArgs
+    Private Function LoadPropertyMapListFor(Args As WorkerArgs) As WorkerArgs
-        Dim oSQL As String = $"SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH"
+        Try
-        Dim oResult As DataTable = _mssql.GetDatatable(oSQL)
+            Args.PropertyMapList.Clear()
 
-        For Each oRow As DataRow In oResult.Rows
+            Dim oSQL As String = $"SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH"
-            Dim oXmlPath As String = oRow.Item("XML_PATH")
+            Dim oResult As DataTable = _mssql.GetDatatable(oSQL)
-            Dim oTableName = oRow.Item("TABLE_NAME")
-            Dim oTableColumn = oRow.Item("TABLE_COLUMN")
-            Dim oDescription = oRow.Item("DESCRIPTION")
-            Dim oIsRequired = oRow.Item("IS_REQUIRED")
-            Dim oIsGrouped = oRow.Item("IS_GROUPED")
-            Dim oGroupScope = oRow.Item("GROUP_SCOPE")
-            Dim oSpecification = oRow.Item("SPECIFICATION")
-            Dim oItemType = oRow.Item("ITEM_TYPE")
 
-            pArgs.PropertyMap.Add(oXmlPath, New XmlItemProperty() With {
+            For Each oRow As DataRow In oResult.Rows
-                .Description = oDescription,
+                Dim xmlPath As String = oRow.Item("XML_PATH")
-                .TableName = oTableName,
+                Dim tableName = oRow.Item("TABLE_NAME")
-                .TableColumn = oTableColumn,
+                Dim tableColumn = oRow.Item("TABLE_COLUMN")
-                .IsRequired = oIsRequired,
+                Dim description = oRow.Item("DESCRIPTION")
-                .IsGrouped = oIsGrouped,
+                Dim isRequired = oRow.Item("IS_REQUIRED")
-                .GroupScope = oGroupScope,
+                Dim isGrouped = oRow.Item("IS_GROUPED")
-                .Specification = oSpecification,
+                Dim groupScope = oRow.Item("GROUP_SCOPE")
-                .XMLPath = oXmlPath.Replace(".Value", ""),
+                Dim specification = oRow.Item("SPECIFICATION")
-                .ItemType = oItemType
+                Dim oItemType = oRow.Item("ITEM_TYPE")
-            })
+                Dim oEN16931_ID = oRow.Item("EN16931_ID")
-        Next
 
-        Return pArgs
+                Args.PropertyMapList.Add(New XmlItemProperty() With {
+                    .XMLPath = xmlPath,
+                    .Description = description,
+                    .TableName = tableName,
+                    .TableColumn = tableColumn,
+                    .IsRequired = isRequired,
+                    .IsGrouped = isGrouped,
+                    .GroupScope = groupScope,
+                    .Specification = specification,
+                    .ItemType = oItemType,
+                    .EN16931_ID = oEN16931_ID
+                })
+            Next
+
+            Return Args
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return Args
+        End Try
     End Function
+
 End Class

WEBSERVICES/ZUGFeRDRESTService/Config.cs

@@ -25,6 +25,8 @@
 
         public bool AllowZugferd2x { get; set; } = true;
 
+        public bool AllowZugferd23x { get; set; } = true;
+
         public bool AllowPeppolBISBill3x { get; set; } = false;
 
     }

WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs

@@ -11,6 +11,8 @@ using static DigitalData.Modules.Interfaces.PropertyValues;
 using System.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
 using System.Xml.Linq;
+using Newtonsoft.Json.Linq;
+using System.Text.RegularExpressions;
 
 namespace ZUGFeRDRESTService.Controllers
 {
@@ -34,12 +36,15 @@ namespace ZUGFeRDRESTService.Controllers
         private readonly DigitalData.Modules.Filesystem.File _file;
 
         private readonly PropertyValues _props;
-        private readonly Dictionary<string, XmlItemProperty> _propertyMap = new Dictionary<string, XmlItemProperty>();
+        //private readonly Dictionary<string, XmlItemProperty> _propertyMap = new Dictionary<string, XmlItemProperty>();
+        private readonly List<XmlItemProperty> _propertyMapList = new List<XmlItemProperty>();
+        private readonly List<RejectionStringRow> _RecjectionMessageList = new List<RejectionStringRow>();
 
         private int _MaxFileSizeInMegabytes;
         private bool _AllowFacturX;
         private bool _AllowXRechnung;
         private bool _AllowZugferd2x;
+        private bool _AllowZugferd23x;
         private bool _AllowZugferd10;
         private bool _AllowPeppolBISBill3x;
 
@@ -60,7 +65,6 @@ namespace ZUGFeRDRESTService.Controllers
 
             _database = database;
             var oGDPictureKey = database.GetGDPictureKey();
-            var oPropertyMap = database.GetPropertyMap();
 
             _zugferd = new ZUGFeRDInterface(_logConfig, oGDPictureKey, new ZugferdOptions()
             {
@@ -68,26 +72,17 @@ namespace ZUGFeRDRESTService.Controllers
                 AllowXRechnung_Filename = _AllowXRechnung,
                 AllowZugferd_1_0_Schema = _AllowZugferd10,
                 AllowZugferd_2_x_Schema = _AllowZugferd2x,
-                AllowPeppol_3017_Schema = _AllowPeppolBISBill3x
+                AllowZugferd_2_3_x_Schema = _AllowZugferd23x,
+                AllowPeppol_3_x_Schema = _AllowPeppolBISBill3x
             });
             _props = new PropertyValues(_logConfig);
 
-            _logger.Debug("Property Map initial: [{0}] entries found.", oPropertyMap.Count);
+            var oPropertyMapList = database.GetPropertyMapList();
-
+            _propertyMapList.AddRange(oPropertyMapList);
-            if (_AllowZugferd10 == true) 
+            _logger.Debug("Property Map list initial: [{0}] entries found. [{1}] entries will be available.", oPropertyMapList.Count, _propertyMapList.Count);
-                _propertyMap = oPropertyMap.
-                    Where(kv => kv.Value.Specification == ZUGFERD_SPEC_10 || kv.Value.Specification == ZUGFERD_SPEC_DEFAULT).
-                    Concat(_propertyMap).
-                    ToDictionary(kv => kv.Key, kv => kv.Value);
-
-            if (_AllowZugferd2x == true)
-                _propertyMap = oPropertyMap.
-                    Where(kv => kv.Value.Specification == ZUGFERD_SPEC_2x).
-                    Concat(_propertyMap).
-                    ToDictionary(kv => kv.Key, kv => kv.Value);
-
-            _logger.Debug("Property Map filtered: [{0}] entries found.", _propertyMap.Count);
 
+            _RecjectionMessageList = database.GetRejectionMessageList();
+            
             _logger.Debug("Validation Controller initialized!");
         }
 
@@ -98,26 +93,32 @@ namespace ZUGFeRDRESTService.Controllers
 
             if (!bool.TryParse(oZugferdConfig["AllowFacturX"], out _AllowFacturX))
             {
-                _logger.Info("Configuration AllowFacturX was not set. Using default value [{0}]", false);
+                _logger.Info("Configuration AllowFacturX was not set. Using default value [{0}]", true);
-                _AllowFacturX = false;
+                _AllowFacturX = true;
             }
 
             if (!bool.TryParse(oZugferdConfig["AllowXRechnung"], out _AllowXRechnung))
             {
-                _logger.Info("Configuration AllowXRechnung was not set. Using default value [{0}]", false);
+                _logger.Info("Configuration AllowXRechnung was not set. Using default value [{0}]", true);
-                _AllowXRechnung = false;
+                _AllowXRechnung = true;
             }
 
             if (!bool.TryParse(oZugferdConfig["AllowZugferd2x"], out _AllowZugferd2x))
             {
-                _logger.Info("Configuration Zugferd2x was not set. Using default value [{0}]", false);
+                _logger.Info("Configuration Zugferd2x was not set. Using default value [{0}]", true);
-                _AllowZugferd2x = false;
+                _AllowZugferd2x = true;
+            }
+
+            if (!bool.TryParse(oZugferdConfig["AllowZugferd23x"], out _AllowZugferd23x))
+            {
+                _logger.Info("Configuration Zugferd23x was not set. Using default value [{0}]", true);
+                _AllowZugferd23x = true;
             }
 
             if (!bool.TryParse(oZugferdConfig["AllowZugferd10"], out _AllowZugferd10))
             {
-                _logger.Info("Configuration Zugferd10 was not set. Using default value [{0}]", true);
+                _logger.Info("Configuration Zugferd10 was not set. Using default value [{0}]", false);
-                _AllowZugferd10 = true;
+                _AllowZugferd10 = false;
             }
 
             if (!bool.TryParse(oZugferdConfig["AllowPeppolBISBill3x"], out _AllowPeppolBISBill3x))
@@ -164,7 +165,8 @@ namespace ZUGFeRDRESTService.Controllers
 
                     if (oFileSizeIsOK == false)
                     {
-                        throw new ZUGFeRDExecption(ErrorType.FileTooBig, "FileTooBig");
+                        //throw new ZUGFeRDExecption(ErrorType.FileTooBig, "FileTooBig");
+                        throw new ZUGFeRDExecption(ErrorCodes.FileSizeLimitReachedException, _MaxFileSizeInMegabytes.ToString(), string.Empty, "FileTooBig");
                     }
 
                     _logger.Info("Extracting ZUGFeRD Data from file [{0}]", file.FileName);
@@ -187,12 +189,13 @@ namespace ZUGFeRDRESTService.Controllers
 
                     _logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification);
 
-                    var oFilteredPropertyMap = _zugferd.FilterPropertyMap(_propertyMap, oZugferdResult.Specification); 
+                    var oFilteredPropertyMap = _zugferd.FilterPropertyMap(_propertyMapList, oZugferdResult.Specification); 
 
                     if (oFilteredPropertyMap.Count == 0)
                     {
                         _logger.Warn("No properties found in property map for specification [{0}]", oZugferdResult.Specification);
-                        throw new ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Unsupported Format");
+                        //throw new ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Unsupported Format");
+                        throw new ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, "Unsupported Format");
                     } 
                     else
                     {
@@ -216,14 +219,16 @@ namespace ZUGFeRDRESTService.Controllers
 
                     if (oPropertyResult.MissingProperties.Count > 0)
                     {
-                        throw new ZUGFeRDExecption(ErrorType.MissingProperties, "Missing Properties");
+                        //throw new ZUGFeRDExecption(ErrorType.MissingProperties, "Missing Properties");
+                        throw new ZUGFeRDExecption(ErrorCodes.MissingValueException, "Missing Properties");
                     }                   
 
                     Tuple<bool, string> oValidateResult = ValidateBuyerOrderReference(oPropertyResult.ValidProperties);
 
                     if (oValidateResult.Item1 == false)
                     {
-                        throw new ZUGFeRDExecption(ErrorType.UnknownError, "Unknown Error");
+                        //throw new ZUGFeRDExecption(ErrorType.UnknownError, "Unknown Error");
+                        throw new ZUGFeRDExecption(ErrorCodes.UnhandledException, "Unknown Error");
                     }
 
                     string oValidateResultString = oValidateResult.Item2;
@@ -257,28 +262,46 @@ namespace ZUGFeRDRESTService.Controllers
             {
                 _logger.Error(ex);
 
-                // Determine which message should be sent in the response
+                string oMessage;
-                string oMessage = ex.ErrorType switch
-                {
-                    ErrorType.NoValidFile => "Die hochgeladene Datei ist keine gültige Datei.",
-                    ErrorType.NoZugferd => "Die hochgeladene Datei ist keine ZUGFeRD-Rechnung.",
-                    ErrorType.NoValidZugferd => "Die hochgeladene Datei ist keine gültige ZUGFeRD-Rechnung.",
-                    ErrorType.MissingProperties => "Die hochgeladene Datei ist keine gültige ZUGFeRD-Rechnung, es fehlen einige Metadaten.",
-                    ErrorType.FileTooBig => string.Format("Die hochgeladene Datei überschreitet die zulässige Dateigröße [{0}].", _MaxFileSizeInMegabytes),
-                    ErrorType.UnsupportedFormat => "Die hochgeladene Datei enthält ein falsches oder nicht unterstütztes ZUGFeRD Format.",
-                    _ => "Die hochgeladene Datei kann nicht validiert werden.",
-                };
-
-                // Determine if any errors should be sent in the response
                 var oErrors = new List<string>();
-                switch (ex.ErrorType)
+                if (ex.ErrorCode != ErrorCodes.NotInUse)
                 {
-                    case ErrorType.MissingProperties:
+                    var rejectionCodeNumber = this.GetRejectionCodeNumber(ex.ErrorCode);
-                        oErrors.AddRange(from item in oPropertyResult.MissingProperties
+
-                                         select item.Description);
+                    // Der gesamte Ausgabetext muss anhand des ErrorCodes ermittelt werden 
-                        break;
+                    oMessage = this.GetRejectionMessage(rejectionCodeNumber);
-                    default:
+
-                        break;
+                    // Ersetze jetzt die Platzhalter @REPLACE_PARAM1 und @REPLACE_PARAM2
+                    if (!string.IsNullOrEmpty(ex.Param1) && oMessage.Contains("@REPLACE_PARAM1", StringComparison.OrdinalIgnoreCase))
+                    {
+                        oMessage = Regex.Replace(oMessage, "@REPLACE_PARAM1", ex.Param1, RegexOptions.IgnoreCase);
+                    }
+
+                    if (!string.IsNullOrEmpty(ex.Param2) && oMessage.Contains("@REPLACE_PARAM2", StringComparison.OrdinalIgnoreCase))
+                    {
+                        oMessage = Regex.Replace(oMessage, "@REPLACE_PARAM2", ex.Param2, RegexOptions.IgnoreCase);
+                    }
+
+                    // Der REJECTION-Code wird in alle Meldungen eingefügt.
+                    if (!string.IsNullOrEmpty(rejectionCodeNumber) && oMessage.Contains("@REJECTION_CODE", StringComparison.OrdinalIgnoreCase))
+                    {
+                        oMessage = Regex.Replace(oMessage, "@REJECTION_CODE", "Ablehnungscode: " + rejectionCodeNumber, RegexOptions.IgnoreCase);
+                    }
+
+                    // Determine if any errors should be sent in the response
+                    switch (ex.ErrorCode)
+                    {
+                        case ErrorCodes.MissingValueException:
+                            oErrors.AddRange(from item in oPropertyResult.MissingProperties
+                                             select (item.EN16931_ID + " (" + item.Description + ")"));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                else 
+                {
+                    oMessage = "Alte Logik. Meldung nicht gefunden";                
                 }
 
                 _logger.Info($"Responding with message: [{oMessage}]");
@@ -292,10 +315,14 @@ namespace ZUGFeRDRESTService.Controllers
             }
             catch (ValidationException ex)
             {
-                string oMessage = "Die hochgeladene Datei enthält ungültige Werte.";
+                var rejectionCodeNumber = this.GetRejectionCodeNumber(ex.ErrorCode);
+
+                // Der gesamte Ausgabetext muss anhand des ErrorCodes ermittelt werden 
+                string oMessage = this.GetRejectionMessage(rejectionCodeNumber);
+
                 List<string> oErrors = ex.ValidationErrors.Select(e =>
                 {
-                    return $"Element '{e.ElementName}' mit Wert '{e.ElementValue}': {e.ErrorMessage}";
+                    return $"Element '{e.ElementName}' mit Wert '{e.ElementValue}': {e.ErrorMessageDE}";
                 }).ToList();
 
                 return new ValidationResponse()
@@ -374,16 +401,39 @@ namespace ZUGFeRDRESTService.Controllers
         public bool InsertPropertyMap(ValidProperty pProperty, string pMessageId)
         {
             try
-            {             
+            {
+                if (pProperty.ItemType == 3)
+                {
+                    // Wir speichern keine Attachment-Werte in die DB
+                    return true;
+                }
+
+                if (pProperty.ItemType == 0 && string.IsNullOrEmpty(pProperty.Value.ToString()))
+                {
+                    // Leere Texte speichern wir nicht in der DB
+                    return true;
+                }
+
                 var oSql = $"INSERT INTO {pProperty.TableName} " +
                     "(REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, CREATEDWHO, SPEC_NAME, GROUP_COUNTER, IS_REQUIRED) VALUES " +
                     "(@REFERENCE_GUID, @ITEM_DESCRIPTION, @ITEM_VALUE, @CREATEDWHO, @SPEC_NAME, @GROUP_COUNTER, @IS_REQUIRED)";
 
+                string itemValue = string.Empty;
+                if (pProperty.Value.Length > 4000)
+                {
+                    itemValue = pProperty.Value.Substring(1, 4000);
+                    _logger.Warn("Value for field [{0}] is longer than 4000 characters, will be truncated!", pProperty.TableColumn);
+                }
+                else
+                {
+                    itemValue = pProperty.Value;
+                }
+                
                 var oParams = new SqlParameter[]
                 {
                     new SqlParameter("@REFERENCE_GUID", pMessageId),
                     new SqlParameter("@ITEM_DESCRIPTION", pProperty.Description),
-                    new SqlParameter("@ITEM_VALUE", pProperty.Value),
+                    new SqlParameter("@ITEM_VALUE", itemValue.Replace("'", "''")),
                     new SqlParameter("@CREATEDWHO", ADDED_WHO),
                     new SqlParameter("@GROUP_COUNTER", pProperty.GroupCounter),
                     new SqlParameter("@SPEC_NAME", pProperty.TableColumn),
@@ -402,5 +452,61 @@ namespace ZUGFeRDRESTService.Controllers
             }    
         }
 
+        /// <summary>
+        /// Ermittelt die Ausgabe-nachricht für einen Fehlercode 
+        /// </summary>
+        public string GetRejectionMessage(string pErrorCode)
+        {
+            _logger.Info("GetRejectionMessage() - errorCode.ToString(): '" + pErrorCode.ToString() + "'");
+
+            if (_RecjectionMessageList == null) return string.Empty;
+
+            // Sprache wird man vielleicht mal auswählen können
+            var language = "de-DE";
+            var searchTitle = "ZUGFERD_Rejection_" + pErrorCode + "_Web";
+
+            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) && i.Language == language).FirstOrDefault();
+            if (messageItem != null)
+            {
+                _logger.Info("GetRejectionMessage() - messageItem: '" + messageItem.String1 + "'");
+                return messageItem.String1;
+            }
+            else
+            {
+                _logger.Info("GetRejectionMessage() - Es wurde kein passender Text gefunden.");
+                return string.Empty;
+            }
+        }
+
+        private string GetRejectionCodeNumber(ErrorCodes rejectionCode)
+        {
+            switch (rejectionCode)
+            {
+                case ErrorCodes.ValidationException:
+                    return "20001";
+                case ErrorCodes.MD5HashException:
+                    return "20002";
+                case ErrorCodes.UnsupportedFerdException:
+                    return "20003";
+                case ErrorCodes.InvalidFerdException:
+                    return "20004";
+                case ErrorCodes.TooMuchFerdsException:
+                    return "20005";
+                case ErrorCodes.InvalidFerdNoXMLAttachmentFound:
+                    return "20006";
+                case ErrorCodes.MissingValueException:
+                    return "20007";
+                case ErrorCodes.FileSizeLimitReachedException:
+                    return "20008";
+                case ErrorCodes.OutOfMemoryException:
+                    return "20009";
+                case ErrorCodes.UnhandledException:
+                    return "20010";
+                case ErrorCodes.FileMoveException:
+                    return "20011";
+                default:
+                    return "20010";
+            }
+        }
     }
 }

WEBSERVICES/ZUGFeRDRESTService/Database.cs

@@ -5,6 +5,7 @@ using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
 using System.Data;
 using DigitalData.Modules.Logging;
+using System;
 
 namespace ZUGFeRDRESTService
 {
@@ -12,7 +13,8 @@ namespace ZUGFeRDRESTService
     {
         private DigitalData.Modules.Logging.Logger _Logger = null;
         private string _gdPictureKey = null;
-        private Dictionary<string, XmlItemProperty> _propertyMap = null;
+        private List<XmlItemProperty> _propertyMapList = null;
+        private List<RejectionStringRow> _RejectionStringList = null;
 
         private LogConfig _logConfig = null;
         private string _connString;
@@ -21,6 +23,7 @@ namespace ZUGFeRDRESTService
 
         private const string QUERY_GET_GDPICTURE_KEY = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'";
         private const string QUERY_GET_PROPERTY_MAP = "SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH";
+        private const string QUERY_GET_REJECTION_MESSAGES = "SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE CAPT_TYPE = 'RejectionCodeWeb'";
 
         public MSSQLServer MSSQL { get; set; }
 
@@ -47,38 +50,89 @@ namespace ZUGFeRDRESTService
             return _gdPictureKey;
         }
 
-        public Dictionary<string, XmlItemProperty> GetPropertyMap()
+        public List<XmlItemProperty> GetPropertyMapList()
         {
-            if (_propertyMap == null)
+            if (_propertyMapList == null)
             {
-                _Logger.Debug("Property map does not exist, creating.");
+                _Logger.Debug("Property map list does not exist, creating.");
 
-                _propertyMap = new Dictionary<string, XmlItemProperty>();
+                _propertyMapList = new List<XmlItemProperty>();
                 var oDatatable = MSSQL.GetDatatable(QUERY_GET_PROPERTY_MAP);
 
-                _Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows);
+                _Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows.Count);
 
                 foreach (DataRow oRow in oDatatable.Rows)
-                {                
+                {
-                    _propertyMap.Add(oRow["XML_PATH"].ToString(), new XmlItemProperty()
+                    _propertyMapList.Add(new XmlItemProperty()
-                    { 
+                    {
+                        XMLPath = oRow["XML_PATH"].ToString(),
                         Description = oRow["DESCRIPTION"].ToString(),
                         TableName = oRow["TABLE_NAME"].ToString(),
                         TableColumn = oRow["TABLE_COLUMN"].ToString(),
                         GroupScope = oRow["GROUP_SCOPE"].ToString(),
                         IsRequired = (bool)oRow["IS_REQUIRED"],
                         IsGrouped = (bool)oRow["IS_GROUPED"],
-                        Specification = oRow["SPECIFICATION"].ToString()
+                        Specification = oRow["SPECIFICATION"].ToString(),
+                        ItemType = oRow["ITEM_TYPE"] != null ? Convert.ToInt32(oRow["ITEM_TYPE"]) : 0,
+                        EN16931_ID = oRow["EN16931_ID"] != null ? oRow["EN16931_ID"].ToString() : "-"
                     });
                 }
-            } else
+            }
+            else
             {
-                _Logger.Debug("Property map already exists, returning.");
+                _Logger.Debug("Property map list already exists, returning.");
             }
 
-            _Logger.Debug("Returning Property Map with [{0}] entries.", _propertyMap.Count);
+            _Logger.Debug("Returning Property Map list with [{0}] entries.", _propertyMapList.Count);
 
-            return _propertyMap;
+            return _propertyMapList;
+        }
+
+        public List<RejectionStringRow> GetRejectionMessageList()
+        {
+            try
+            {
+                if (_RejectionStringList == null)
+                {
+                    var oDatatable = MSSQL.GetDatatable(QUERY_GET_REJECTION_MESSAGES);
+
+                    _Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows.Count);
+                    if (oDatatable != null && oDatatable.Rows.Count > 0)
+                    {
+                        _RejectionStringList = new List<RejectionStringRow>();
+                        foreach (DataRow oRow in oDatatable.Rows)
+                        {
+                            var newRejectionItem = new RejectionStringRow
+                            {
+                                Title = oRow["Title"].ToString(),
+                                ModuleName = oRow["Module"].ToString(),
+                                Caption = oRow["CAPT_TYPE"].ToString(),
+                                Language = oRow["Language"].ToString(),
+                                String1 = oRow["String1"].ToString()
+                            };
+                            _RejectionStringList.Add(newRejectionItem);
+                        }
+
+                        _Logger.Debug("Returning Rejections messages list with [{0}] entries.", _RejectionStringList.Count);
+                    }
+                    else
+                    {
+                        _RejectionStringList = null;
+                        _Logger.Warn("No Rejections messages found in Table TBDD_GUI_LANGUAGE_PHRASE with CAPT_TYPE = 'RejectionCodeWeb'!!!");
+                    }
+                }
+                else
+                {
+                    _Logger.Debug("Rejections messages list already exists, returning list with [{0}] entries.", _RejectionStringList.Count);
+                }
+            }
+            catch (Exception ex)
+            {
+                _RejectionStringList = null;
+                _Logger.Error("Database Error: [{0}]", ex);
+            }
+
+            return _RejectionStringList;
         }
     }
 }

WEBSERVICES/ZUGFeRDRESTService/IDatabase.cs

@@ -10,6 +10,9 @@ namespace ZUGFeRDRESTService
         public MSSQLServer MSSQL { get; set; }
 
         public string GetGDPictureKey();
-        public Dictionary<String, XmlItemProperty> GetPropertyMap();
+
+        public List<XmlItemProperty> GetPropertyMapList();
+
+        public List<RejectionStringRow> GetRejectionMessageList();
     }
 }

WEBSERVICES/ZUGFeRDRESTService/Properties/launchSettings.json

@@ -1,4 +1,21 @@
-{
+{
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "ZUGFeRDRESTService": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  },
   "$schema": "http://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -7,24 +24,5 @@
       "applicationUrl": "http://localhost:52235",
       "sslPort": 44388
     }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "ZUGFeRDRESTService": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "api/zugferdvalidation",
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
   }
-}
+}

WEBSERVICES/ZUGFeRDRESTService/appsettings.Development.json

@@ -6,16 +6,27 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
+  "AllowedHosts": "*",
   "Config": {
     "LogPath": "E:\\ZUGFeRDRESTService",
     "LogDebug": true,
     "Name": "ZUGFeRD REST API",
-    "MSSQLConnectionString": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd;",
+    "MSSQLConnectionString": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;",
     "Firebird": {
       "Datasource": "172.24.12.41",
       "Database": "172.24.12.41:E:\\DB\\Firebird\\Databases\\EDMI_TEMPLATE\\EDMI_MASTER.FDB",
       "Username": "SYSDBA",
       "Password": "dd"
-    }
+    },
+	"Zugferd": {
+      "AllowZugferd10": true,
+      "AllowZugferd2x": false,
+      "AllowZugferd23x": false,
+      "AllowFacturX": false,
+      "AllowXRechnung": false,
+      "AllowPeppolBISBill3x": false
+    },
+    "GDPictureVersion": "",
+    "MaxFileSizeInMegabytes": 25
   }
 }

WEBSERVICES/ZUGFeRDRESTService/appsettings.json

@@ -21,6 +21,7 @@
     "Zugferd": {
       "AllowZugferd10": true,
       "AllowZugferd2x": false,
+      "AllowZugferd23x": false,
       "AllowFacturX": false,
       "AllowXRechnung": false,
       "AllowPeppolBISBill3x": false