Handling in DocumentResultLsit

Refactored project references to use new DDModules paths and updated third-party DLL locations. Migrated GUIs.Test.EDMIBenchmark to NuGet-based dependency management, adding packages.config and binding redirects for key assemblies. Replaced Office COM interop with direct assembly references. Integrated GdPicture via NuGet and removed redundant hardcoded references. These changes improve maintainability, portability, and project structure.

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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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

@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" 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.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -39,7 +39,7 @@
       </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" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -24,7 +24,6 @@ Partial Class DocumentViewer
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         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.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar()
@@ -65,6 +64,7 @@ Partial Class DocumentViewer
         Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
         Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
         Me.lblInfo = New System.Windows.Forms.Label()
+        Me.GdViewer = New GdPicture14.GdViewer()
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -74,82 +74,6 @@ Partial Class DocumentViewer
         CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
-        'GdViewer
-        '
-        Me.GdViewer.AllowDropFile = False
-        Me.GdViewer.AnimateGIF = True
-        Me.GdViewer.AnnotationDropShadow = False
-        Me.GdViewer.AnnotationEnableMultiSelect = True
-        Me.GdViewer.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.GdViewer.AnnotationResizeRotateHandlesScale = 1.0!
-        Me.GdViewer.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.GdViewer.AutoScrollMargin = New System.Drawing.Size(0, 0)
-        Me.GdViewer.AutoScrollMinSize = New System.Drawing.Size(0, 0)
-        Me.GdViewer.BackColor = System.Drawing.SystemColors.AppWorkspace
-        Me.GdViewer.BackgroundImage = Nothing
-        Me.GdViewer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.GdViewer.ClipAnnotsToPageBounds = True
-        Me.GdViewer.ClipRegionsToPageBounds = True
-        Me.GdViewer.ContinuousViewMode = True
-        Me.GdViewer.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic
-        Me.GdViewer.DisplayQualityAuto = True
-        Me.GdViewer.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GdViewer.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter
-        Me.GdViewer.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter
-        Me.GdViewer.DrawPageBorders = True
-        Me.GdViewer.EnableDeferredPainting = True
-        Me.GdViewer.EnabledProgressBar = True
-        Me.GdViewer.EnableFuzzySearch = False
-        Me.GdViewer.EnableICM = False
-        Me.GdViewer.EnableMenu = True
-        Me.GdViewer.EnableMouseWheel = True
-        Me.GdViewer.EnableTextSelection = True
-        Me.GdViewer.ForceScrollBars = False
-        Me.GdViewer.ForceTemporaryMode = False
-        Me.GdViewer.ForeColor = System.Drawing.Color.Black
-        Me.GdViewer.Gamma = 1.0!
-        Me.GdViewer.HQAnnotationRendering = True
-        Me.GdViewer.IgnoreDocumentResolution = False
-        Me.GdViewer.KeepDocumentPosition = False
-        Me.GdViewer.Location = New System.Drawing.Point(0, 33)
-        Me.GdViewer.LockViewer = False
-        Me.GdViewer.MagnifierHeight = 90
-        Me.GdViewer.MagnifierWidth = 160
-        Me.GdViewer.MagnifierZoomX = 2.0!
-        Me.GdViewer.MagnifierZoomY = 2.0!
-        Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft
-        Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan
-        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeVerticalScroll
-        Me.GdViewer.Name = "GdViewer"
-        Me.GdViewer.PageBordersColor = System.Drawing.Color.Black
-        Me.GdViewer.PageBordersPenSize = 1
-        Me.GdViewer.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView
-        Me.GdViewer.PdfDisplayFormField = True
-        Me.GdViewer.PdfEnableFileLinks = True
-        Me.GdViewer.PdfEnableLinks = True
-        Me.GdViewer.PdfIncreaseTextContrast = False
-        Me.GdViewer.PdfShowDialogForPassword = True
-        Me.GdViewer.PdfShowOpenFileDialogForDecryption = True
-        Me.GdViewer.PdfVerifyDigitalCertificates = False
-        Me.GdViewer.PreserveViewRotation = True
-        Me.GdViewer.RectBorderColor = System.Drawing.Color.Black
-        Me.GdViewer.RectBorderSize = 1
-        Me.GdViewer.RectIsEditable = True
-        Me.GdViewer.RegionsAreEditable = True
-        Me.GdViewer.RenderGdPictureAnnots = True
-        Me.GdViewer.ScrollBars = True
-        Me.GdViewer.ScrollLargeChange = CType(50, Short)
-        Me.GdViewer.ScrollSmallChange = CType(1, Short)
-        Me.GdViewer.SilentMode = True
-        Me.GdViewer.Size = New System.Drawing.Size(841, 522)
-        Me.GdViewer.TabIndex = 0
-        Me.GdViewer.TabStop = False
-        Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
-        Me.GdViewer.Zoom = 1.0R
-        Me.GdViewer.ZoomCenterAtMousePosition = False
-        Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100
-        Me.GdViewer.ZoomStep = 25
-        '
         'OpenFileDialog
         '
         Me.OpenFileDialog.FileName = "OpenFileDialog1"
@@ -423,7 +347,7 @@ Partial Class DocumentViewer
         '
         'SpreadsheetControl1
         '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(31, 152)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(59, 181)
         Me.SpreadsheetControl1.MenuManager = Me.BarManager1
         Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
         Me.SpreadsheetControl1.ReadOnly = True
@@ -454,7 +378,7 @@ Partial Class DocumentViewer
         '
         'RichEditControl1
         '
-        Me.RichEditControl1.Location = New System.Drawing.Point(395, 238)
+        Me.RichEditControl1.Location = New System.Drawing.Point(385, 166)
         Me.RichEditControl1.MenuManager = Me.BarManager1
         Me.RichEditControl1.Name = "RichEditControl1"
         Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
@@ -463,22 +387,89 @@ Partial Class DocumentViewer
         '
         'lblInfo
         '
-        Me.lblInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.lblInfo.Location = New System.Drawing.Point(0, 0)
-        Me.lblInfo.AutoSize = True
-        Me.lblInfo.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblInfo.ForeColor = System.Drawing.Color.Red
-        Me.lblInfo.Location = New System.Drawing.Point(3, 533)
         Me.lblInfo.Name = "lblInfo"
-        Me.lblInfo.Size = New System.Drawing.Size(47, 15)
+        Me.lblInfo.Size = New System.Drawing.Size(100, 23)
-        Me.lblInfo.TabIndex = 10
+        Me.lblInfo.TabIndex = 0
-        Me.lblInfo.Text = "Infotext"
+        '
+        'GdViewer
+        '
+        Me.GdViewer.AllowDropFile = False
+        Me.GdViewer.AnimateGIF = True
+        Me.GdViewer.AnnotationDropShadow = True
+        Me.GdViewer.AnnotationEnableMultiSelect = True
+        Me.GdViewer.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.GdViewer.AnnotationResizeRotateHandlesScale = 1.0!
+        Me.GdViewer.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.GdViewer.AutoScrollMargin = New System.Drawing.Size(0, 0)
+        Me.GdViewer.AutoScrollMinSize = New System.Drawing.Size(0, 0)
+        Me.GdViewer.BackColor = System.Drawing.Color.Black
+        Me.GdViewer.BackgroundImage = Nothing
+        Me.GdViewer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.GdViewer.ClipAnnotsToPageBounds = True
+        Me.GdViewer.ClipRegionsToPageBounds = True
+        Me.GdViewer.ContinuousViewMode = True
+        Me.GdViewer.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic
+        Me.GdViewer.DisplayQualityAuto = True
+        Me.GdViewer.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter
+        Me.GdViewer.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter
+        Me.GdViewer.DrawPageBorders = True
+        Me.GdViewer.EnableDeferredPainting = True
+        Me.GdViewer.EnabledProgressBar = True
+        Me.GdViewer.EnableFuzzySearch = False
+        Me.GdViewer.EnableICM = False
+        Me.GdViewer.EnableMenu = True
+        Me.GdViewer.EnableMouseWheel = True
+        Me.GdViewer.EnableTextSelection = True
+        Me.GdViewer.ForceScrollBars = False
+        Me.GdViewer.ForceTemporaryMode = False
+        Me.GdViewer.ForeColor = System.Drawing.Color.Black
+        Me.GdViewer.Gamma = 1.0!
+        Me.GdViewer.HQAnnotationRendering = True
+        Me.GdViewer.IgnoreDocumentResolution = False
+        Me.GdViewer.KeepDocumentPosition = False
+        Me.GdViewer.Location = New System.Drawing.Point(290, 372)
+        Me.GdViewer.LockViewer = False
+        Me.GdViewer.MagnifierHeight = 90
+        Me.GdViewer.MagnifierWidth = 160
+        Me.GdViewer.MagnifierZoomX = 2.0!
+        Me.GdViewer.MagnifierZoomY = 2.0!
+        Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft
+        Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan
+        Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeZoom
+        Me.GdViewer.Name = "GdViewer"
+        Me.GdViewer.PageBordersColor = System.Drawing.Color.Black
+        Me.GdViewer.PageBordersPenSize = 1
+        Me.GdViewer.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView
+        Me.GdViewer.PdfDisplayFormField = True
+        Me.GdViewer.PdfEnableFileLinks = True
+        Me.GdViewer.PdfEnableLinks = True
+        Me.GdViewer.PdfIncreaseTextContrast = False
+        Me.GdViewer.PdfShowDialogForPassword = True
+        Me.GdViewer.PdfShowOpenFileDialogForDecryption = True
+        Me.GdViewer.PdfVerifyDigitalCertificates = False
+        Me.GdViewer.PreserveViewRotation = True
+        Me.GdViewer.RectBorderColor = System.Drawing.Color.Black
+        Me.GdViewer.RectBorderSize = 1
+        Me.GdViewer.RectIsEditable = True
+        Me.GdViewer.RegionsAreEditable = True
+        Me.GdViewer.RenderGdPictureAnnots = True
+        Me.GdViewer.ScrollBars = True
+        Me.GdViewer.ScrollLargeChange = CType(50, Short)
+        Me.GdViewer.ScrollSmallChange = CType(1, Short)
+        Me.GdViewer.SilentMode = True
+        Me.GdViewer.Size = New System.Drawing.Size(128, 128)
+        Me.GdViewer.TabIndex = 0
+        Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
+        Me.GdViewer.Zoom = 1.0R
+        Me.GdViewer.ZoomCenterAtMousePosition = False
+        Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100
+        Me.GdViewer.ZoomStep = 25
         '
         'DocumentViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackColor = System.Drawing.SystemColors.ControlLightLight
-        Me.Controls.Add(Me.lblInfo)
         Me.Controls.Add(Me.RichEditControl1)
         Me.Controls.Add(Me.lbFileNotLoaded)
         Me.Controls.Add(Me.SpreadsheetControl1)

Controls.DocumentViewer/DocumentViewer.resx

@@ -123,9 +123,6 @@
   <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>285, 22</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="buttonPrint.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -164,6 +161,26 @@
         NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
         OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
         LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+        Cjwvc3ZnPgs=
 </value>
   </data>
   <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -202,6 +219,9 @@
         OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
   <data name="btnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@@ -226,26 +246,6 @@
         ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
         LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
         QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
-        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
-        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
-        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
-        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
-        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
-        Cjwvc3ZnPgs=
 </value>
   </data>
   <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

Controls.DocumentViewer/DocumentViewer.vb

@@ -66,6 +66,8 @@ Public Class DocumentViewer
     Private _TempFiles As New List(Of String)
 
     Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load
+        ' Ensure search is initialized once the control (and GdViewer) exists
+        EnsureSearchInitialized()
         UpdateMainUi()
     End Sub
     'hallo
@@ -110,7 +112,8 @@ Public Class DocumentViewer
             _licenseKey = pLicenseKey
             _licenseManager.RegisterKEY(_licenseKey)
             _Annotations = New Annotations(pLogConfig)
-            _Search = New Search(pLogConfig, GdViewer)
+            ' Defer creating Search until GdViewer is ready
+            EnsureSearchInitialized()
             _ToolbarSettings = pToolbarSettings
 
             Dim oConfigPath = ConfigPath()
@@ -122,6 +125,17 @@ Public Class DocumentViewer
         End Try
     End Function
 
+    ' Create the Search helper only when both the log config and the GdViewer control exist
+    Private Sub EnsureSearchInitialized()
+        Try
+            If _Search Is Nothing AndAlso _logConfig IsNot Nothing AndAlso GdViewer IsNot Nothing Then
+                _Search = New Search(_logConfig, GdViewer)
+            End If
+        Catch ex As Exception
+            _logger?.Error(ex)
+        End Try
+    End Sub
+
     ''' <summary>
     ''' Load a file from a path and display it
     ''' </summary>
@@ -223,7 +237,17 @@ Public Class DocumentViewer
 
     Public Sub CloseDocument()
         Try
-            GdViewer.CloseDocument()
+            ' Null-sicher schließen
+            If GdViewer IsNot Nothing Then
+                Try
+                    GdViewer.CloseDocument()
+                Catch exInner As Exception
+                    _logger?.Warn("Fehler beim Schließen von GdViewer")
+                    _logger?.Error(exInner)
+                End Try
+            Else
+                _logger?.Debug("CloseDocument: GdViewer ist Nothing – nichts zu schließen")
+            End If
 
             _FileInfo = Nothing
             _FilePath = Nothing
@@ -299,23 +323,23 @@ Public Class DocumentViewer
         GdViewer.Focus()
         UpdateMainUi()
     End Sub
-    Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFirstPage.ItemClick
+    Private Sub BtnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFirstPage.ItemClick
         GdViewer.DisplayFirstPage()
     End Sub
 
-    Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrevPage.ItemClick
+    Private Sub BtnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrevPage.ItemClick
         GdViewer.DisplayPreviousPage()
     End Sub
 
-    Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
+    Private Sub BtnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
         GdViewer.DisplayNextPage()
     End Sub
 
-    Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick
+    Private Sub BtnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick
         GdViewer.DisplayLastPage()
     End Sub
 
-    Private Sub tbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles txtCurrentPage.EditValueChanged
+    Private Sub TbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles txtCurrentPage.EditValueChanged
         Dim page As Integer = 0
         If Integer.TryParse(txtCurrentPage.EditValue, page) Then
             If page > 0 And page <= GdViewer.PageCount Then
@@ -352,11 +376,11 @@ Public Class DocumentViewer
         GdViewer.PrintDialog()
     End Sub
 
-    Private Sub btnRotateLeft_Click(sender As Object, e As EventArgs) Handles buttonRotateLeft.ItemClick
+    Private Sub BtnRotateLeft_Click(sender As Object, e As EventArgs) Handles buttonRotateLeft.ItemClick
         GdViewer.Rotate(RotateFlipType.Rotate270FlipNone)
     End Sub
 
-    Private Sub btnRotateRight_Click(sender As Object, e As EventArgs) Handles buttonRotateRight.ItemClick
+    Private Sub BtnRotateRight_Click(sender As Object, e As EventArgs) Handles buttonRotateRight.ItemClick
         GdViewer.Rotate(RotateFlipType.Rotate90FlipNone)
     End Sub
 
@@ -381,7 +405,7 @@ Public Class DocumentViewer
         End If
     End Sub
 
-    Private Sub btnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonSettings.ItemClick
+    Private Sub BtnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonSettings.ItemClick
         Using frmSettings As New frmViewerSettings(GdViewer)
             frmSettings.ShowDialog(Me)
         End Using
@@ -480,6 +504,14 @@ Public Class DocumentViewer
             SpreadsheetControl1.Dock = DockStyle.None
             RichEditControl1.Dock = DockStyle.None
 
+            Dim override_Spreadsheet As Boolean = False
+            If oExtension.ToLower = ".xlsx" Then
+                If oFileInfo.Length > 15000 Then
+                    _logger.Info("Override")
+                    override_Spreadsheet = True
+                End If
+            End If
+
             If ViewOverride = "Richtext" Then
                 RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
                 RichEditControl1.Visible = True
@@ -489,6 +521,16 @@ Public Class DocumentViewer
                 _ViewerMode = ViewerMode.Richtext
                 lblInfo.Visible = True
                 lblInfo.Text = "This docx-file contains a generic error and will be displayed in a reduced viewer. Please try to open the file in WORD"
+            ElseIf override_Spreadsheet = True Then
+                Dim oFormat = GetSpreadsheetFormat(oExtension)
+                SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+
+                Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                oRange.AutoFitColumns()
+
+                SpreadsheetControl1.Visible = True
+                GdViewer.Visible = False
+                SpreadsheetControl1.Dock = DockStyle.Fill
             Else
                 _ViewOverride = ""
                 Select Case oExtension.ToUpper
@@ -555,15 +597,88 @@ Public Class DocumentViewer
         End Try
     End Function
 
+
+    ' Ensures the embedded GdViewer control exists and is added to the visual tree
+    Private Function EnsureViewerReady() As Boolean
+        Try
+            ' If the control field is Nothing (e.g., designer not yet created), try to lazy-create and add it
+            If GdViewer Is Nothing Then
+                ' Attempt to find an existing instance by name in Controls collection
+                Dim existing = Me.Controls.OfType(Of GdPicture14.GdViewer)().FirstOrDefault()
+                If existing IsNot Nothing Then
+                    ' Assign the designer field via reflection if needed, otherwise use it directly
+                    GdViewer = existing
+                Else
+                    ' Last resort: create a new viewer and add it
+                    Dim viewer = New GdPicture14.GdViewer()
+                    viewer.Dock = DockStyle.Fill
+                    Me.Controls.Add(viewer)
+                    GdViewer = viewer
+                End If
+            End If
+
+            Return GdViewer IsNot Nothing
+        Catch ex As Exception
+            _logger?.Error(ex)
+            Return False
+        End Try
+    End Function
+
     Private Sub FitToPage()
-        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
+        If Not GdViewer Is Nothing Then
+            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
+        End If
     End Sub
 
     Private Sub FitToWidth()
-        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+        If Not GdViewer Is Nothing Then
+            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+        End If
+
     End Sub
 
     Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
+
+        Try
+
+            SpreadsheetControl1.Visible = False
+            SpreadsheetControl1.Dock = DockStyle.None
+
+            Select Case Extension.ToUpper
+
+                Case ".CSV"
+                    SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
+
+                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                    oRange.AutoFitColumns()
+
+                    SpreadsheetControl1.Visible = True
+                    SpreadsheetControl1.Dock = DockStyle.Fill
+
+                Case Else
+                    If Not GdViewer Is Nothing Then
+                        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                        If Viewer_ForceTemporaryMode = True Then
+                            GdViewer.ForceTemporaryMode = True
+                        End If
+                        GdViewer.AnnotationDropShadow = True
+
+                        GdViewer.DisplayFromStream(Stream)
+                    End If
+
+
+            End Select
+
+            UpdateMainUi()
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+    Private Function StreamFile(Stream As Stream, Extension As String) As Boolean
         Try
 
             SpreadsheetControl1.Visible = False
@@ -583,9 +698,7 @@ Public Class DocumentViewer
                 Case Else
                     GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                    If Viewer_ForceTemporaryMode = True Then
+                    GdViewer.ForceTemporaryMode = True
-                        GdViewer.ForceTemporaryMode = True
-                    End If
                     GdViewer.AnnotationDropShadow = True
 
                     GdViewer.DisplayFromStream(Stream)
@@ -703,18 +816,21 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnSearch2_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnSearch2.ItemClick
-        If Not String.IsNullOrEmpty(txtSearch.EditValue) Then
+        EnsureSearchInitialized()
+        If _Search IsNot Nothing AndAlso Not String.IsNullOrEmpty(txtSearch.EditValue) Then
             _Search.SearchAll(txtSearch.EditValue?.ToString)
 
         End If
     End Sub
 
     Private Sub btnPrevHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnPrevHighlight.ItemClick
-        _Search.PrevHighlight()
+        EnsureSearchInitialized()
+        _Search?.PrevHighlight()
     End Sub
 
     Private Sub btnNextHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnNextHighlight.ItemClick
-        _Search.NextHighlight()
+        EnsureSearchInitialized()
+        _Search?.NextHighlight()
     End Sub
 
     Private Sub txtSearch_EditValueChanged(sender As Object, e As EventArgs) Handles txtSearch.EditValueChanged

Controls.DocumentViewer/DocumentViewer.vbproj

@@ -160,15 +160,9 @@
       <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="IndexRange, Version=1.0.3.0, Culture=neutral, PublicKeyToken=35e6a3c4212514c6, processorArchitecture=MSIL">
-      <HintPath>..\packages\IndexRange.1.0.3\lib\net45\IndexRange.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.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="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>
@@ -179,8 +173,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=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenMcdf.3.0.0\lib\netstandard2.0\OpenMcdf.dll</HintPath>
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -200,8 +194,8 @@
     <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=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -234,8 +228,8 @@
     <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">
+    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
+      <HintPath>..\packages\System.Text.Json.8.0.6\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>
@@ -271,9 +265,7 @@
     <Compile Include="DocumentViewer.Designer.vb">
       <DependentUpon>DocumentViewer.vb</DependentUpon>
     </Compile>
-    <Compile Include="DocumentViewer.vb">
+    <Compile Include="DocumentViewer.vb" />
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="frmViewerSettings.Designer.vb">
       <DependentUpon>frmViewerSettings.vb</DependentUpon>
     </Compile>

Controls.DocumentViewer/My Project/AssemblyInfo.vb

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

Controls.DocumentViewer/packages.config

@@ -5,22 +5,20 @@
   <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="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="8.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.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="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="System.Buffers" version="4.6.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.Collections.Immutable" version="8.0.0" targetFramework="net462" />
   <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
   <package id="System.Management" version="8.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />
@@ -28,7 +26,7 @@
   <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.Text.Json" version="8.0.6" 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.RegexEditor/RegexEditor.vb

@@ -1,7 +1,6 @@
 Imports System.ComponentModel
 Imports System.Drawing.Design
 Imports System.Windows.Forms.Design
-Imports DigitalData.Modules.Language
 
 Public Class RegexEditor
     Inherits UITypeEditor
@@ -12,7 +11,7 @@ Public Class RegexEditor
 
     Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
         Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
-        Dim oRegexString As String = Utils.NotNull(value, String.Empty)
+        Dim oRegexString As String = If(value IsNot Nothing, value.ToString(), String.Empty)
 
         If oService IsNot Nothing Then
             Using oform As New frmRegexEditor(oRegexString)

Controls.RegexEditor/RegexEditor.vbproj

@@ -12,7 +12,7 @@
     <AssemblyName>DigitalData.Controls.RegexEditor</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -60,12 +60,8 @@
     <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />

Controls.SnapPanel/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.0.1.0")>
+<Assembly: AssemblyVersion("2.1.0.0")>
-<Assembly: AssemblyFileVersion("2.0.1.0")>
+<Assembly: AssemblyFileVersion("2.1.0.0")>

Controls.SnapPanel/SnapPanel.vb

@@ -1,20 +1,28 @@
 Imports System.Drawing
 Imports System.Windows.Forms
+
+
 Public Class ClassSnapPanel
     Inherits Panel
 
     Private _ShowGrid As Boolean = True
     Private _GridSize As Integer = 16
+    Private _NeedsScrollUpdate As Boolean = False
+
     Public Sub New()
-        Me.AutoScroll = True ' Scrollbars aktivieren
+        Me.AutoScroll = True
+        Me.DoubleBuffered = True ' Flackern reduzieren
     End Sub
+
     Public Property GridSize As Integer
         Get
             Return _GridSize
         End Get
         Set(value As Integer)
-            _GridSize = value
+            If value > 0 AndAlso value <> _GridSize Then
-            Refresh()
+                _GridSize = value
+                Invalidate()
+            End If
         End Set
     End Property
 
@@ -23,55 +31,146 @@ Public Class ClassSnapPanel
             Return _ShowGrid
         End Get
         Set(value As Boolean)
-            _ShowGrid = value
+            If value <> _ShowGrid Then
-            Refresh()
+                _ShowGrid = value
+                Invalidate()
+            End If
         End Set
     End Property
 
     Protected Overrides Sub OnControlAdded(e As ControlEventArgs)
-        AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
-        AddHandler e.Control.DragDrop, AddressOf AlignToGrid
         MyBase.OnControlAdded(e)
-        UpdateScrollArea()
+        AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
+        AddHandler e.Control.MouseUp, AddressOf AlignToGrid
+        ScheduleScrollUpdate()
     End Sub
 
     Protected Overrides Sub OnControlRemoved(e As ControlEventArgs)
-        RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
-        RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid
         MyBase.OnControlRemoved(e)
-        UpdateScrollArea()
+        RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
+        RemoveHandler e.Control.MouseUp, AddressOf AlignToGrid
+        ScheduleScrollUpdate()
     End Sub
 
-    Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs)
+    Protected Overrides Sub OnLayout(levent As LayoutEventArgs)
-        If _ShowGrid Then
+        MyBase.OnLayout(levent)
-            ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor)
+        ScheduleScrollUpdate()
-        End If
+    End Sub
+
+    Protected Overrides Sub OnPaint(e As PaintEventArgs)
         MyBase.OnPaint(e)
+
+        If Not Me.DesignMode AndAlso _ShowGrid Then
+            Dim scrollOffset As Point = Me.AutoScrollPosition
+            Dim gridRect As New Rectangle(-scrollOffset.X, -scrollOffset.Y, Me.ClientSize.Width, Me.ClientSize.Height)
+            ControlPaint.DrawGrid(e.Graphics, gridRect, New Size(_GridSize, _GridSize), Me.BackColor)
+        End If
     End Sub
 
     Private Sub AlignToGrid(sender As Object, e As EventArgs)
-        If _ShowGrid Then
+        If Not _ShowGrid OrElse Me.DesignMode Then Return
-            Dim item As Control = CType(sender, Control)
+
-            Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize
+        Dim ctrl As Control = CType(sender, Control)
-            Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize
+        Dim x As Integer = Math.Floor(ctrl.Left / _GridSize) * _GridSize
-            item.Location = New Point(x, y)
+        Dim y As Integer = Math.Floor(ctrl.Top / _GridSize) * _GridSize
-            UpdateScrollArea()
+        ctrl.Location = New Point(x, y)
+        ScheduleScrollUpdate()
+    End Sub
+
+    Private Sub ScheduleScrollUpdate()
+        If Not _NeedsScrollUpdate Then
+            _NeedsScrollUpdate = True
+            BeginInvoke(New MethodInvoker(Sub()
+                                              UpdateScrollArea()
+                                              _NeedsScrollUpdate = False
+                                          End Sub))
         End If
     End Sub
+
     Private Sub UpdateScrollArea()
         Dim maxWidth As Integer = 0
         Dim maxHeight As Integer = 0
 
-        ' Größte X- und Y-Koordinate der enthaltenen Controls bestimmen
+        For Each ctrl As Control In Me.Controls
-        For Each ctrl As Control In Controls
+            maxWidth = Math.Max(maxWidth, ctrl.Right)
-            Dim right As Integer = ctrl.Right
+            maxHeight = Math.Max(maxHeight, ctrl.Bottom)
-            Dim bottom As Integer = ctrl.Bottom
-
-            If right > maxWidth Then maxWidth = right
-            If bottom > maxHeight Then maxHeight = bottom
         Next
 
-        ' Scrollbereich setzen
         Me.AutoScrollMinSize = New Size(maxWidth, maxHeight)
     End Sub
 End Class
+
+'Public Class ClassSnapPanel
+'    Inherits Panel
+
+'    Private _ShowGrid As Boolean = True
+'    Private _GridSize As Integer = 16
+'    Public Sub New()
+'        Me.AutoScroll = True ' Scrollbars aktivieren
+'    End Sub
+'    Public Property GridSize As Integer
+'        Get
+'            Return _GridSize
+'        End Get
+'        Set(value As Integer)
+'            _GridSize = value
+'            Refresh()
+'        End Set
+'    End Property
+
+'    Public Property ShowGrid As Boolean
+'        Get
+'            Return _ShowGrid
+'        End Get
+'        Set(value As Boolean)
+'            _ShowGrid = value
+'            Refresh()
+'        End Set
+'    End Property
+
+'    Protected Overrides Sub OnControlAdded(e As ControlEventArgs)
+'        AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
+'        AddHandler e.Control.DragDrop, AddressOf AlignToGrid
+'        MyBase.OnControlAdded(e)
+'        UpdateScrollArea()
+'    End Sub
+
+'    Protected Overrides Sub OnControlRemoved(e As ControlEventArgs)
+'        RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
+'        RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid
+'        MyBase.OnControlRemoved(e)
+'        UpdateScrollArea()
+'    End Sub
+'    Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs)
+'        If _ShowGrid Then
+'            ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor)
+'        End If
+'        MyBase.OnPaint(e)
+'    End Sub
+
+'    Private Sub AlignToGrid(sender As Object, e As EventArgs)
+'        If _ShowGrid Then
+'            Dim item As Control = CType(sender, Control)
+'            Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize
+'            Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize
+'            item.Location = New Point(x, y)
+'            UpdateScrollArea()
+'        End If
+'    End Sub
+'    Private Sub UpdateScrollArea()
+'        Dim maxWidth As Integer = 0
+'        Dim maxHeight As Integer = 0
+
+'        ' Größte X- und Y-Koordinate der enthaltenen Controls bestimmen
+'        For Each ctrl As Control In Controls
+'            Dim right As Integer = ctrl.Right
+'            Dim bottom As Integer = ctrl.Bottom
+
+'            If right > maxWidth Then maxWidth = right
+'            If bottom > maxHeight Then maxHeight = bottom
+'        Next
+
+'        ' Scrollbereich setzen
+'        Me.AutoScrollMinSize = New Size(maxWidth, maxHeight)
+'    End Sub
+'End Class

DBCleaner/DBCleaner.vbproj

@@ -50,10 +50,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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.ClipboardWatcher/ClipboardWatcher.vbproj

@@ -66,31 +66,31 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\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>..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
+      <HintPath>..\..\DDModules\ZooFlow\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.ClipboardWatcher/frmMatch.vb

@@ -53,19 +53,19 @@ Public Class frmMatch
         DATA_ONLY = 2
     End Enum
 
-    Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As ClipboardWatcherParams)
+    Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pParams As ClipboardWatcherParams)
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
-        _LogConfig = LogConfig
+        _LogConfig = pLogConfig
-        _Logger = LogConfig.GetLogger()
+        _Logger = pLogConfig.GetLogger()
-        _Environment = Environment
+        _Environment = pEnvironment
-        _Params = Params
+        _Params = pParams
         _ProfileSearch = New ProfileSearches(_LogConfig, _Environment, _Params.ClipboardContents)
 
-        _Logger.Debug("ClipboardContents: [{0}]", Params.ClipboardContents)
+        _Logger.Debug("ClipboardContents: [{0}]", pParams.ClipboardContents)
-        _Logger.Debug("OperationModeOverride: [{0}]", Params.OperationModeOverride.ToString)
+        _Logger.Debug("OperationModeOverride: [{0}]", pParams.OperationModeOverride.ToString)
 
         _Language = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
         Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language)

GUIs.Common/Common.vbproj

@@ -71,7 +71,10 @@
     </Reference>
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Controls.DocumentViewer">
-      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+      <HintPath>..\..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Controls.LookupGrid">
+      <HintPath>..\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Base">
       <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
@@ -84,7 +87,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.EDMI.API">
+    <Reference Include="DigitalData.Modules.EDMI.API, Version=1.6.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -531,12 +535,6 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj">
-      <Project>{3DCD6D1A-C830-4241-B7E4-27430E7EA483}</Project>
-      <Name>LookupControl</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="Resources\txt.png" />

GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb

@@ -68,6 +68,7 @@ Partial Class frmDocumentResultList
         Me.btnSaveWorkspaceAs = New DevExpress.XtraBars.BarButtonItem()
         Me.btnSaveAsMySearch = New DevExpress.XtraBars.BarButtonItem()
         Me.lblCurrentWorkspace = New DevExpress.XtraBars.BarStaticItem()
+        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -221,9 +222,9 @@ Partial Class frmDocumentResultList
         Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
         Me.RibbonControl.ExpandCollapseItem.Id = 0
         Me.RibbonControl.Images = Me.SvgImageCollection1
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs, Me.btnSaveAsMySearch, Me.lblCurrentWorkspace})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs, Me.btnSaveAsMySearch, Me.lblCurrentWorkspace, Me.BarButtonItem6})
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 61
+        Me.RibbonControl.MaxItemId = 62
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2})
         Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1, Me.cmbGridFontSize})
@@ -530,6 +531,13 @@ Partial Class frmDocumentResultList
         Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.lblCurrentWorkspace.Tag = "Arbeitsbereich: {0}"
         '
+        'BarButtonItem6
+        '
+        resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6")
+        Me.BarButtonItem6.Id = 61
+        Me.BarButtonItem6.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem6.Name = "BarButtonItem6"
+        '
         'RibbonPageStart
         '
         Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageRefresh, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace, Me.RibbonPageGroupSavedSearch})
@@ -547,6 +555,7 @@ Partial Class frmDocumentResultList
         '
         Me.RibbonPageGroupExport.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
         Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItemExportGrid1)
+        Me.RibbonPageGroupExport.ItemLinks.Add(Me.BarButtonItem6)
         Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport"
         resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport")
         '
@@ -744,6 +753,7 @@ Partial Class frmDocumentResultList
         resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
         Me.DocumentViewer1.FileLoaded = False
         Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
         '
         'XtraSaveFileDialog
         '
@@ -877,7 +887,7 @@ Partial Class frmDocumentResultList
         Me.LayoutControlItem1.Name = "LayoutControlItem1"
         Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24)
         resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(126, 13)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(124, 13)
         '
         'LayoutControlItem2
         '
@@ -886,7 +896,7 @@ Partial Class frmDocumentResultList
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
         Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24)
         resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(126, 13)
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(124, 13)
         '
         'EmptySpaceItem1
         '
@@ -917,9 +927,9 @@ Partial Class frmDocumentResultList
         Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.DockPanelFileList)
         Me.Controls.Add(Me.DockPanelPreview)
         Me.Controls.Add(Me.panelContainerStatus)
-        Me.Controls.Add(Me.DockPanelFileList)
         Me.Controls.Add(Me.RibbonStatusBar)
         Me.Controls.Add(Me.RibbonControl)
         Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon)
@@ -1070,4 +1080,5 @@ Partial Class frmDocumentResultList
     Friend WithEvents btnSaveAsMySearch As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroupSavedSearch As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents lblCurrentWorkspace As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
 End Class

GUIs.Common/DocumentResultList/frmDocumentResultList.resx

@@ -230,29 +230,28 @@
   <data name="BarButtonBack.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAEJSURB
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAESSURB
-        VDhPpZOhCgJBEIava7IICmIx+AZyRdM1X0EQfI8Ds3a70Re4ahKTb2BTsIhR0/p/x57MHmsQwwe788/8
+        VDhPpVMxSkNREPx9rNIEFMQmRW4gNkmVbq4gCN4jMHXSp7f0AtNahVS5QToFG0mp1ZcJm/D+5iloioH9
-        tzO7l0yXRZ1MrMVBPDysiaEF+XbTFyuxF7kYi5aHNTE0csgNDAhsxUYMnHNJDDSfQ25pUhngitCIFVrI
+        uzPzd/e914BqEqagFqBWoHYBx8651uGXHzeg5qBeQM1AjUH1A46dc80cczsGTjyBWoIatm3b1OBacMzd
-        8bnUlAb0xdGCL2vfFkfhxFPMjcZJqMnYMJy8VjwUZ0HxRYys7nOYyZoFEx4bYSLugmK0ji00eQz2wIJr
+        mxwM7OpCL4syzAmuNXsDz+XWOn8GNQC1BtWC+gT1kDqxZuoPL2eWxCNQ2xC/grqtdOKdLBx4w+OiMAH1
-        avngTLwExVGMAbfziBnQb7QYYgb1FlJxExQwxG6lWRT/tBAbYk+cBCZXkVrd53yG+O0am2InMKGthdGC
+        EWLXLrM4eF7syoGPqR/Je1BfIa6iMPDp7GoGnvdE+JtBHuEO1HsIvMSr3H4eobbEa1CbMHmzacXguMSf
-        a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC
+        jvEC1HOYeKzHotY5RuOsi2ScfZUPJv9+TCX+9Jy/AcUnQlOuZReWAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="BarButtonBack.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJwSURB
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJHSURB
-        VFhHxZe/Sh1BFMZNJbeUKIhgZ5fOMp2teBsRkaRIlZA0AZ9AsRZrX8E3EO59A9H8gRAIBOxSpAkEIoaY
+        VFhHxZe9ihVBEIXXSDYUFUQw28zM0MxU9iQismhgpGgi7BOsVLxs7Cv4BgW7byD+ggiCsJmBiSC4KOqV
-        zfdb5pO54+ze8Rrd4ifuOd85c3b3zJm9U1VVdUr9p793XMKC2BIHYijOxUWA/7HhQ4M2l2OE0gKeiF3x
+        79K1zJY9Mz1XZYJzuVNddepMd3V1z9pisVibE8sfmbfgosy3ZL4n8wOZH8r8qID/2BjDB98c/wdaBVyW
-        QVSFoCWG2FzOmnEFPBKvxakg6V8xEDtiTSyJXoD/seFDg5YYYslBrhtrtBUwL/aF7+hIrKMtAW2IcTy5
+        +WOZv5b5ohH4EkNs5msWcErmD2T+vJD+kvm+zHdkvinzDZmvF/AfG2P44EsMsXDAlfkHBVyQ+W7njZ7K
-        yDmyDloHxCA8FAR+FdtiOl6gBGJCLDnIRc6RItBZbHhUvvN3YiNOOgnkCLn8JK5fB36LDO/Ld37nxQ25
+        /EZevz7gW2IiHi44mwTg+KQEfpD5tsxP5yRjIKbEwgEXnCdE1AQwVfHmL2V+MxNPBRyFK2bieDkYD6cA
-        Qk5ys0a2ADrWDbcdJ0iRvy8ug9Z8EYs5PcjH60DHGvXuwG4nsG0Q0DyN71w+Gixd/LNYyOmN/PSEG5O1
+        6xVv/tfJA0VEzAQ5qgKo2Ci47UySCCXzb6ny38v8UvbtxLAcUZjL3ZEFsG2i4HrXvBRYTv6OvZ99Uxw1
-        arudDA72Ltunsdvl2xS/Rbz4JzGf06dIR/GswVp1wXYwvUg2iANi5Hsm/gSdIdFcTt+E9MwJYre4tpER
+        EYVJrhMCaBzsXbZPb7XL/JbMv6fkbymu7FtDEU8Oci0FxwDdC7L9HNQJvi3zHyk5ROez7xBKnyB2i+cw
-        inEnFhvZX4h08TPxOKdvQzEMK+IPuLaROY5xLRYH30txFfzmRMyk2hIUx8Qkx5BrGzlMMC4l4jfCY3Vi
+        0kIx7uSAMn63kvyFzM9m3zGUZkX8Hs9hpI9j3KwE3JP5z5T8mczPZN8WlI4JxwHPYeQwwbiRnB922urK
-        kpyMbeznXNvIiYaxFwnfijsvDs4Z8nJ2YL/guq2AVyJ99BPhnCFvtoCmV/BcpM13a5Kc2VfQ1oS5wTPR
+        SJy0beyHXQGcaBjXO46P/kVykARwdmA/GhNwvzL1K6FFQN8S3KkU32QkzuoSDBVhrfGstAMKX7UIx7bh
-        DgDFZZtw3DZcFb+CxnDA/LdtWDKIVsTPoIuLmM3pm5A+O4hKR/FT8UPERbwXRdNQusZRDKWH0bL4HrTF
+        dZl/TSI4YCaL6NuGLY3omsy/VEScy75D6GtEra34qsw/JxGvWrvhUCsGrYfRFZl/mipi7DACU45jfD8m
-        RcjfehjBbY5jtN+C1nwUjUXIN/Y4hk4/SKDzTzLo9KPUIPSTAJrnwT7LDY+K9+XGZPs82A+TGDqWbcPe
+        EW+GRLQcx2DWCwmY/UoGZr2UdkXMdi0PzPph0sVsn2YZ/+/jdE78BmdK1op4DTduAAAAAElFTkSuQmCC
-        9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="BarButtonResetGridLayout.Caption" xml:space="preserve">
@@ -506,6 +505,48 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>1189, 671</value>
   </data>
+  <data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 46</value>
+  </data>
+  <data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
+    <value>583, 442</value>
+  </data>
+  <data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;DockPanel2_Container.Name" xml:space="preserve">
+    <value>DockPanel2_Container</value>
+  </data>
+  <data name="&gt;&gt;DockPanel2_Container.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;DockPanel2_Container.Parent" xml:space="preserve">
+    <value>DockPanelFileList</value>
+  </data>
+  <data name="&gt;&gt;DockPanel2_Container.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 158</value>
+  </data>
+  <data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
+    <value>590, 491</value>
+  </data>
+  <data name="DockPanelFileList.Text" xml:space="preserve">
+    <value>Ergebnisse</value>
+  </data>
+  <data name="&gt;&gt;DockPanelFileList.Name" xml:space="preserve">
+    <value>DockPanelFileList</value>
+  </data>
+  <data name="&gt;&gt;DockPanelFileList.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;DockPanelFileList.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;DockPanelFileList.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
@@ -522,7 +563,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.6.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>DockPanel1_Container</value>
@@ -570,7 +611,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;DockPanelPreview.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="CtrlObjectPropertyDialog.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -588,7 +629,7 @@
     <value>CtrlObjectPropertyDialog</value>
   </data>
   <data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
-    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.5.8.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.7.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
     <value>DockPanel3_Container</value>
@@ -639,10 +680,10 @@
     <value>0</value>
   </data>
   <data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
-    <value>162, 45</value>
+    <value>160, 45</value>
   </data>
   <data name="txtCheckedOutWho.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 20</value>
+    <value>84, 20</value>
   </data>
   <data name="txtCheckedOutWho.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -663,7 +704,7 @@
     <value />
   </data>
   <data name="dateCheckedOutWhen.Location" type="System.Drawing.Point, System.Drawing">
-    <value>162, 69</value>
+    <value>160, 69</value>
   </data>
   <data name="dateCheckedOutWhen.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
     <value>Combo</value>
@@ -672,7 +713,7 @@
     <value>Combo</value>
   </data>
   <data name="dateCheckedOutWhen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 20</value>
+    <value>84, 20</value>
   </data>
   <data name="dateCheckedOutWhen.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -786,48 +827,6 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;panelContainerStatus.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 46</value>
-  </data>
-  <data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>583, 442</value>
-  </data>
-  <data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;DockPanel2_Container.Name" xml:space="preserve">
-    <value>DockPanel2_Container</value>
-  </data>
-  <data name="&gt;&gt;DockPanel2_Container.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;DockPanel2_Container.Parent" xml:space="preserve">
-    <value>DockPanelFileList</value>
-  </data>
-  <data name="&gt;&gt;DockPanel2_Container.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 158</value>
-  </data>
-  <data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>590, 491</value>
-  </data>
-  <data name="DockPanelFileList.Text" xml:space="preserve">
-    <value>Ergebnisse</value>
-  </data>
-  <data name="&gt;&gt;DockPanelFileList.Name" xml:space="preserve">
-    <value>DockPanelFileList</value>
-  </data>
-  <data name="&gt;&gt;DockPanelFileList.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;DockPanelFileList.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;DockPanelFileList.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
   <data name="lblCurrentWorkspace.Caption" xml:space="preserve">
@@ -1192,6 +1191,12 @@
   <data name="&gt;&gt;lblCurrentWorkspace.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
+    <value>BarButtonItem6</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
     <value>RibbonPageStart</value>
   </data>
@@ -1384,6 +1389,26 @@
   <data name="btnSaveAsMySearch.Caption" xml:space="preserve">
     <value>Als meine Suche speichern</value>
   </data>
+  <data name="BarButtonItem6.Caption" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="BarButtonItem6.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        R3JlZW57ZmlsbDojMDM5QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IkV4cG9ydCI+DQogICAgPHBhdGgg
+        ZD0iTTEwLDEySDZWNmg0VjEyeiBNMjIsMTJ2NnY5YzAsMC42LTAuNCwxLTEsMUgxYy0wLjYsMC0xLTAu
+        NC0xLTFWN2MwLTAuNiwwLjQtMSwxLTFoM3Y4aDE0di0ySDIyeiBNMTgsMThINCAgIHY2aDE0VjE4eiIg
+        Y2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMTYsMTAgMjQsMTAgMjQsMTQgMzIs
+        OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
   <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>

GUIs.Common/DocumentResultList/frmDocumentResultList.vb

@@ -29,7 +29,7 @@ Public Class frmDocumentResultList
 
     ' Interface implementations
     Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
-    Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger
+    Private ReadOnly Property _Logger As Logger Implements IBaseForm._Logger
     Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm
 
     ' Helper Classes
@@ -50,6 +50,11 @@ Public Class frmDocumentResultList
     Private ReadOnly Workspace As Workspace(Of Config)
     Private WithEvents Watcher As Watcher
 
+    Private CopyWMFile2Temp As Boolean = False
+    Private WM_SUFFIX As String = "\\WINDREAM\OBJECTS"
+    Private MAP_SHAREDRIVE As String = ""
+    Private MAP_BLACKLIST As String = ""
+
     ' Runtime variables
     Private Property ResultLists As List(Of DocumentResult)
 
@@ -79,6 +84,7 @@ Public Class frmDocumentResultList
     Private Property GridList As List(Of GridControl)
     Private Property ViewList As List(Of BandedGridView)
     Private Property OperationMode As OperationMode Implements IResultForm.OperationMode
+    Private _documentPathHandler As DocumentPathHandler
 
     Public ReadOnly Property Config1 As ConfigManager(Of Config)
         Get
@@ -112,12 +118,13 @@ Public Class frmDocumentResultList
         ResultLists = pParams.Results
 
         LogConfig = pLogConfig
-        Logger = pLogConfig.GetLogger()
+        _Logger = pLogConfig.GetLogger()
         FormHelper = New FormHelper(pLogConfig, Me)
+        _documentPathHandler = New DocumentPathHandler(pLogConfig)
 
         UserLanguage = ObjectEx.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
-        LanguageEx.LogApplicationLanguage(Logger)
+        LanguageEx.LogApplicationLanguage(_Logger)
-        LanguageEx.SetApplicationLanguage(Logger, UserLanguage)
+        LanguageEx.SetApplicationLanguage(_Logger, UserLanguage)
 
         Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath, oConfigPath)
         Helpers = New DocumentResultList.Helpers(pLogConfig)
@@ -126,7 +133,6 @@ Public Class frmDocumentResultList
         FileEx = New Modules.Windows.File(pLogConfig)
         LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}, pEnvironment)
         Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1, UserLanguage)
-
     End Sub
 
     Private Function GetOperationMode() As OperationMode
@@ -139,18 +145,18 @@ Public Class frmDocumentResultList
                 oOperationMode = OperationMode.NoAppServer
             End If
 
-            Logger.Debug("OperationMode set to [{0}]", oOperationMode)
+            _Logger.Debug("OperationMode set to [{0}]", oOperationMode)
 
             If Params.OperationModeOverride <> OperationMode.None Then
-                Logger.Debug("Overriding OperationMode with [{0}]", Params.OperationModeOverride)
+                _Logger.Debug("Overriding OperationMode with [{0}]", Params.OperationModeOverride)
                 oOperationMode = Params.OperationModeOverride
             End If
 
-            Logger.Debug("OperationMode is now [{0}]", oOperationMode)
+            _Logger.Debug("OperationMode is now [{0}]", oOperationMode)
 
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
-            Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode)
+            _Logger.Warn("Error while determining OperationMode. Setting to [{0}]", oOperationMode)
         End Try
 
         Return oOperationMode
@@ -166,7 +172,7 @@ Public Class frmDocumentResultList
 
             End If
 
-            LanguageEx.LogApplicationLanguage(Logger)
+            LanguageEx.LogApplicationLanguage(_Logger)
 
             Documentloader = New Loader(LogConfig, OperationMode, EDMI_API_Client, Environment.User)
 
@@ -263,7 +269,8 @@ Public Class frmDocumentResultList
 
             ' This loads the default workspace, for now
             Workspace.LoadWorkspace(Config.Config.SelectedWorkspace)
-
+            ' Selektion zuverlässig setzen
+            SelectFirstRowInGrid1()
 
             ' This needs to done be after loading the grid
             ' so we can set the row handle and start loading the (only) file
@@ -298,7 +305,13 @@ Public Class frmDocumentResultList
 
         End Try
     End Sub
-
+    Private Sub SelectFirstRowInGrid1()
+        If GridView1.RowCount > 0 Then
+            GridView1.FocusedRowHandle = 0
+        Else
+            GridView1.FocusedRowHandle = GridControl.InvalidRowHandle
+        End If
+    End Sub
     Private Sub Workspace_WorkspaceLoaded(sender As Object, e As String)
         lblCurrentWorkspace.Caption = String.Format(lblCurrentWorkspace.Tag, e)
     End Sub
@@ -316,8 +329,11 @@ Public Class frmDocumentResultList
             End If
 
             DocumentViewer1.Done()
+            If _documentPathHandler IsNot Nothing Then
+                _documentPathHandler.Cleanup()
+            End If
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
         End Try
     End Sub
 
@@ -341,19 +357,37 @@ Public Class frmDocumentResultList
                 End If
 
                 UpdateRibbonActions(oDocument)
-
+                If IsNothing(oDocument) Then
+                    DocumentViewer1.CloseDocument()
+                    FormHelper.ShowErrorMessage(New IOException("File could not be loaded!"), "GridView_FocusedRowChanged")
+                    Exit Sub
+                End If
                 ' Save reference to current document
                 _CurrentDocument = oDocument
 
                 ' Load Document in Document Viewer
                 Dim oFileName = $"{oObjectId}.{oDocument.Extension}"
-                DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents))
+                'If CopyWMFile2Temp = True Then
-                If IsNothing(oDocument) Then
+                '    _Logger.Debug("Loading document into viewer with path handler and copying WM file to temp. ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
-                    DocumentViewer1.CloseDocument()
+                '    ' Optionen konfigurieren
-                    FormHelper.ShowErrorMessage(New IOException("File could not be loaded!"), "GridView_FocusedRowChanged")
+                '    Dim options As New DocumentPathHandler.DocumentPathOptions With {
-
+                '        .EnableMapping = True,
-                    Exit Sub
+                '        .WMSuffix = WM_SUFFIX,
+                '        .SpecificDrive = If(Len(MAP_SHAREDRIVE) = 1, MAP_SHAREDRIVE, ""),
+                '        .DriveBlacklist = MAP_BLACKLIST,
+                '        .CopyToTemp = True,
+                '        .TempFolder = TEMP_DOCUMENT_FOLDER,
+                '        .UnmapAfterCopy = True
+                '        }
+                'Else
+                If Not IsNothing(oDocument.Contents) Then
+                    _Logger.Debug("Loading document into viewer with MemoryStream handler (LoadFile_FromStream). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
+                    DocumentViewer1.LoadFile_FromStream(oFileName, New MemoryStream(oDocument.Contents))
+                Else
+                    _Logger.Debug("Loading document into viewer from filepath (LoadFile_FromPath). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
+                    DocumentViewer1.LoadFile_FromPath(oFullPath)
                 End If
+                'End If
 
                 If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
                     Await CtrlObjectPropertyDialog.LoadObject(oObjectId)
@@ -416,7 +450,7 @@ Public Class frmDocumentResultList
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -531,7 +565,7 @@ Public Class frmDocumentResultList
         CheckoutManager = New CheckInOut(LogConfig, EDMI_API_Client)
 
         If Not EDMI_API_Client.Connect() Then
-            Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address)
+            _Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address)
             Return False
         End If
 
@@ -562,13 +596,18 @@ Public Class frmDocumentResultList
                 UpdateTotalResults()
                 LoadGridDataAndLayout()
 
-                ' After the new results are loaded, set the old row handle
+                ' Restore old selection only if still valid; otherwise select first row
-                ' to trigger the row change events and load object properties
+                If GridView1.IsValidRowHandle(oCurrentRowHandle) Then
-                GridView1.FocusedRowHandle = oCurrentRowHandle
+                    GridView1.FocusedRowHandle = oCurrentRowHandle
+                ElseIf GridView1.RowCount > 0 Then
+                    GridView1.FocusedRowHandle = 0
+                Else
+                    GridView1.FocusedRowHandle = GridControl.InvalidRowHandle
+                End If
 
                 Return True
             Catch ex As Exception
-                Logger.Error(ex)
+                _Logger.Error(ex)
 
                 MessageBox.Show("Error while refreshing results:" & vbNewLine & vbNewLine & ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error)
                 Return False
@@ -580,12 +619,12 @@ Public Class frmDocumentResultList
 
     Private Sub LoadGridData(View As GridView, Result As DocumentResultList.DocumentResult)
         If Result.Datatable.Columns.Contains(ColumnDocumentId) = False Then
-            Logger.Error($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
+            _Logger.Error($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
             'Throw New ApplicationException($"Datatable is missing DocId Column [{ColumnDocumentId}] for search {Result.Title}!")
         End If
 
         If OperationMode = OperationMode.NoAppServer And Result.Datatable.Columns.Contains(ColumnFilepath) = False Then
-            Logger.Error($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
+            _Logger.Error($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
             'Throw New ApplicationException($"Datatable is missing Filepath Column [{ColumnFilepath}] for search {Result.Title}!")
         End If
 
@@ -781,9 +820,9 @@ Public Class frmDocumentResultList
             GridView.BestFitColumns()
         Catch ex As ApplicationException
             MsgBox($"Error while loading grid data for search {Result.Title}: {vbNewLine}{vbNewLine}{ex.Message}", MsgBoxStyle.Critical, Text)
-            Logger.Error(ex)
+            _Logger.Error(ex)
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
         End Try
     End Sub
 
@@ -882,7 +921,7 @@ Public Class frmDocumentResultList
                 Await Watcher.OpenDocument(_CurrentDocument)
             End If
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
         End Try
     End Sub
 
@@ -948,7 +987,7 @@ Public Class frmDocumentResultList
         Try
             Await Watcher.OpenDocument(_CurrentDocument)
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
         End Try
     End Sub
 
@@ -1056,7 +1095,7 @@ Public Class frmDocumentResultList
                 End If
             End If
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
         End Try
 
     End Sub
@@ -1172,7 +1211,4 @@ Public Class frmDocumentResultList
 
     End Sub
 
-    Private Sub GridView_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridView3.FocusedRowChanged, GridView2.FocusedRowChanged, GridView1.FocusedRowChanged
-
-    End Sub
 End Class

GUIs.Common/GridBuilder.vb

@@ -82,7 +82,7 @@ Public Class GridBuilder
             ToList()
 
         For Each oDateCol In oDateColumns
-            SetDateTimeColumn(oDateCol)
+            SetDateTimeColumn(oDateCol, "g")
         Next
     End Sub
 
@@ -96,19 +96,61 @@ Public Class GridBuilder
             ToList()
 
         For Each oDateCol In oDateColumns
-            SetDateTimeColumn(oDateCol)
+            SetDateTimeColumn(oDateCol, "g")
         Next
     End Sub
 
-    Private Sub SetDateTimeColumn(pColumn As GridColumn)
+    ''' <summary>
+    ''' Applies a proper datetime format string to all columns of the view. 
+    ''' </summary>
+    ''' <remarks>The view's columns need to be loaded for this to work!</remarks>
+    Public Sub SetDateTimeColumns(pView As GridView, pFormatString As String)
+        If pView.Columns Is Nothing Then
+            Exit Sub
+        End If
+
+        Dim oDateColumns = pView.Columns.AsEnumerable.
+            Where(Function(column As GridColumn) column.ColumnType = GetType(Date)).
+            ToList()
+
+        For Each oDateCol In oDateColumns
+            SetDateTimeColumn(oDateCol, pFormatString)
+        Next
+    End Sub
+
+    Public Sub SetDateTimeColumns(pTreeList As TreeList, pFormatString As String)
+        If pTreeList.Columns Is Nothing Then
+            Exit Sub
+        End If
+
+        Dim oDateColumns = pTreeList.Columns.AsEnumerable.
+            Where(Function(column As TreeListColumn) column.ColumnType = GetType(Date)).
+            ToList()
+
+        For Each oDateCol In oDateColumns
+            SetDateTimeColumn(oDateCol, pFormatString)
+        Next
+    End Sub
+
+    Private Sub SetDateTimeColumn(pColumn As GridColumn, pFormatString As String)
+
+        If String.IsNullOrEmpty(pFormatString) Then
+            pFormatString = "g"
+        End If
+
         pColumn.DisplayFormat.FormatType = FormatType.Custom
-        pColumn.DisplayFormat.FormatString = "g"
+        pColumn.DisplayFormat.FormatString = pFormatString
         pColumn.DisplayFormat.Format = DateTimeFormatInfo.CurrentInfo
     End Sub
 
-    Private Sub SetDateTimeColumn(pColumn As TreeListColumn)
+    Private Sub SetDateTimeColumn(pColumn As TreeListColumn, pFormatString As String)
+
+        If String.IsNullOrEmpty(pFormatString) Then
+            pFormatString = "g"
+        End If
+
         pColumn.Format.FormatType = FormatType.Custom
-        pColumn.Format.FormatString = "g"
+        pColumn.Format.FormatString = pFormatString
         pColumn.Format.Format = DateTimeFormatInfo.CurrentInfo
     End Sub
 

GUIs.Common/IBaseForm.vb

@@ -2,5 +2,5 @@
 
 Public Interface IBaseForm
     ReadOnly Property LogConfig As LogConfig
-    ReadOnly Property Logger As Logger
+    ReadOnly Property _Logger As Logger
 End Interface

GUIs.Common/My Project/AssemblyInfo.vb

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

GUIs.Common/NNfrmNotification_Startup.vb

@@ -119,7 +119,7 @@ Public Class NNfrmNotification_Startup
                 RichEditControl1.Dock = Windows.Forms.DockStyle.Fill
             Else
                 If IO.File.Exists(oMSG_STRING) Then
-                    DocumentViewer1.LoadFile(oMSG_STRING)
+                    DocumentViewer1.LoadFile_FromPath(oMSG_STRING)
                     DocumentViewer1.Visible = True
                     DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill
                 Else

GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb

@@ -12,7 +12,7 @@ Public Class ctrlObjectPropertyDialog
     Implements IBaseForm
 
     Private Property LogConfig As LogConfig Implements IBaseForm.LogConfig
-    Private Property Logger As Logger Implements IBaseForm.Logger
+    Private Property _Logger As Logger Implements IBaseForm._Logger
     Private Property ControlManager As AttributeControls
     Private Property GridBuilder As GridBuilder
     Private Property Client As Client
@@ -38,7 +38,7 @@ Public Class ctrlObjectPropertyDialog
 
     Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment)
         LogConfig = pLogConfig
-        Logger = pLogConfig.GetLogger()
+        _Logger = pLogConfig.GetLogger()
         HostForm = pHostForm
         ControlManager = New AttributeControls(pLogConfig, pEnv, pClient)
         Helper = New FormHelper(pLogConfig, pHostForm)
@@ -58,7 +58,7 @@ Public Class ctrlObjectPropertyDialog
     Public Async Function SaveChanges() As Task(Of Boolean)
         Try
             For Each oChange As KeyValuePair(Of String, Object) In Changes
-                Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
+                _Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
                 Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With {
                     .Language = Environment.User.Language,
                     .Username = Environment.User.UserName
@@ -131,7 +131,7 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         Finally
             Enabled = True
@@ -145,7 +145,7 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -156,7 +156,7 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -176,14 +176,14 @@ Public Class ctrlObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         End Try
     End Function
 
     Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
         Try
-            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}"
+            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
             Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
             If oResult.OK = False Then
@@ -202,7 +202,7 @@ Public Class ctrlObjectPropertyDialog
                 Return oEntities
             End If
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return New List(Of Long)
         End Try
     End Function
@@ -230,7 +230,7 @@ Public Class ctrlObjectPropertyDialog
     End Function
 
     Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable)
-        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}"
+        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
         Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
         Return oResult.Table
@@ -246,7 +246,7 @@ Public Class ctrlObjectPropertyDialog
             ControlManager.LoadControlsForAttributes(oAttributes, Root)
             Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root)
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
         End Try
     End Sub
 

GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb

@@ -19,7 +19,7 @@ Public Class frmObjectPropertyDialog
     Private Property FormHelper As FormHelper
 
     Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
-    Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger
+    Private ReadOnly Property _Logger As Logger Implements IBaseForm._Logger
 
     Private ReadOnly Changes As New Dictionary(Of String, Object)
 
@@ -29,7 +29,7 @@ Public Class frmObjectPropertyDialog
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         LogConfig = pLogConfig
-        Logger = pLogConfig.GetLogger()
+        _Logger = pLogConfig.GetLogger()
         Environment = pEnvironment
         Client = pClient
         ObjectId = pObjectId
@@ -75,7 +75,7 @@ Public Class frmObjectPropertyDialog
 
     Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long))
         Try
-            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}"
+            Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
             Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
             If oResult.OK = False Then
@@ -94,7 +94,7 @@ Public Class frmObjectPropertyDialog
                 Return oEntities
             End If
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return New List(Of Long)
         End Try
     End Function
@@ -122,7 +122,7 @@ Public Class frmObjectPropertyDialog
     End Function
 
     Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable)
-        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}"
+        Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WITH (NOLOCK) WHERE IDB_OBJ_ID = {ObjectId}"
         Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL)
 
         Return oResult.Table
@@ -136,7 +136,7 @@ Public Class frmObjectPropertyDialog
             Dim oEntityId As Long
 
             If Long.TryParse(cmbBusinessEntity.EditValue, oEntityId) = False Then
-                _Logger.Warn("Could not Parse Entity from cmbBusinessEntity")
+                __Logger.Warn("Could not Parse Entity from cmbBusinessEntity")
                 Exit Sub
             End If
 
@@ -149,7 +149,7 @@ Public Class frmObjectPropertyDialog
             ControlManager.LoadControlsForAttributes(oAttributes, AttributeLayout)
             Await ControlManager.LoadControlValuesForAttributes(ObjectId, AttributeLayout)
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
         End Try
     End Sub
 
@@ -173,7 +173,7 @@ Public Class frmObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -184,7 +184,7 @@ Public Class frmObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -204,7 +204,7 @@ Public Class frmObjectPropertyDialog
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            _Logger.Error(ex)
             Return False
         End Try
     End Function
@@ -212,7 +212,7 @@ Public Class frmObjectPropertyDialog
     Private Async Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
         Try
             For Each oChange As KeyValuePair(Of String, Object) In Changes
-                Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
+                _Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString)
 
                 Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With {
                     .Language = Environment.User.Language,

GUIs.Common/SQLEditor/frmSQLEditor.vb

@@ -172,7 +172,7 @@ Public Class frmSQLEditor
 
     Private Function LoadConnections() As GalleryItemGroup
         Try
-            Dim oSql = "SELECT GUID, Bezeichnung FROM TBDD_CONNECTION WHERE AKTIV = 1"
+            Dim oSql = "SELECT GUID, Bezeichnung FROM TBDD_CONNECTION WITH (NOLOCK) WHERE AKTIV = 1"
             Dim oTable = Database.GetDatatable(oSql)
             Dim oConnections = New List(Of Connection)
 

GUIs.Common/app.config

@@ -103,6 +103,22 @@
         <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="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <startup>

GUIs.Common/frmNotification_Startup.vb

@@ -112,7 +112,7 @@ Public Class frmNotification_Startup
                 RichEditControl1.Dock = Windows.Forms.DockStyle.Fill
             Else
                 If IO.File.Exists(oMSG_STRING) Then
-                    DocumentViewer1.LoadFile(oMSG_STRING)
+                    DocumentViewer1.LoadFile_FromPath(oMSG_STRING)
                     DocumentViewer1.Visible = True
                     DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill
                 Else

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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Jobs">
-      <HintPath>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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/App.config

@@ -54,6 +54,46 @@
         <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="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.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.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.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.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj

@@ -14,6 +14,8 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,6 +50,9 @@
     <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="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -64,23 +69,120 @@
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14">
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\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="Independentsoft.Msg">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.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="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=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.7.10\lib\net45\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="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.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=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.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -88,15 +190,49 @@
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <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.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <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\net47\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" />
@@ -161,4 +297,11 @@
     <None Include="packages.config" />
   </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>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>
 </Project>

GUIs.Test.EDMIBenchmark/packages.config

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

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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <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">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <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">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns">
-      <HintPath>..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <HintPath>..\..\DDModules\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/My Project/AssemblyInfo.vb

@@ -10,9 +10,9 @@ Imports System.Runtime.InteropServices
 
 <Assembly: AssemblyTitle("TestGUI")>
 <Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("DD JJMS")>
+<Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("TestGUI")>
-<Assembly: AssemblyCopyright("Copyright ©  2018")>
+<Assembly: AssemblyCopyright("")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>

GUIs.Test.TestGUI/My Project/licenses.licx

@@ -0,0 +1,2 @@
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

GUIs.Test.TestGUI/MyApplication.vb

@@ -0,0 +1,49 @@
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.EDMI.API.Modules
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.ZooFlow
+
+Namespace My
+    ''' <summary>
+    ''' Extends the My Namespace
+    ''' Example: My.LogConfig
+    ''' </summary>
+    <HideModuleName()>
+    Module Extension
+        Property LogConfig As LogConfig
+#Region "Database"
+        Property Database As DatabaseWithFallback
+        Property DatabaseECM As MSSQLServer
+        Property DatabaseIDB As MSSQLServer
+    End Module
+
+#End Region
+    Partial Friend Class MyApplication
+            Public Property Skin As String = ""
+            Public Property Palette As String = ""
+            Public Property GlobixDropAreaStyle As String = "PROGRESSIVE"
+
+            Public Property Settings As New State.SettingsState
+            Public Property User As New State.UserState
+            Public Property Service As New State.ServiceState
+            Public Property Modules As New Dictionary(Of String, State.ModuleState)
+            Public Property ModulesActive As New List(Of String)
+
+
+        Public CommandLineFunction As String
+            Public CommandLineArguments As New Dictionary(Of String, String)
+
+            Public Function GetEnvironment() As Environment
+                Return New Environment With {
+                    .Database = My.DatabaseECM,
+                    .DatabaseIDB = My.DatabaseIDB,
+                    .Modules = My.Application.Modules,
+                    .Service = My.Application.Service,
+                    .Settings = My.Application.Settings,
+                    .User = My.Application.User
+                }
+            End Function
+
+    End Class
+End Namespace

GUIs.Test.TestGUI/TestGUI.vbproj

@@ -78,8 +78,7 @@
     <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, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Controls.DocumentViewer">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.GUIs.Common">
@@ -94,6 +93,10 @@
     <Reference Include="DigitalData.Modules.Database">
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.EDMI.API, Version=1.6.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Encryption">
       <HintPath>..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
     </Reference>
@@ -118,6 +121,10 @@
     <Reference Include="DigitalData.Modules.Windream">
       <HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.ZooFlow, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.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>
     </Reference>
@@ -407,6 +414,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="MyApplication.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="frmBulkInsert.resx">
@@ -488,10 +496,6 @@
       <Project>{a8c3f298-76ab-4359-ab3c-986e313b4336}</Project>
       <Name>EDMIService</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Services.ZUGFeRDService\DDZUGFeRDService.vbproj">
-      <Project>{7deec36e-ea5f-4711-ad1e-fd8894f4ad77}</Project>
-      <Name>DDZUGFeRDService</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\alignhorizontalbottom.svg" />

GUIs.Test.TestGUI/frmDocViewPure.Designer.vb

@@ -22,18 +22,10 @@ Partial Class frmDocViewPure
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
         Me.Button1 = New System.Windows.Forms.Button()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
         Me.SuspendLayout()
         '
-        'SpreadsheetControl1
-        '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(349, 187)
-        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
-        Me.SpreadsheetControl1.Size = New System.Drawing.Size(400, 200)
-        Me.SpreadsheetControl1.TabIndex = 0
-        Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
-        '
         'Button1
         '
         Me.Button1.Location = New System.Drawing.Point(546, 25)
@@ -43,19 +35,26 @@ Partial Class frmDocViewPure
         Me.Button1.Text = "unload"
         Me.Button1.UseVisualStyleBackColor = True
         '
+        'DocumentViewer1
+        '
+        Me.DocumentViewer1.FileLoaded = False
+        Me.DocumentViewer1.Location = New System.Drawing.Point(12, 54)
+        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Size = New System.Drawing.Size(661, 386)
+        Me.DocumentViewer1.TabIndex = 2
+        '
         'frmDocViewPure
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.DocumentViewer1)
         Me.Controls.Add(Me.Button1)
-        Me.Controls.Add(Me.SpreadsheetControl1)
         Me.Name = "frmDocViewPure"
         Me.Text = "frmDocViewPure"
         Me.ResumeLayout(False)
 
     End Sub
-
-    Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
     Friend WithEvents Button1 As Button
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
 End Class

GUIs.Test.TestGUI/frmDocViewPure.vb

@@ -2,7 +2,6 @@
 
 Public Class frmDocViewPure
     Private Sub frmDocViewPure_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        SpreadsheetControl1.LoadDocument("E:\35MB.xlsx")
 
     End Sub
 
@@ -10,7 +9,7 @@ Public Class frmDocViewPure
         'SpreadsheetControl1.Document.Dispose()
         'SpreadsheetControl1.Dispose()
         'SpreadsheetControl1 = Nothing
-        SpreadsheetControl1.CreateNewDocument()
+        ' SpreadsheetControl1.CreateNewDocument()
         GC.Collect()
     End Sub
 End Class

GUIs.Test.TestGUI/frmFilesystem.Designer.vb

@@ -23,28 +23,119 @@ Partial Class frmFilesystem
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.Button1 = New System.Windows.Forms.Button()
+        Me.btnStreamSimpleFile = New System.Windows.Forms.Button()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
+        Me.txtServiceAddress = New DevExpress.XtraEditors.TextEdit()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtServicePort = New DevExpress.XtraEditors.TextEdit()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.txtStatus = New System.Windows.Forms.TextBox()
+        Me.GroupBox1.SuspendLayout()
+        CType(Me.txtServiceAddress.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtServicePort.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(12, 12)
+        Me.Button1.Location = New System.Drawing.Point(42, 234)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.Size = New System.Drawing.Size(288, 23)
         Me.Button1.TabIndex = 0
-        Me.Button1.Text = "Button1"
+        Me.Button1.Text = "CreateDateDirectory"
         Me.Button1.UseVisualStyleBackColor = True
         '
+        'btnStreamSimpleFile
+        '
+        Me.btnStreamSimpleFile.Location = New System.Drawing.Point(6, 19)
+        Me.btnStreamSimpleFile.Name = "btnStreamSimpleFile"
+        Me.btnStreamSimpleFile.Size = New System.Drawing.Size(288, 23)
+        Me.btnStreamSimpleFile.TabIndex = 1
+        Me.btnStreamSimpleFile.Text = "Stream simple file"
+        Me.btnStreamSimpleFile.UseVisualStyleBackColor = True
+        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.btnStreamSimpleFile)
+        Me.GroupBox1.Location = New System.Drawing.Point(36, 153)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(709, 58)
+        Me.GroupBox1.TabIndex = 2
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "Stream simple file"
+        '
+        'txtServiceAddress
+        '
+        Me.txtServiceAddress.EditValue = "172.24.12.12"
+        Me.txtServiceAddress.Location = New System.Drawing.Point(36, 37)
+        Me.txtServiceAddress.Name = "txtServiceAddress"
+        Me.txtServiceAddress.Size = New System.Drawing.Size(485, 20)
+        Me.txtServiceAddress.TabIndex = 5
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(33, 21)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(136, 13)
+        Me.Label1.TabIndex = 6
+        Me.Label1.Text = "EDMI Service Adresse: (IP)"
+        '
+        'txtServicePort
+        '
+        Me.txtServicePort.EditValue = New Decimal(New Integer() {9000, 0, 0, 0})
+        Me.txtServicePort.Location = New System.Drawing.Point(36, 63)
+        Me.txtServicePort.Name = "txtServicePort"
+        Me.txtServicePort.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Buffered
+        Me.txtServicePort.Properties.MaskSettings.Set("MaskManagerType", GetType(DevExpress.Data.Mask.NumericMaskManager))
+        Me.txtServicePort.Size = New System.Drawing.Size(485, 20)
+        Me.txtServicePort.TabIndex = 7
+        '
+        'Button4
+        '
+        Me.Button4.Location = New System.Drawing.Point(36, 89)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(85, 23)
+        Me.Button4.TabIndex = 8
+        Me.Button4.Text = "Connect"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'txtStatus
+        '
+        Me.txtStatus.Location = New System.Drawing.Point(527, 37)
+        Me.txtStatus.Name = "txtStatus"
+        Me.txtStatus.Size = New System.Drawing.Size(184, 20)
+        Me.txtStatus.TabIndex = 9
+        '
         'frmFilesystem
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.txtStatus)
+        Me.Controls.Add(Me.Button4)
+        Me.Controls.Add(Me.txtServicePort)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txtServiceAddress)
+        Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.Button1)
         Me.Name = "frmFilesystem"
         Me.Text = "frmFilesystem"
+        Me.GroupBox1.ResumeLayout(False)
+        CType(Me.txtServiceAddress.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtServicePort.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
 
     Friend WithEvents Button1 As Button
+    Friend WithEvents btnStreamSimpleFile As Button
+    Friend WithEvents GroupBox1 As GroupBox
+    Friend WithEvents SaveFileDialog1 As SaveFileDialog
+    Friend WithEvents txtServiceAddress As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtServicePort As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents Button4 As Button
+    Friend WithEvents txtStatus As TextBox
 End Class

GUIs.Test.TestGUI/frmFilesystem.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

GUIs.Test.TestGUI/frmFilesystem.vb

@@ -1,39 +1,213 @@
-Imports DigitalData.Modules.Logging
+Imports System.Collections.Generic
+Imports System.IO
+Imports System.Numerics ' Verweis auf System.Numerics assembly hinzufügen!
+Imports System.Security.Cryptography
+Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base.IDB.Constants
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.ZooFlow.State
+Imports DigitalData.Services.EDMIService
+Imports DigitalData.Services.EDMIService.GlobalState
+Imports DigitalData.Services.EDMIService.Methods.GlobalIndexer.ImportFile
+Imports DigitalData.Services.EDMIService.Methods.IDB
 
 Public Class frmFilesystem
+    Private EDMIClient As Client
+    Private Logger As Logger
+
+    Private Const STATUS_CONNECTED = "Connection Established"
+    Private Const STATUS_CONNECTING = "Trying to create connection..."
+    Private Const STATUS_FAILED = "Connection Failed!"
+
+    Private ConnectionChanged As Boolean = False
+
+    Public Property ServiceAddress As String = ""
+    Public Property ServiceOnline As Boolean = False
     Private LogConfig As LogConfig
-    Private Filesystem As DigitalData.Modules.Filesystem.File
+    Private MYDD_Filesystem As DigitalData.Modules.Filesystem.File
+    Private _globalState As GlobalState
 
     Private ShortName As String = "E:\some_test_file.txt"
-    Private LongName As String = "E:\some_test_file_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more.txt"
+    Private LongName As String = "E:\some_test_file_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more_data_and_with_some_more.txt"
 
     Private Sub frmFilesystem_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
             LogConfig = New LogConfig(LogConfig.PathType.Temp)
-            Filesystem = New DigitalData.Modules.Filesystem.File(LogConfig)
+            Logger = LogConfig.GetLogger()
-
+            MYDD_Filesystem = New DigitalData.Modules.Filesystem.File(LogConfig)
-
+        Catch
-            'Using oWriter = IO.File.CreateText("E:\some_test_file.txt")
-            '    oWriter.WriteLine("bla bla bla")
-            'End Using
-
-            'IO.File.Copy(ShortName, LongName)
-
-            'Dim oVersion1 = Filesystem.GetVersionedFilename(LongName)
-            'IO.File.Copy(ShortName, oVersion1)
-
-            'Dim oVersion2 = Filesystem.GetVersionedFilename(LongName)
-            'IO.File.Copy(ShortName, oVersion2)
-        Catch ex As Exception
-
-        Finally
-            'IO.File.Delete(ShortName)
-            'IO.File.Delete(LongName)
         End Try
-
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim oDateString = Filesystem.CreateDateDirectory("E:\")
+        Dim oDateString = MYDD_Filesystem.CreateDateDirectory("E:\")
+    End Sub
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs)
+        If SaveFileDialog1.ShowDialog = DialogResult.OK Then
+            System.IO.File.WriteAllText(SaveFileDialog1.FileName, "Some text data")
+        End If
+    End Sub
+
+    Public Class SecureStorageHandler
+    End Class
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+        Try
+            Dim oIPAddress = txtServiceAddress.Text
+            Dim oPort = Integer.Parse(txtServicePort.Text)
+
+            EDMIClient = New Client(LogConfig, oIPAddress, oPort)
+
+            txtStatus.Text = STATUS_CONNECTING
+            Dim oResult = EDMIClient.Connect()
+
+            If oResult Then
+                ServiceAddress = $"{oIPAddress}:{oPort}"
+                ServiceOnline = True
+                txtStatus.Text = STATUS_CONNECTED
+                txtStatus.BackColor = Color.LightGreen
+                My.Application.Service.Client = EDMIClient
+                Logger.Debug("Loading client config..")
+                Dim oClientConfig = My.Application.Service.Client.ClientConfig
+                Logger.Debug("Establishing ECM connection..")
+                Dim oECMConnectionString = oClientConfig.ConnectionStringECM
+                My.DatabaseECM = New MSSQLServer(LogConfig, oECMConnectionString)
+                Logger.Debug("Establishing IDB connection..")
+                Dim oIDBConnectionString = oClientConfig.ConnectionStringIDB
+                My.DatabaseIDB = New MSSQLServer(LogConfig, oIDBConnectionString)
+
+                Logger.Debug("Establishing Database connection with fallback..")
+                My.Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB)
+
+                InitializeGlobalState()
+            Else
+                ServiceAddress = ""
+                ServiceOnline = True
+                txtStatus.Text = STATUS_FAILED
+                txtStatus.BackColor = Color.LightCoral
+                _globalState = Nothing
+            End If
+        Catch ex As Exception
+            _globalState = Nothing
+            If Logger IsNot Nothing Then Logger.Error(ex)
+            MsgBox("Fehler beim Verbindungsaufbau", MsgBoxStyle.Critical, Text)
+        End Try
+    End Sub
+
+    Private Sub btnStreamSimpleFile_ClickAsync(sender As Object, e As EventArgs) Handles btnStreamSimpleFile.Click
+        Try
+            If EDMIClient Is Nothing OrElse ServiceOnline = False Then
+                MsgBox("Bitte zuerst Verbindung zum EDMI Service herstellen.", MsgBoxStyle.Exclamation, Text)
+                Return
+            End If
+
+            If My.DatabaseIDB Is Nothing OrElse My.DatabaseECM Is Nothing Then
+                MsgBox("Bitte zuerst die Datenbankverbindungen herstellen.", MsgBoxStyle.Exclamation, Text)
+                Return
+            End If
+
+            If _globalState Is Nothing Then
+                MsgBox("GlobalState konnte nicht initialisiert werden.", MsgBoxStyle.Exclamation, Text)
+                Return
+            End If
+
+            Using ofd As New OpenFileDialog()
+                ofd.Title = "Datei für Import wählen"
+                ofd.Filter = "Alle Dateien (*.*)|*.*"
+                If ofd.ShowDialog() <> DialogResult.OK Then
+                    Return
+                End If
+
+                Dim oFilePath = ofd.FileName
+                Dim fi As New FileInfo(oFilePath)
+                Dim fileBytes As Byte() = IO.File.ReadAllBytes(oFilePath)
+
+                Dim oUser As New UserState With {
+                    .UserName = Environment.UserName,
+                    .Language = "de-DE",
+                    .LanguageId = 1031
+                }
+
+                Dim oObjectStore As String = "WORK"
+                Dim oIDBDoctypeId As Long = 1
+                Dim oObjectKind As String = "DOC"
+                Dim oProfileId As Integer = 1
+                Dim oAttributes As New List(Of UserAttributeValue)
+
+                Logger.Debug("FilePath: [{0}]", oFilePath)
+                Logger.Debug("ObjectStore: [{0}]", oObjectStore)
+                Logger.Debug("ObjectKind: [{0}]", oObjectKind)
+                Logger.Debug("ProfileId: [{0}]", oProfileId)
+                Logger.Debug("IDB DoctypeId: [{0}]", oIDBDoctypeId)
+
+                Dim oChecksum As String
+                Using oSha256 As SHA256 = SHA256.Create()
+                    oChecksum = BitConverter.ToString(oSha256.ComputeHash(fileBytes)).Replace("-", String.Empty)
+                End Using
+
+                Dim oFileProperties As New FileProperties With {
+                    .FileName = fi.FullName,
+                    .FileCreatedAt = fi.CreationTimeUtc.ToString("O"),
+                    .FileChangedAt = fi.LastWriteTimeUtc.ToString("O"),
+                    .FileImportedAt = DateTime.UtcNow,
+                    .FileContents = fileBytes,
+                    .FileChecksum = oChecksum,
+                    .FileInfoRaw = fi
+                }
+
+                Dim oRequest As New Globix_ImportFileRequest With {
+                    .File = oFileProperties,
+                    .ProfileId = oProfileId,
+                    .IDBDoctypeId = oIDBDoctypeId,
+                    .KindType = oObjectKind,
+                    .StoreName = oObjectStore,
+                    .AttributeValues = oAttributes,
+                    .User = oUser
+                }
+
+                Dim oImportMethod = New ImportFileMethod(LogConfig, My.DatabaseIDB, My.DatabaseECM, _globalState)
+                Dim oResponse = oImportMethod.Run(oRequest)
+
+                If oResponse IsNot Nothing AndAlso oResponse.ObjectId > 0 Then
+                    Logger.Info("Import erfolgreich abgeschlossen. ObjectId [{0}]", oResponse.ObjectId)
+                    MsgBox($"Import erfolgreich. ObjectId: {oResponse.ObjectId}", MsgBoxStyle.Information, Text)
+                Else
+                    Logger.Warn("ImportFile lieferte kein erfolgreiches Ergebnis.")
+                    MsgBox("Import konnte nicht durchgeführt werden.", MsgBoxStyle.Exclamation, Text)
+                End If
+            End Using
+        Catch ex As Exception
+            If Logger IsNot Nothing Then Logger.Error(ex)
+            MsgBox("Fehler beim Datei-Import.", MsgBoxStyle.Critical, Text)
+        End Try
+    End Sub
+
+    Private Sub InitializeGlobalState()
+        Try
+            _globalState = New GlobalState(LogConfig, My.DatabaseIDB, My.DatabaseECM)
+            _globalState.LoadObjectStores()
+            _globalState.LoadConnections()
+            _globalState.LoadDoctypes()
+
+            Dim oConfig As New Config With {
+                .ClientConfig = New Config.ClientConfiguration With {
+                    .ForceDirectDatabaseAccess = True
+                }
+            }
+
+            _globalState.LoadClientConfig(oConfig)
+
+            Logger.Info("GlobalState init: ObjectStores [{0}], Connections [{1}], Doctypes [{2}]",
+                        _globalState.ObjectStores.Count,
+                        _globalState.Connections.Count,
+                        _globalState.Doctypes.Count)
+        Catch ex As Exception
+            _globalState = Nothing
+            Logger.Error(ex)
+            MsgBox("GlobalState konnte nicht initialisiert werden.", MsgBoxStyle.Exclamation, Text)
+        End Try
     End Sub
 End Class

GUIs.Test.TestGUI/frmObjectProperties.vb

@@ -11,10 +11,10 @@ Public Class frmObjectProperties
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
         LogConfig = pLogConfig
-        Logger = pLogConfig.GetLogger()
+        _Logger = pLogConfig.GetLogger()
     End Sub
 
     Public ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig
 
-    Public ReadOnly Property Logger As Logger Implements IBaseForm.Logger
+    Public ReadOnly Property _Logger As Logger Implements IBaseForm._Logger
 End Class

GUIs.Test.ZUGFeRDTest/App.config

@@ -161,7 +161,15 @@
       </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" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.19.0" newVersion="14.3.19.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />

GUIs.Test.ZUGFeRDTest/Form1.Designer.vb

@@ -43,8 +43,7 @@ Partial Class Form1
         GroupBox5 = New GroupBox()
         btWriteBinary = New Button()
         OpenFileDialog2 = New OpenFileDialog()
-        Button1 = New Button()
+
-        Button2 = New Button()
         GroupBox1.SuspendLayout()
         GroupBox2.SuspendLayout()
         GroupBox3.SuspendLayout()
@@ -231,32 +230,14 @@ Partial Class Form1
         ' 
         OpenFileDialog2.FileName = "OpenFileDialog2"
         OpenFileDialog2.Filter = "XML files (*.xml)|*.xml"
-        ' 
+
-        ' Button1
-        ' 
-        Button1.Location = New System.Drawing.Point(361, 47)
-        Button1.Name = "Button1"
-        Button1.Size = New System.Drawing.Size(94, 29)
-        Button1.TabIndex = 5
-        Button1.Text = "Log Folder"
-        Button1.UseVisualStyleBackColor = True
-        ' 
-        ' Button2
-        ' 
-        Button2.Location = New System.Drawing.Point(361, 82)
-        Button2.Name = "Button2"
-        Button2.Size = New System.Drawing.Size(94, 29)
-        Button2.TabIndex = 13
-        Button2.Text = "AppFolder"
-        Button2.UseVisualStyleBackColor = True
         ' 
         ' Form1
         ' 
-        AutoScaleDimensions = New System.Drawing.SizeF(8F, 20F)
+        AutoScaleDimensions = New System.Drawing.SizeF(8.0F, 20.0F)
         AutoScaleMode = AutoScaleMode.Font
         ClientSize = New System.Drawing.Size(879, 690)
-        Controls.Add(Button2)
+
-        Controls.Add(Button1)
         Controls.Add(GroupBox5)
         Controls.Add(GroupBox4)
         Controls.Add(GroupBox3)
@@ -296,6 +277,4 @@ Partial Class Form1
     Friend WithEvents btWriteBinary As Button
     Friend WithEvents ButtonValidateXMLOnly As Button
     Friend WithEvents OpenFileDialog2 As OpenFileDialog
-    Friend WithEvents Button1 As Button
-    Friend WithEvents Button2 As Button
 End Class

GUIs.Test.ZUGFeRDTest/Form1.vb

@@ -99,14 +99,14 @@ Public Class Form1
                 Dim oEN16931_ID = oRow.Item("EN16931_ID")
 
                 Args.PropertyMapList.Add(New XmlItemProperty() With {
-                    .XMLPath = xmlPath,
+                    .xmlPath = xmlPath,
-                    .Description = description,
+                    .description = description,
-                    .TableName = tableName,
+                    .tableName = tableName,
-                    .TableColumn = tableColumn,
+                    .tableColumn = tableColumn,
-                    .IsRequired = isRequired,
+                    .isRequired = isRequired,
-                    .IsGrouped = isGrouped,
+                    .isGrouped = isGrouped,
-                    .GroupScope = groupScope,
+                    .groupScope = groupScope,
-                    .Specification = specification,
+                    .specification = specification,
                     .ItemType = oItemType,
                     .EN16931_ID = oEN16931_ID
                 })
@@ -159,9 +159,41 @@ Public Class Form1
 
         If oResult = DialogResult.OK Then
             Try
-                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName)
+                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName, True)
+                Dim oZFResult = _zugferd.ValidateZUGFeRDDocument(oDoc)
                 Dim oZUGFERD = _zugferd.SerializeZUGFeRDDocument(oDoc)
-                Console.WriteLine()
+                WriteLog("Specification: " & oZFResult.Specification)
+                'WriteLog("XML-Schema: " & oResult.UsedXMLSchema)
+                WriteLog("Embedded File Name: " & oZFResult.DataFileName)
+
+                Dim oSpecification = oZFResult.Specification
+
+                If oSpecification = ZUGFeRDInterface.ZUGFERD_SPEC_10 Then
+                    oSpecification = ZUGFeRDInterface.ZUGFERD_SPEC_DEFAULT
+                End If
+
+                Dim oPropertyMap = oArgs.PropertyMapList.
+                    Where(Function(kv) kv.Specification = oSpecification).
+                    ToDictionary(Function(kv) kv.XMLPath, Function(kv) kv)
+
+                Dim oResult2 = _zugferd.PropertyValues.CheckPropertyValues(oZFResult.SchemaObject, oPropertyMap, "test")
+
+                WriteLog("Valid Properties: [{0}]", oResult2.ValidProperties.Count)
+                For Each Prop In oResult2.ValidProperties
+                    If Prop.Value.Length > 250 Then
+                        WriteLog("Property: [{0}] = [{1}]", Prop.Description, Prop.Value.Substring(0, 250))
+                    Else
+                        WriteLog("Property: [{0}] = [{1}]", Prop.Description, Prop.Value)
+                    End If
+                Next
+
+                WriteLog("--------------------------------")
+                WriteLog("Missing Properties: [{0}]", oResult2.MissingProperties.Count)
+                For Each Prop In oResult2.MissingProperties
+                    WriteLog("Missing Property: [{0}]", Prop.ToString) ''Prop.Description
+                Next
+
+                WriteLog("--------------------------------")
             Catch ex As DigitalData.Modules.Interfaces.Exceptions.ZUGFeRDExecption
                 Dim oErrorCode = GetRejectionCodeNumber(ex.ErrorCode)
                 Dim oMessage = oErrorCode + " - (" + ex.ErrorCode.ToString() + ") - " + ex.Message
@@ -169,6 +201,7 @@ Public Class Form1
             Catch ex As Exception
                 MsgBox(ex.Message)
             End Try
+            MsgBox("Finished - check log")
         End If
     End Sub
 
@@ -227,7 +260,7 @@ Public Class Form1
 
         Try
             If oDialogResult = DialogResult.OK Then
-                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName)
+                Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName, True)
                 Dim oResult = _zugferd.ValidateZUGFeRDDocument(oDoc)
                 oResult = _zugferd.SerializeZUGFeRDDocument(oDoc)
 
@@ -381,11 +414,11 @@ Public Class Form1
 
     End Function
 
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    'Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Process.Start("explorer.exe", _logConfig.LogDirectory)
+    '    Process.Start("explorer.exe", _logConfig.LogDirectory)
-    End Sub
+    'End Sub
 
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    'Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        Process.Start("explorer.exe", System.Windows.Forms.Application.UserAppDataPath())
+    '    Process.Start("explorer.exe", System.Windows.Forms.Application.UserAppDataPath())
-    End Sub
+    'End Sub
 End Class

GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>ZUGFeRDTest</RootNamespace>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
     <OutputType>WinExe</OutputType>
     <StartupObject>ZUGFeRDTest.My.MyApplication</StartupObject>
     <MyType>WindowsForms</MyType>
@@ -17,26 +17,44 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GdPicture" Version="14.3.16" />
+    <PackageReference Include="GdPicture" Version="14.3.3" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.1" />
-    <PackageReference Include="NLog" Version="6.0.4" />
+    <PackageReference Include="NLog" Version="5.0.5" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\net8.0-windows\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\net8.0-windows\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\net8.0-windows\DigitalData.Modules.Interfaces.dll</HintPath>
+      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Jobs">
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\net8.0-windows\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging_.NET8\bin\Debug\net8.0-windows\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <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="WindowsBase" />
   </ItemGroup>
 
   <ItemGroup>
@@ -53,5 +71,4 @@
       <Generator>SettingsSingleFileGenerator</Generator>
     </None>
   </ItemGroup>
-
+</Project>
-</Project>

GUIs.Test.ZUGFeRDTest/packages.config

@@ -4,8 +4,8 @@
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
-  <package id="GdPicture" version="14.3.14" targetFramework="net48" />
+  <package id="GdPicture" version="14.3.19" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.3.14" targetFramework="net48" />
+  <package id="GdPicture.runtimes.windows" version="14.3.19" 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" />
@@ -18,17 +18,14 @@
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
   <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.Data.SqlClient" version="4.8.6" targetFramework="net462" />
   <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
-  <package id="System.Management" version="8.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="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.Text.Json" version="8.0.6" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
 </packages>

Service.EDMIService/EDMIService - Kopie.vbproj

@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A8C3F298-76AB-4359-AB3C-986E313B4336}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <StartupObject>DigitalData.Services.EDMIService.WindowsService</StartupObject>
+    <RootNamespace>DigitalData.Services.EDMIService</RootNamespace>
+    <AssemblyName>EDMIService</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Console</MyType>
+    <TargetFrameworkVersion>v4.6.2;net8.0</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <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.EDMI.API">
+      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Filesystem">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Language">
+      <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>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Patterns">
+      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.ZooFlow">
+      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.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="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="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="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="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web.Extensions" />
+    <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BaseClass.vb" />
+    <Compile Include="BaseMethod.vb" />
+    <Compile Include="ClassConstants.vb" />
+    <Compile Include="Config.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigMethod.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigResponse.vb" />
+    <Compile Include="Methods\Database\DatabaseName.vb" />
+    <Compile Include="Methods\Database\DatabaseType.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryMethod.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryRequest.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryResponse.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueMethod.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueRequest.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableResponse.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileMethod.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileRequest.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileResponse.vb" />
+    <Compile Include="Methods\IDB\FileProperties.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueRequest.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\FileInfo.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoMethod.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\FileObject.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\AutomaticIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\BaseIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\AutomaticIndexing.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\PostProcessing.vb" />
+    <Compile Include="Methods\GlobalIndexer\Loader.vb" />
+    <Compile Include="Methods\GlobalIndexer\ManualIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\PostProcessingStep.vb" />
+    <Compile Include="Methods\GlobalIndexer\Profile.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileMethod.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileRequest.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueRequest.vb" />
+    <Compile Include="GlobalState.vb" />
+    <Compile Include="IDB\Helpers.vb" />
+    <Compile Include="Messages\AccessRightResult.vb" />
+    <Compile Include="Messages\Messages.vb" />
+    <Compile Include="Messages\BaseResponse.vb" />
+    <Compile Include="Exceptions.vb" />
+    <Compile Include="Messages\DatabaseResult.vb" />
+    <Compile Include="EDMIService.vb" />
+    <Compile Include="Methods\IDB\AttributeValue.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileMethod.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileRequest.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileResponse.vb" />
+    <Compile Include="Scheduler\LogProvider.vb" />
+    <Compile Include="Scheduler\Scheduler.vb" />
+    <Compile Include="Scheduler\DatatableJob.vb" />
+    <Compile Include="Scheduler\JobListener.vb" />
+    <Compile Include="Scheduler\JobResult.vb" />
+    <Compile Include="Security\SecureFileHandler.vb" />
+    <Compile Include="ServiceHost.vb" />
+    <Compile Include="WindowsService.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="IEDMIService.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="ProjectInstaller.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettingsModule.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ProjectInstaller.resx">
+      <DependentUpon>ProjectInstaller.vb</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

Service.EDMIService/EDMIService.vbproj

@@ -226,6 +226,7 @@
     <Compile Include="Scheduler\DatatableJob.vb" />
     <Compile Include="Scheduler\JobListener.vb" />
     <Compile Include="Scheduler\JobResult.vb" />
+    <Compile Include="Security\SecureFileHandler.vb" />
     <Compile Include="ServiceHost.vb" />
     <Compile Include="WindowsService.vb">
       <SubType>Component</SubType>

Service.EDMIService/EDMIService1.vbproj

@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A8C3F298-76AB-4359-AB3C-986E313B4336}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <StartupObject>DigitalData.Services.EDMIService.WindowsService</StartupObject>
+    <RootNamespace>DigitalData.Services.EDMIService</RootNamespace>
+    <AssemblyName>EDMIService</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Console</MyType>
+    <TargetFrameworkVersion>net8.0</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <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.EDMI.API">
+      <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Filesystem">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Language">
+      <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>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Patterns">
+      <HintPath>..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.ZooFlow">
+      <HintPath>..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.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="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="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="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="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web.Extensions" />
+    <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BaseClass.vb" />
+    <Compile Include="BaseMethod.vb" />
+    <Compile Include="ClassConstants.vb" />
+    <Compile Include="Config.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigMethod.vb" />
+    <Compile Include="Methods\Base\GetClientConfig\GetClientConfigResponse.vb" />
+    <Compile Include="Methods\Database\DatabaseName.vb" />
+    <Compile Include="Methods\Database\DatabaseType.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryMethod.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryRequest.vb" />
+    <Compile Include="Methods\Database\ExecuteNonQuery\ExecuteNonQueryResponse.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueMethod.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueRequest.vb" />
+    <Compile Include="Methods\Database\GetScalarValue\GetScalarValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatable\GetDatatableResponse.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileMethod.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileRequest.vb" />
+    <Compile Include="Methods\IDB\CheckInOutFile\CheckInOutFileResponse.vb" />
+    <Compile Include="Methods\IDB\FileProperties.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueRequest.vb" />
+    <Compile Include="Methods\IDB\GetAttributeValue\GetAttributeValueResponse.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheMethod.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheRequest.vb" />
+    <Compile Include="Methods\Database\GetDatatableFromCache\GetDatatableFromCacheResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\FileInfo.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoMethod.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileInfo\GetFileInfoResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\FileObject.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectRequest.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectResponse.vb" />
+    <Compile Include="Methods\IDB\GetFileObject\GetFileObjectMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\AutomaticIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\BaseIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\AutomaticIndexing.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\GlobalIndexer\ImportFile\Steps\PostProcessing.vb" />
+    <Compile Include="Methods\GlobalIndexer\Loader.vb" />
+    <Compile Include="Methods\GlobalIndexer\ManualIndex.vb" />
+    <Compile Include="Methods\GlobalIndexer\PostProcessingStep.vb" />
+    <Compile Include="Methods\GlobalIndexer\Profile.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileMethod.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileRequest.vb" />
+    <Compile Include="Methods\IDB\ImportFile\ImportFileResponse.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileMethod.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileRequest.vb" />
+    <Compile Include="Methods\IDB\NewFile\NewFileResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueMethod.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueResponse.vb" />
+    <Compile Include="Methods\IDB\SetAttributeValue\SetAttributeValueRequest.vb" />
+    <Compile Include="GlobalState.vb" />
+    <Compile Include="IDB\Helpers.vb" />
+    <Compile Include="Messages\AccessRightResult.vb" />
+    <Compile Include="Messages\Messages.vb" />
+    <Compile Include="Messages\BaseResponse.vb" />
+    <Compile Include="Exceptions.vb" />
+    <Compile Include="Messages\DatabaseResult.vb" />
+    <Compile Include="EDMIService.vb" />
+    <Compile Include="Methods\IDB\AttributeValue.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileMethod.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileRequest.vb" />
+    <Compile Include="Methods\IDB\UpdateFile\UpdateFileResponse.vb" />
+    <Compile Include="Scheduler\LogProvider.vb" />
+    <Compile Include="Scheduler\Scheduler.vb" />
+    <Compile Include="Scheduler\DatatableJob.vb" />
+    <Compile Include="Scheduler\JobListener.vb" />
+    <Compile Include="Scheduler\JobResult.vb" />
+    <Compile Include="Security\SecureFileHandler.vb" />
+    <Compile Include="ServiceHost.vb" />
+    <Compile Include="WindowsService.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="IEDMIService.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="ProjectInstaller.vb">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SettingsModule.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ProjectInstaller.resx">
+      <DependentUpon>ProjectInstaller.vb</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="App.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>

Service.EDMIService/Methods/GlobalIndexer/ImportFile/ImportFileMethod.vb

@@ -86,14 +86,7 @@ Namespace Methods.GlobalIndexer.ImportFile
                 oAutoAttributes = oAutomaticIndexing.ApplyAutomaticeAttributes(oUserAttributes, pData.File.FileInfoRaw, User)
 
                 ' Import the file
-                Dim oNewFile As New NewFile.NewFileMethod(LogConfig, DatabaseIDB, DatabaseECM, GlobalState)
+                Dim oResponse = ImportFile(pData)
-                Dim oResponse = oNewFile.Run(New NewFile.NewFileRequest With {
-                    .File = pData.File,
-                    .IDBDoctypeId = pData.IDBDoctypeId,
-                    .KindType = pData.KindType,
-                    .StoreName = pData.StoreName,
-                    .User = User
-                })
 
                 If oResponse.OK Then
                     Logger.Info("Import of file [{0}] under ObjectId [{1}] successful!", pData.File.FileName, oResponse.ObjectId)
@@ -147,7 +140,16 @@ Namespace Methods.GlobalIndexer.ImportFile
                 Return New Globix_ImportFileResponse(ex)
             End Try
         End Function
-
+        Private Function ImportFile(pData As Globix_ImportFileRequest) As NewFile.NewFileResponse
+            Dim oNewFile As New NewFile.NewFileMethod(LogConfig, DatabaseIDB, DatabaseECM, GlobalState)
+            Return oNewFile.Run(New NewFile.NewFileRequest With {
+                .File = pData.File,
+                .IDBDoctypeId = pData.IDBDoctypeId,
+                .KindType = pData.KindType,
+                .StoreName = pData.StoreName,
+                .User = User
+            })
+        End Function
         Private Function GetVirtualPath(pFileInfo As FileInfo, pPathConvention As String, pUser As UserState, pUserAttributes As List(Of UserAttributeValue), pAutoAttributes As List(Of UserAttributeValue))
             Logger.Info("Generating virtual path for file [{0}]", pFileInfo.Name)
 

Service.EDMIService/Methods/IDB/GetFileObject/GetFileObjectMethod.vb

@@ -2,6 +2,7 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports System.IO
+Imports DigitalData.Services.EDMIService.Security
 
 Namespace Methods.IDB.GetFileObject
     Public Class GetFileObjectMethod
@@ -69,6 +70,29 @@ Namespace Methods.IDB.GetFileObject
         End Function
 
         Private Function LoadFileContents(pFilePath As String) As Byte()
+            Try
+                Dim password = Environment.GetEnvironmentVariable("DD_FILE_ENCRYPTION_PASSWORD")
+                If String.IsNullOrWhiteSpace(password) Then
+                    Logger.Warn("No encryption password set (DD_FILE_ENCRYPTION_PASSWORD). Attempting legacy plain read for file [{0}]", pFilePath)
+                    Return ReadPlain(pFilePath)
+                End If
+
+                Try
+                    ' Try decrypt first (preferred path)
+                    Logger.Debug("Attempting AES decrypt for file [{0}]", pFilePath)
+                    Return SecureFileHandler.DecryptFileToBytes(pFilePath, password)
+                Catch exDec As Exception
+                    Logger.Warn("Decrypt failed for file [{0}]. Falling back to plain read. Reason: {1}", pFilePath, exDec.Message)
+                    Logger.Error(exDec)
+                    Return ReadPlain(pFilePath)
+                End Try
+
+            Catch ex As Exception
+                Logger.Error(ex)
+                Return Nothing
+            End Try
+        End Function
+        Private Function LoadFileContents_Old(pFilePath As String) As Byte()
             Try
                 Using oFileStream As New FileStream(pFilePath, FileMode.Open, FileAccess.Read)
                     Using oMemoryStream As New MemoryStream()
@@ -85,6 +109,15 @@ Namespace Methods.IDB.GetFileObject
 
             End Try
         End Function
+
+        Private Function ReadPlain(pFilePath As String) As Byte()
+            Using oFileStream As New FileStream(pFilePath, FileMode.Open, FileAccess.Read, FileShare.Read)
+                Using oMemoryStream As New MemoryStream()
+                    oFileStream.CopyTo(oMemoryStream)
+                    Return oMemoryStream.ToArray()
+                End Using
+            End Using
+        End Function
     End Class
 
 End Namespace

Service.EDMIService/Methods/IDB/NewFile/NewFileMethod.vb

@@ -3,6 +3,7 @@ Imports DigitalData.Modules.Base.IDB.Constants
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Database.MSSQLServer.TransactionMode
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Services.EDMIService.Security
 
 Namespace Methods.IDB.NewFile
     Public Class NewFileMethod
@@ -22,6 +23,197 @@ Namespace Methods.IDB.NewFile
             Logger.Debug("Running [NewFileMethod].")
             Dim oFilePath As String = Nothing
 
+            Try
+                If pData.File Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.File))
+                End If
+
+                If pData.KindType Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.KindType))
+                End If
+
+                If pData.StoreName Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.StoreName))
+                End If
+
+                If pData.User Is Nothing Then
+                    Throw New ArgumentNullException(NameOf(pData.User))
+                End If
+
+                If IsNothing(pData.IDBDoctypeId) Then
+                    Throw New ArgumentNullException(NameOf(pData.IDBDoctypeId))
+                End If
+
+                Logger.Debug("Checking if checksum already exists..")
+                Dim oExistingObjectId = Helpers.TestFileChecksumExists(pData.File.FileChecksum)
+                If oExistingObjectId > 0 Then
+                    Return New NewFileResponse(oExistingObjectId)
+                End If
+
+                Logger.Debug("Creating New ObjectId..")
+                Dim oObjectId = Helpers.NewObjectIdWithTransaction(pData.KindType, pData.User.UserName, Connection, Transaction)
+                If oObjectId = 0 Then
+                    LogAndThrow("Could not create new ObjectId!")
+                End If
+                Logger.Debug("New ObjectId [{0}] created!", oObjectId)
+
+                ' Find ObjectStore by Title
+                Logger.Debug("Checking for DataStore [{0}].", pData.StoreName)
+                Dim oStore = GlobalState.ObjectStores.
+                    Where(Function(store) store.Title = pData.StoreName).
+                    SingleOrDefault()
+
+                If oStore Is Nothing Then
+                    LogAndThrow($"DataStore [{pData.StoreName}] does not exist. Exiting.")
+                End If
+                Logger.Debug("Using DataStore [{0}].", pData.StoreName)
+
+                ' Get Store base and final path
+                Logger.Debug("Store BasePath is [{0}]", oStore.Path)
+                Dim oFinalPath = Helpers.GetFileObjectPath(oStore, pData.File.FileImportedAt)
+
+                ' Ensure target directory exists
+                Try
+                    If Not IO.Directory.Exists(oFinalPath) Then
+                        IO.Directory.CreateDirectory(oFinalPath)
+                    End If
+                Catch exDir As Exception
+                    LogAndThrow(exDir, $"Target directory [{oFinalPath}] could not be created.")
+                End Try
+
+                ' Get filename
+                Dim oKeepFileName As Boolean = False
+                If oStore.IsArchive Then
+                    Logger.Debug("Object Store is an archive: [{0}]", oStore.IsArchive)
+                    oKeepFileName = True
+                End If
+
+                Dim oFileName As String = GetFileObjectFileName(oObjectId, pData.File.FileName, oKeepFileName)
+                Logger.Debug("Filename is [{0}]", oFileName)
+
+                oFilePath = IO.Path.Combine(oFinalPath, oFileName)
+                Dim oFileObjectInfo As IO.FileInfo = New IO.FileInfo(oFilePath)
+
+                Dim oFileObjectName As String = oFileObjectInfo.Name
+                Logger.Debug("File Information for [{0}]:", oFileObjectName)
+
+                Dim oFileObjectSize As Long = pData.File.FileContents.Length ' original (plaintext) size
+                Logger.Debug("Original Size: [{0}]", oFileObjectSize)
+
+                Dim oOriginalExtension As String = pData.File.FileInfoRaw.Extension.Substring(1)
+                Logger.Debug("Original Extension: [{0}]", oOriginalExtension)
+
+                Logger.Debug("Checksum: [{0}]", pData.File.FileChecksum)
+
+                ' Retrieve encryption password (environment variable)
+                Dim encryptionPassword As String = Environment.GetEnvironmentVariable("DD_FILE_ENCRYPTION_PASSWORD")
+                If String.IsNullOrWhiteSpace(encryptionPassword) Then
+                    LogAndThrow("Encryption password not configured (env DD_FILE_ENCRYPTION_PASSWORD).")
+                End If
+
+                ' Perform encryption with strict failure handling
+                Try
+                    Logger.Info("Encrypting and saving file to path [{0}]", oFilePath)
+                    SecureFileHandler.EncryptFileFromBytes(pData.File.FileContents, oFilePath, encryptionPassword)
+                Catch exEnc As Exception
+                    LogAndThrow(exEnc, $"Could not encrypt/write file [{oFilePath}] to disk!")
+                End Try
+
+                ' Post-encryption validation: file must exist and contain at least header bytes
+                Try
+                    Dim fi As New IO.FileInfo(oFilePath)
+                    If Not fi.Exists Then
+                        LogAndThrow($"Encrypted file was not created at [{oFilePath}].")
+                    End If
+                    ' Minimum file size:1 (version) +4 (iterations) +32 (salt) =37 bytes
+                    If fi.Length < 37 Then
+                        LogAndThrow($"Encrypted file at [{oFilePath}] is invalid or truncated (size {fi.Length}).")
+                    End If
+                    Logger.Debug("Encrypted physical file size: [{0}]", fi.Length)
+                Catch exVal As Exception
+                    ' LogAndThrow above will throw; any other IO errors should also abort here
+                    LogAndThrow(exVal, "Encrypted file validation failed.")
+                End Try
+
+                '---------------------------------------------------------------------------
+
+                Logger.Info("Creating IDB FileObject for ObjectId [{0}].", oObjectId)
+                ' Insert into DB (store original plaintext size for consistency)
+                Dim oSQL As String = $"EXEC PRIDB_NEW_IDBFO 
+                '{oFinalPath}', 
+                '{oFileObjectName}', 
+                '{oOriginalExtension}',
+                {oFileObjectSize},
+                '{pData.File.FileChecksum}' ,
+                '{pData.User.UserName}',
+                '{oObjectId}',
+                {oStore.Id},
+                {pData.IDBDoctypeId}"
+
+                Dim oResult As Boolean = DatabaseIDB.ExecuteNonQueryWithConnectionObject(oSQL, Connection, ExternalTransaction, Transaction)
+
+                If oResult = False Then
+                    LogAndThrow("IDB FileObject could not be created!")
+                End If
+
+                '---------------------------------------------------------------------------
+
+                Dim oSystemAttributes As New Dictionary(Of String, Object) From {
+                    {Attributes.ATTRIBUTE_ORIGIN_FILENAME, pData.File.FileName},
+                    {Attributes.ATTRIBUTE_ORIGIN_CREATED, pData.File.FileCreatedAt},
+                    {Attributes.ATTRIBUTE_ORIGIN_CHANGED, pData.File.FileChangedAt}
+                }
+
+                For Each oAttribute As KeyValuePair(Of String, Object) In oSystemAttributes
+                    Try
+                        ' Dont write empty attributes
+                        If oAttribute.Value Is Nothing Then
+                            Continue For
+                        End If
+
+                        Dim oSuccess = Helpers.SetAttributeValueWithTransaction(Connection, Transaction, oObjectId, oAttribute.Key, oAttribute.Value, pData.User.Language, pData.User.UserName)
+                        If oSuccess Then
+                            Logger.Debug("System Attribute [{0}] written with value [{1}]", oAttribute.Key, oAttribute.Value)
+                        Else
+                            Logger.Warn("System attribute value could not be written")
+                        End If
+                    Catch ex As Exception
+                        LogAndThrow(ex, $"System attribute [{oAttribute.Key}] could not be written!")
+                    End Try
+                Next
+
+                '---------------------------------------------------------------------------
+
+                ' Finally, commit the transaction
+                Transaction?.Commit()
+
+                Return New NewFileResponse(oObjectId)
+
+            Catch ex As Exception
+                Logger.Warn("Error occurred while creating file!")
+                Logger.Error(ex)
+
+                Logger.Info("Cleaning up files.")
+                If Not IsNothing(oFilePath) AndAlso IO.File.Exists(oFilePath) Then
+                    Try
+                        IO.File.Delete(oFilePath)
+                    Catch exInner As Exception
+                        Logger.Warn("Error while cleaning up files.")
+                        Logger.Error(exInner)
+                    End Try
+                End If
+
+                Logger.Info("Rolling back transaction.")
+                Transaction?.Rollback()
+
+                Return New NewFileResponse(ex)
+
+            End Try
+        End Function
+        Public Function Run_Old(pData As NewFileRequest) As NewFileResponse
+            Logger.Debug("Running [NewFileMethod Old].")
+            Dim oFilePath As String = Nothing
+
             Try
                 If pData.File Is Nothing Then
                     Throw New ArgumentNullException(NameOf(pData.File))
@@ -181,7 +373,6 @@ Namespace Methods.IDB.NewFile
 
             End Try
         End Function
-
         Private Function GetFileObjectFileName(IDB_OBJ_ID As Long, pFilename As String, pKeepFilename As Boolean) As String
             ' TODO: save actual extensions
             If pKeepFilename Then

Service.EDMIService/Security/SecureFileHandler.vb

@@ -0,0 +1,146 @@
+Imports System.IO
+Imports System.Security.Cryptography
+
+Namespace Security
+    ''' <summary>
+    ''' Provides secure AES file encryption and decryption using PBKDF2 (Rfc2898DeriveBytes) for key derivation.
+    ''' File format:
+    ''' [1 byte Version][4 bytes IterationCount (Int32, big-endian)][32 bytes Salt][Encrypted Payload]
+    ''' </summary>
+    Public NotInheritable Class SecureFileHandler
+        Private Sub New()
+        End Sub
+
+        Private Const CURRENT_VERSION As Byte = 1
+        Private Const SALT_LENGTH As Integer = 32
+        Private Const KEY_SIZE_BYTES As Integer = 32 ' AES-256
+        Private Const IV_SIZE_BYTES As Integer = 16 ' AES Block size (128 bit)
+        Private Const DEFAULT_ITERATIONS As Integer = 100000
+        Private Const BUFFER_SIZE As Integer = 81920 '80KB streaming buffer
+
+        ''' <summary>
+        ''' Encrypts the provided byte array and writes an encrypted file to the target path using streaming.
+        ''' </summary>
+        Public Shared Sub EncryptFileFromBytes(sourceData() As Byte, targetFilePath As String, password As String, Optional iterations As Integer = DEFAULT_ITERATIONS)
+            If sourceData Is Nothing Then Throw New ArgumentNullException(NameOf(sourceData))
+            If String.IsNullOrWhiteSpace(password) Then Throw New ArgumentNullException(NameOf(password))
+            Using fsOut = New FileStream(targetFilePath, FileMode.Create, FileAccess.Write, FileShare.None)
+                Dim salt = GenerateRandomBytes(SALT_LENGTH)
+
+                ' Write header: Version, Iterations, Salt
+                fsOut.WriteByte(CURRENT_VERSION)
+                WriteInt32BigEndian(fsOut, iterations)
+                fsOut.Write(salt, 0, salt.Length)
+
+                Using keyDerivation = New Rfc2898DeriveBytes(password, salt, iterations)
+                    Dim key = keyDerivation.GetBytes(KEY_SIZE_BYTES)
+                    Dim iv = keyDerivation.GetBytes(IV_SIZE_BYTES)
+
+                    Dim aesAlg As System.Security.Cryptography.Aes = System.Security.Cryptography.Aes.Create()
+                    Try
+                        aesAlg.KeySize = KEY_SIZE_BYTES * 8
+                        aesAlg.BlockSize = IV_SIZE_BYTES * 8
+                        aesAlg.Mode = CipherMode.CBC
+                        aesAlg.Padding = PaddingMode.PKCS7
+                        aesAlg.Key = key
+                        aesAlg.IV = iv
+
+                        Using crypto = aesAlg.CreateEncryptor()
+                            Using cs = New CryptoStream(fsOut, crypto, CryptoStreamMode.Write)
+                                Using msIn = New MemoryStream(sourceData, writable:=False)
+                                    Dim buffer(BUFFER_SIZE - 1) As Byte
+                                    Dim read As Integer
+                                    Do
+                                        read = msIn.Read(buffer, 0, buffer.Length)
+                                        If read <= 0 Then Exit Do
+                                        cs.Write(buffer, 0, read)
+                                    Loop
+                                End Using
+                                cs.FlushFinalBlock()
+                            End Using
+                        End Using
+                    Finally
+                        aesAlg.Dispose()
+                    End Try
+                End Using
+            End Using
+        End Sub
+
+        ''' <summary>
+        ''' Decrypts the encrypted file and returns the plaintext bytes.
+        ''' </summary>
+        Public Shared Function DecryptFileToBytes(encryptedFilePath As String, password As String) As Byte()
+            If String.IsNullOrWhiteSpace(encryptedFilePath) Then Throw New ArgumentNullException(NameOf(encryptedFilePath))
+            If String.IsNullOrWhiteSpace(password) Then Throw New ArgumentNullException(NameOf(password))
+            Using fsIn = New FileStream(encryptedFilePath, FileMode.Open, FileAccess.Read, FileShare.Read)
+                Dim version = CByte(fsIn.ReadByte())
+                If version <> CURRENT_VERSION Then Throw New InvalidDataException("Unsupported file version.")
+                Dim iterations = ReadInt32BigEndian(fsIn)
+                Dim salt = New Byte(SALT_LENGTH - 1) {}
+                ReadExact(fsIn, salt, 0, salt.Length)
+
+                Using keyDerivation = New Rfc2898DeriveBytes(password, salt, iterations)
+                    Dim key = keyDerivation.GetBytes(KEY_SIZE_BYTES)
+                    Dim iv = keyDerivation.GetBytes(IV_SIZE_BYTES)
+
+                    Dim aesAlg As System.Security.Cryptography.Aes = System.Security.Cryptography.Aes.Create()
+                    Try
+                        aesAlg.KeySize = KEY_SIZE_BYTES * 8
+                        aesAlg.BlockSize = IV_SIZE_BYTES * 8
+                        aesAlg.Mode = CipherMode.CBC
+                        aesAlg.Padding = PaddingMode.PKCS7
+                        aesAlg.Key = key
+                        aesAlg.IV = iv
+
+                        Using crypto = aesAlg.CreateDecryptor()
+                            Using cs = New CryptoStream(fsIn, crypto, CryptoStreamMode.Read)
+                                Using msOut = New MemoryStream()
+                                    Dim buffer(BUFFER_SIZE - 1) As Byte
+                                    Dim read As Integer
+                                    Do
+                                        read = cs.Read(buffer, 0, buffer.Length)
+                                        If read <= 0 Then Exit Do
+                                        msOut.Write(buffer, 0, read)
+                                    Loop
+                                    Return msOut.ToArray()
+                                End Using
+                            End Using
+                        End Using
+                    Finally
+                        aesAlg.Dispose()
+                    End Try
+                End Using
+            End Using
+        End Function
+
+        Private Shared Function GenerateRandomBytes(length As Integer) As Byte()
+            Dim data = New Byte(length - 1) {}
+            Using rng = RandomNumberGenerator.Create()
+                rng.GetBytes(data)
+            End Using
+            Return data
+        End Function
+
+        Private Shared Sub WriteInt32BigEndian(stream As Stream, value As Integer)
+            Dim bytes = BitConverter.GetBytes(value)
+            If BitConverter.IsLittleEndian Then Array.Reverse(bytes)
+            stream.Write(bytes, 0, bytes.Length)
+        End Sub
+
+        Private Shared Function ReadInt32BigEndian(stream As Stream) As Integer
+            Dim bytes = New Byte(3) {}
+            ReadExact(stream, bytes, 0, 4)
+            If BitConverter.IsLittleEndian Then Array.Reverse(bytes)
+            Return BitConverter.ToInt32(bytes, 0)
+        End Function
+
+        Private Shared Sub ReadExact(stream As Stream, buffer As Byte(), offset As Integer, count As Integer)
+            Dim totalRead As Integer = 0
+            While totalRead < count
+                Dim read = stream.Read(buffer, offset + totalRead, count - totalRead)
+                If read <= 0 Then Throw New EndOfStreamException("Unexpected end of stream.")
+                totalRead += read
+            End While
+        End Sub
+    End Class
+End Namespace

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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <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">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\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>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+      <HintPath>..\..\DDModules\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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.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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\DDModules\Database\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>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\DDModules\Logging\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">

WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs

@@ -1,18 +1,21 @@
-using System;
+using DigitalData.Modules.Interfaces;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using DigitalData.Modules.Interfaces;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static DigitalData.Modules.Interfaces.Exceptions;
-using static DigitalData.Modules.Interfaces.ZUGFeRDInterface;
-using static DigitalData.Modules.Interfaces.PropertyValues;
-using System.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
-using System.Xml.Linq;
+using Microsoft.VisualStudio.Web.CodeGeneration.Contracts.Messaging;
-using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
 using System.Text.RegularExpressions;
+using System.Xml.Linq;
+using static DigitalData.Modules.Interfaces.Exceptions;
+using static DigitalData.Modules.Interfaces.PropertyValues;
+using static DigitalData.Modules.Interfaces.ZUGFeRDInterface;
 
 namespace ZUGFeRDRESTService.Controllers
 {
@@ -26,6 +29,37 @@ namespace ZUGFeRDRESTService.Controllers
         public const string ADDED_WHO = "ZUGFeRD REST Service";
         public const string MESSAGEID_DOMAIN = "test.wisag.de";
 
+        public const string VALIDATION_SUCCESS = "VALIDATION SUCCESS";
+        public const string REFERENCES_Rejection_30001 = "REFERENCES_Rejection_30001";
+        public const string REFERENCES_Rejection_30002 = "REFERENCES_Rejection_30002";
+        public const string REFERENCES_Rejection_30002_1 = "REFERENCES_Rejection_30002_1";
+        public const string REFERENCES_Rejection_30003_1 = "REFERENCES_Rejection_30003_1";
+        public const string REFERENCES_Rejection_30003_2 = "REFERENCES_Rejection_30003_2";
+        public const string REFERENCES_Rejection_30003_3 = "REFERENCES_Rejection_30003_3";
+        public const string REFERENCES_Rejection_30004_1 = "REFERENCES_Rejection_30004_1";
+        public const string REFERENCES_Rejection_30004_2 = "REFERENCES_Rejection_30004_2";
+        public const string REFERENCES_Rejection_30004_3 = "REFERENCES_Rejection_30004_3";
+        public const string REFERENCES_Rejection_30005_1 = "REFERENCES_Rejection_30005_1";
+        public const string REFERENCES_Rejection_30005_2 = "REFERENCES_Rejection_30005_2";
+        public const string REFERENCES_Rejection_30006 = "REFERENCES_Rejection_30006";
+        public const string REFERENCES_Rejection_30007 = "REFERENCES_Rejection_30007";
+        public const string REFERENCES_Rejection_30007_1 = "REFERENCES_Rejection_30007_1";
+        public const string REFERENCES_Rejection_30008 = "REFERENCES_Rejection_30008";
+        public const string REFERENCES_Rejection_30009 = "REFERENCES_Rejection_30009";
+        public const string REFERENCES_Rejection_30010 = "REFERENCES_Rejection_30010";
+        public const string REFERENCES_Rejection_30011 = "REFERENCES_Rejection_30011";
+        public const string REFERENCES_Rejection_30012 = "REFERENCES_Rejection_30012";
+        public const string AMOUNT_CALC_REJECTION = "AMOUNT_CALC_REJECTION";
+
+        public const string GERMAN = "de-DE";
+        public const string ENGLISH = "en-US";
+        public const string FRENCH = "fr-FR";
+        public const string SPAIN = "es-ES";
+
+        private List<string> _ValidationErrors;
+        private List<string> _AllowedLanguageCodes;
+        private string _UserLanguageCode = GERMAN;
+
         private const int MAX_FILE_SIZE_DEFAULT = 25;
 
         private readonly ZUGFeRDInterface _zugferd;
@@ -33,10 +67,9 @@ namespace ZUGFeRDRESTService.Controllers
 
         private readonly DigitalData.Modules.Logging.LogConfig _logConfig;
         private readonly DigitalData.Modules.Logging.Logger _logger;
-        private readonly DigitalData.Modules.Filesystem.File _file;
+        //private readonly DigitalData.Modules.Filesystem.File _file;
 
         private readonly PropertyValues _props;
-        //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>();
 
@@ -54,8 +87,6 @@ namespace ZUGFeRDRESTService.Controllers
         {
             _logConfig = logging.LogConfig;
             _logger = _logConfig.GetLogger();
-            _file = new DigitalData.Modules.Filesystem.File(_logConfig);
-
             _logger.Debug("Validation Controller initializing");
 
             // Read config file and assign all option flags related to
@@ -82,7 +113,37 @@ namespace ZUGFeRDRESTService.Controllers
             _logger.Debug("Property Map list initial: [{0}] entries found. [{1}] entries will be available.", oPropertyMapList.Count, _propertyMapList.Count);
 
             _RecjectionMessageList = database.GetRejectionMessageList();
-            
+
+            _ValidationErrors = new List<String>() {
+                REFERENCES_Rejection_30001,
+                REFERENCES_Rejection_30002,
+                REFERENCES_Rejection_30003_1,
+                REFERENCES_Rejection_30003_2,
+                REFERENCES_Rejection_30003_3,
+                REFERENCES_Rejection_30004_1,
+                REFERENCES_Rejection_30004_2,
+                REFERENCES_Rejection_30004_3,
+                REFERENCES_Rejection_30005_1,
+                REFERENCES_Rejection_30005_2,
+                REFERENCES_Rejection_30006,
+                REFERENCES_Rejection_30007,
+                REFERENCES_Rejection_30007_1,
+                REFERENCES_Rejection_30008,
+                REFERENCES_Rejection_30009,
+                REFERENCES_Rejection_30010,
+                REFERENCES_Rejection_30011,
+                REFERENCES_Rejection_30012,
+                AMOUNT_CALC_REJECTION
+            };
+
+            _AllowedLanguageCodes = new List<string>()
+            {
+                GERMAN,
+                ENGLISH,
+                FRENCH,
+                SPAIN,
+            };
+
             _logger.Debug("Validation Controller initialized!");
         }
 
@@ -146,14 +207,58 @@ namespace ZUGFeRDRESTService.Controllers
         /// </summary>
         /// <param name="file">This parameter's name needs to correspond to the html form's file-input name</param>
         /// <param name="user_id">This is the email address which the user supplied</param>
+        /// <param name="language_id">This is language code which the user supplied (en-US, de-DE)</param>
         [HttpPost]
-        public ValidationResponse Post(IFormFile file, string user_id)
+        public ValidationResponse Post(IFormCollection collection)
         {
             _logger.Info("Start processing request to ValidationController");
 
             ZugferdResult oZugferdResult = null;
             CheckPropertyValuesResult oPropertyResult = new CheckPropertyValuesResult();
 
+            var oUserId = string.Empty; 
+            var oLanguageId = GERMAN; 
+            
+            IFormFile file = collection.Files[0];
+
+            foreach (var keyItem in collection.Keys)
+            {
+                if (keyItem == "user_id")
+                {
+                    oUserId = collection[keyItem];
+                }
+                else if (keyItem == "language_id")
+                {
+                    oLanguageId = collection[keyItem];
+                }
+            }
+            
+            if (!string.IsNullOrEmpty(oUserId))
+            {
+                _logger.Info("UserID set to [{0}].", oUserId);
+            } 
+            else
+            {
+                _logger.Info("UserID is empty!");
+            }
+
+            if (string.IsNullOrEmpty(oLanguageId))
+            {
+                _logger.Info("Language code was empty. Set to default 'de-DE'");
+                // DEFAULT-Sprache = Deutsch de-DE
+                _UserLanguageCode = GERMAN;
+            }
+            else if (_AllowedLanguageCodes.Where(i => i.Equals(oLanguageId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault() != null)
+            {
+                _logger.Info("Language code is allowed. Set to [{0}].", oLanguageId);
+                _UserLanguageCode = oLanguageId;
+            }
+            else
+            {
+                _logger.Info("Language code was unknown: [{0}]. Set to default 'de-DE'", oLanguageId);
+                _UserLanguageCode = GERMAN;
+            }
+
             try
             {
                 using Stream oStream = file.OpenReadStream();
@@ -165,7 +270,6 @@ namespace ZUGFeRDRESTService.Controllers
 
                     if (oFileSizeIsOK == false)
                     {
-                        //throw new ZUGFeRDExecption(ErrorType.FileTooBig, "FileTooBig");
                         throw new ZUGFeRDExecption(ErrorCodes.FileSizeLimitReachedException, _MaxFileSizeInMegabytes.ToString(), string.Empty, "FileTooBig");
                     }
 
@@ -174,6 +278,7 @@ namespace ZUGFeRDRESTService.Controllers
                     if (file.FileName.EndsWith(".pdf", StringComparison.OrdinalIgnoreCase))
                     {
                         oZugferdResult = _zugferd.ExtractZUGFeRDFileWithGDPicture(oStream);
+                        oZugferdResult.ReceiptFileType = "PDF";
                     }
                     else if (file.FileName.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
                     {
@@ -185,23 +290,23 @@ namespace ZUGFeRDRESTService.Controllers
                         };
 
                         oZugferdResult = _zugferd.SerializeZUGFeRDDocument(oResult);
+                        oZugferdResult.ReceiptFileType = "XML";
                     }
 
                     _logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification);
 
-                    var oFilteredPropertyMap = _zugferd.FilterPropertyMap(_propertyMapList, 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(ErrorCodes.UnsupportedFerdException, "Unsupported Format");
-                    } 
+                    }
                     else
                     {
                         _logger.Debug("Property map contains [{0}] entries for specification [{1}]", oFilteredPropertyMap.Count, oZugferdResult.Specification);
                     }
-                    
+
                     _logger.Info("Starting structural check against the database.");
 
                     oPropertyResult = _props.CheckPropertyValues(oZugferdResult.SchemaObject, oFilteredPropertyMap, "MESSAGEID");
@@ -219,24 +324,21 @@ namespace ZUGFeRDRESTService.Controllers
 
                     if (oPropertyResult.MissingProperties.Count > 0)
                     {
-                        //throw new ZUGFeRDExecption(ErrorType.MissingProperties, "Missing Properties");
                         throw new ZUGFeRDExecption(ErrorCodes.MissingValueException, "Missing Properties");
-                    }                   
+                    }
 
-                    Tuple<bool, string> oValidateResult = ValidateBuyerOrderReference(oPropertyResult.ValidProperties);
+                    Tuple<bool, string> oValidateResult = ValidateBuyerOrderReference(oPropertyResult.ValidProperties, oZugferdResult);
 
                     if (oValidateResult.Item1 == false)
                     {
-                        //throw new ZUGFeRDExecption(ErrorType.UnknownError, "Unknown Error");
                         throw new ZUGFeRDExecption(ErrorCodes.UnhandledException, "Unknown Error");
                     }
 
                     string oValidateResultString = oValidateResult.Item2;
 
-                    if (oValidateResultString == "ALL REFERENCES CHECKED POSITIVE")
+                    if (oValidateResultString.Equals(VALIDATION_SUCCESS))
                     {
                         string oMessage = "Die hochgeladene Datei ist eine gültige-ZUGFeRD Rechnung";
-
                         _logger.Info($"Responding with message: [{oMessage}]");
 
                         return new ValidationResponse()
@@ -244,10 +346,10 @@ namespace ZUGFeRDRESTService.Controllers
                             status = RESPONSE_OK,
                             message = oMessage
                         };
-                    } else
+                    }
+                    else
                     {
                         string oMessage = oValidateResultString;
-
                         _logger.Info($"Responding with message: [{oMessage}]");
 
                         return new ValidationResponse()
@@ -256,7 +358,8 @@ namespace ZUGFeRDRESTService.Controllers
                             message = oMessage
                         };
                     }
-                };
+                }
+
             }
             catch (ZUGFeRDExecption ex)
             {
@@ -282,26 +385,24 @@ namespace ZUGFeRDRESTService.Controllers
                         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 + ")"));
+                            var oErrorsText = GetMissingValuesListString(oPropertyResult.MissingProperties);
+                            if (!string.IsNullOrEmpty(oErrorsText) && oMessage.Contains("@REPLACE_PARAM3", StringComparison.OrdinalIgnoreCase))
+                            {
+                                oMessage = Regex.Replace(oMessage, "@REPLACE_PARAM3", oErrorsText, RegexOptions.IgnoreCase);
+                            }
                             break;
                         default:
                             break;
                     }
                 }
-                else 
+                else
                 {
-                    oMessage = "Alte Logik. Meldung nicht gefunden";                
+                    oMessage = "Alte Logik. Meldung nicht gefunden";
                 }
 
                 _logger.Info($"Responding with message: [{oMessage}]");
@@ -315,21 +416,61 @@ namespace ZUGFeRDRESTService.Controllers
             }
             catch (ValidationException ex)
             {
+                _logger.Error(ex);
+
                 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 =>
+                // Wenn es ValidationErrors gibt, werden diese nun übersetzt und in eine Liste übertragen werden
-                {
-                    return $"Element '{e.ElementName}' mit Wert '{e.ElementValue}': {e.ErrorMessageDE}";
-                }).ToList();
 
+                var mainText = GetTextByToken("ItemValueText");
+                var resultList = new List<string>();
+                foreach (var errorItem in ex.ValidationErrors)
+                {
+                    var resultString = mainText;
+
+                    if (!string.IsNullOrEmpty(errorItem.ElementName))
+                    {
+                        // replace @ITEM_NAME => e.ElementName
+                        resultString = resultString.Replace("@ITEM_NAME", errorItem.ElementName, StringComparison.OrdinalIgnoreCase);
+                    }
+
+                    if (!string.IsNullOrEmpty(errorItem.ElementValue))
+                    {
+                        // replace ITEM_VALUE => e.ElementValue
+                        resultString = resultString.Replace("@ITEM_VALUE", errorItem.ElementValue, StringComparison.OrdinalIgnoreCase);
+                    }
+
+                    var itemErrorText = GetTextByToken(errorItem.ErrorMessageToken);
+                    if (!string.IsNullOrEmpty(itemErrorText))
+                    {
+                        // attach itemErrorText
+                        resultString += " " + itemErrorText;
+                    }
+
+                    _logger.Debug($"resultString: [{resultString}]");
+                    resultList.Add(resultString);
+                }
+
+                // wenn ergebnisse vorliegen, in html transformieren und anhängen
+                if (resultList.Count > 0)
+                {
+                    var htmlResultString = "<ul>";
+                    foreach (var resultItem in resultList)
+                    {
+                        htmlResultString += " <li>" + resultItem + "</li>" + Environment.NewLine;
+                    }
+                    htmlResultString += " </ul>";
+
+                    oMessage += " " + htmlResultString;
+                }
+               
                 return new ValidationResponse()
                 {
                     status = RESPONSE_ERROR,
-                    message = oMessage,
+                    message = oMessage
-                    errors = oErrors
                 };
             }
             catch (Exception ex)
@@ -348,20 +489,73 @@ namespace ZUGFeRDRESTService.Controllers
             }
         }
 
-        private Tuple<bool, string> ValidateBuyerOrderReference(List<ValidProperty> pProperties)
+        private string GetMissingValuesListString(List<MissingProperty> missingProperties)
+        {
+            if (missingProperties == null || missingProperties.Count == 0)
+            {
+                return string.Empty;
+            }
+
+            string retValue = "<ul>";
+            foreach (var missingProperty in missingProperties) 
+            {
+                var searchToken = missingProperty.EN16931_ID + "_Description";
+                var descriptionTranslated = GetTextByToken(searchToken);
+                var rowString = "<li>" + missingProperty.EN16931_ID + " (" + descriptionTranslated + ")</li>";
+                retValue += rowString;
+            }
+            retValue += "</ul>";
+
+            return retValue;
+        }
+
+        /// <summary>
+        /// Holt sprachgenauen Text anhand eines Titel-Tokens
+        /// </summary>
+        /// <returns></returns>
+        private string GetTextByToken(string tokenValue)
+        {
+            RejectionStringRow stringRow = null;
+
+            if (!string.IsNullOrEmpty(tokenValue))
+            {
+                stringRow = _RecjectionMessageList.Where(i => i.Title.Equals(tokenValue, StringComparison.OrdinalIgnoreCase) &&
+                                                        i.Language.Equals(_UserLanguageCode, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+                if (stringRow == null &&
+                    !_UserLanguageCode.Equals(GERMAN, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Wenn kein sprachgenauer Text vorliegt, hole den deutschen Text.
+                    stringRow = _RecjectionMessageList.Where(i => i.Title.Equals(tokenValue, StringComparison.OrdinalIgnoreCase) &&
+                                                                i.Language.Equals(GERMAN, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+                }
+            }
+
+            string retValue = string.Empty;
+
+            if (stringRow != null)
+            {
+               retValue = !string.IsNullOrEmpty(stringRow.String1) ? stringRow.String1.Trim() : string.Empty;
+            }
+
+            _logger.Debug($"Token [{tokenValue}] - String1 [{retValue}]");
+            return retValue;
+        }
+
+        /// <summary>
+        /// Hier wird eine externe Prozedur gerufen, PRCUST_INV_CHECK_FROM_PORTAL,
+        /// die das Ergebnis der Referenzpruefung liefert.
+        /// </summary>
+        private Tuple<bool, string> ValidateBuyerOrderReference(List<ValidProperty> pProperties, ZugferdResult pZugferdResult)
         {
             var oMessageId = GetMessageId();
-            _logger.Debug("Created new MessageId: [{0}]", oMessageId);          
+            _logger.Debug("Created new MessageId: [{0}]", oMessageId);
 
             _logger.Debug("Inserting properties into database.");
-            foreach (var oItem in pProperties)
+            if (!BulkInsertDataToDatabase(oMessageId, pProperties, pZugferdResult))
             {
-                var oResult = InsertPropertyMap(oItem, oMessageId);
+                _logger.Warn("Error while Inserting properties into database!");
-
+                return new Tuple<bool, string>(false, string.Empty);
-                if (oResult == false)
-                {
-                    _logger.Warn("Error while inserting the Property [{0}] into the Database!", oItem.Description);
-                }
             }
 
             _logger.Debug("Calling validation prodecure.");
@@ -377,6 +571,57 @@ namespace ZUGFeRDRESTService.Controllers
                 if (_database.MSSQL.ExecuteNonQuery(oCommand))
                 {
                     string oReturnValue = (string)oCommand.Parameters["@MSG_OUTPUT"].Value;
+
+                    _logger.Debug("Validation Result message from DB: " + oReturnValue);
+
+                    if (oReturnValue.Equals("ALL REFERENCES CHECKED POSITIVE", StringComparison.OrdinalIgnoreCase))
+                    {
+                        _logger.Debug("Validation Success");
+                        oReturnValue = VALIDATION_SUCCESS;
+                    }
+                    else
+                    {
+                        // Gehe durch die möglichen Fehler, und ermittle Rückmeldung
+                        foreach (var oRejectionItem in _ValidationErrors)
+                        {
+                            if (oReturnValue.Contains(oRejectionItem, StringComparison.OrdinalIgnoreCase))
+                            {
+                                _logger.Debug("oRejectionItem match: " + oRejectionItem);
+
+                                var oDbMessage = this.GetRejectionMessage(oRejectionItem);
+
+                                //Jetzt müssen ggf Platzhalter ersetzt werden.
+                                if (oRejectionItem == REFERENCES_Rejection_30003_2) 
+                                {
+                                    string oReplaceParam1 = GetReplaceText1_30003_2(pProperties);
+                                    string oReplaceParam2 = GetReplaceText2_30003_2(pProperties);
+
+                                    oReturnValue = oDbMessage.Replace("@REPLACE_PARAM1", oReplaceParam1);
+                                    oReturnValue = oReturnValue.Replace("@REPLACE_PARAM2", oReplaceParam2);
+
+                                }
+                                else if (oRejectionItem == REFERENCES_Rejection_30003_3)
+                                {
+                                    string oReplaceParam1 = GetReplaceText1_30003_3(pProperties);
+
+                                    oReturnValue = oDbMessage.Replace("@REPLACE_PARAM1", oReplaceParam1);
+                                }
+                                else if (oRejectionItem == REFERENCES_Rejection_30001)
+                                {
+                                    // TODO - BUKR?
+                                    oReturnValue = oDbMessage.Replace("@REPLACE_PARAM1", "9999"); 
+                                }
+                                else
+                                {
+                                    oReturnValue = oDbMessage;
+                                }
+
+                                break;
+                            }
+                        }
+                    }
+
+                    _logger.Debug("Validation terminal Result message: " + oReturnValue);
                     return new Tuple<bool, string>(true, oReturnValue);
 
                 }
@@ -390,86 +635,391 @@ namespace ZUGFeRDRESTService.Controllers
             {
                 _logger.Error(e);
                 return new Tuple<bool, string>(false, string.Empty);
-            }          
+            }
         }
 
-        public string GetMessageId()
+        private string GetReplaceText1_30003_3(List<ValidProperty> pProperties)
+        {
+            string oReplaceParam1 = string.Empty;
+
+            // BuyerOrderReferencedDocument
+            var itemBT13 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE").FirstOrDefault();
+            string valueBt13 = "-";
+            if (itemBT13 != null)
+            {
+                valueBt13 = string.IsNullOrEmpty(itemBT13.Value) ? "-" : itemBT13.Value;
+            }
+            oReplaceParam1 += "<li>[BuyerOrderReferencedDocument] (BT-13) = [" + valueBt13 + "]</li>";
+
+
+            // BuyerReference
+            var itemBT10 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE3").FirstOrDefault();
+            string valueBt10 = "-";
+            if (itemBT10 != null)
+            {
+                valueBt10 = string.IsNullOrEmpty(itemBT10.Value) ? "-" : itemBT10.Value;
+            }
+            oReplaceParam1 += "<li>[BuyerReference] (BT-10) = [" + valueBt10 + "]</li>";
+
+
+            // CostCenter
+            var itemBT19 = pProperties.Where(i => i.TableColumn == "INVOICE_COST_CENTER").FirstOrDefault();
+            string valueBt19 = "-";
+            if (itemBT19 != null)
+            {
+                valueBt19 = string.IsNullOrEmpty(itemBT19.Value) ? "-" : itemBT19.Value;
+            }
+            oReplaceParam1 += "<li>[CostCenter] (BT-19) = [" + valueBt19 + "]</li>";
+
+            // BuyerID
+            var itemBT46 = pProperties.Where(i => i.TableColumn == "INVOICE_BUYER_ID").FirstOrDefault();
+            string valueBt46 = "-";
+            if (itemBT46 != null)
+            {
+                valueBt46 = string.IsNullOrEmpty(itemBT46.Value) ? "-" : itemBT46.Value;
+            }
+            oReplaceParam1 += "<li>[BuyerTradeParty] (BT-46) = [" + valueBt46 + "]</li>";
+
+            oReplaceParam1 = "<ul>" + oReplaceParam1 + "</ul>";
+            _logger.Debug("oReplaceParam1-Text: " + oReplaceParam1);
+
+            return oReplaceParam1;
+        }
+
+        private string GetReplaceText2_30003_2(List<ValidProperty> pProperties)
+        {
+            string oReplaceParam2 = string.Empty;
+
+            // BuyerTradeParty.Name
+            var itemBT44 = pProperties.Where(i => i.TableColumn == "INVOICE_BUYER_NAME").FirstOrDefault();
+            string valueBt44 = "-";
+            if (itemBT44 != null)
+            {
+                valueBt44 = string.IsNullOrEmpty(itemBT44.Value) ? "-" : itemBT44.Value;
+            }
+            oReplaceParam2 += "<li>[BuyerTradeParty.Name] (BT-44) = [" + valueBt44 + "]</li>";
+
+            // BuyerTradeParty.PostalTradeAddress.LineTwo
+            var itemBT51 = pProperties.Where(i => i.TableColumn == "INVOICE_BUYER_ADRESS2").FirstOrDefault();
+            string valueBt51 = "-";
+            if (itemBT51 != null)
+            {
+                valueBt51 = string.IsNullOrEmpty(itemBT51.Value) ? "-" : itemBT51.Value;
+            }
+            oReplaceParam2 += "<li>[BuyerTradeParty.PostalTradeAddress.LineTwo] (BT-51) = [" + valueBt51 + "]</li>";
+
+            oReplaceParam2 = "<ul>" + oReplaceParam2 + "</ul>";
+            _logger.Debug("oReplaceParam2-Text: " + oReplaceParam2);
+
+            return oReplaceParam2;
+        }
+
+        private string GetReplaceText1_30003_2(List<ValidProperty> pProperties)
+        {
+            string oReplaceParam1 = string.Empty;
+
+            // BuyerOrderReferencedDocument
+            var itemBT13 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE").FirstOrDefault();
+            string valueBt13 = "-";
+            if (itemBT13 != null)
+            {
+                valueBt13 = string.IsNullOrEmpty(itemBT13.Value) ? "-" : itemBT13.Value;
+            }
+            oReplaceParam1 += "<li>[BuyerOrderReferencedDocument] (BT-13) = [" + valueBt13 + "]</li>";
+
+
+            // BuyerReference
+            var itemBT10 = pProperties.Where(i => i.TableColumn == "INVOICE_REFERENCE3").FirstOrDefault();
+            string valueBt10 = "-";
+            if (itemBT10 != null)
+            {
+                valueBt10 = string.IsNullOrEmpty(itemBT10.Value) ? "-" : itemBT10.Value;
+            }
+            oReplaceParam1 += "<li>[BuyerReference] (BT-10) = [" + valueBt10 + "]</li>";
+
+
+            // CostCenter
+            var itemBT19 = pProperties.Where(i => i.TableColumn == "INVOICE_COST_CENTER").FirstOrDefault();
+            string valueBt19 = "-";
+            if (itemBT19 != null)
+            {
+                valueBt19 = string.IsNullOrEmpty(itemBT19.Value) ? "-" : itemBT19.Value;
+            }
+            oReplaceParam1 += "<li>[CostCenter] (BT-19) = [" + valueBt19 + "]</li>";
+
+            oReplaceParam1 = "<ul>" + oReplaceParam1 + "</ul>";
+            _logger.Debug("oReplaceParam1-Text: " + oReplaceParam1);
+
+            return oReplaceParam1;
+        }
+
+        private string GetMessageId()
         {
             return $"{Guid.NewGuid()}@{MESSAGEID_DOMAIN}";
         }
 
-        public bool InsertPropertyMap(ValidProperty pProperty, string pMessageId)
+        private bool BulkInsertDataToDatabase(string pMessageId, List<ValidProperty> pProperties, ZugferdResult pZugferdResult)
+        {
+            if (string.IsNullOrEmpty(pMessageId)) 
+            {
+                return false;
+            }
+
+            if (!DeleteExistingPropertyValues(pMessageId)) 
+            {
+                return false;
+            }
+
+            DataTable oDataTable = PrepareDataTable(pMessageId, pProperties, pZugferdResult);
+
+            // ColumnList initialisieren
+            List<string> oColumnNames = new List<string> {
+                    "REFERENCE_GUID",
+                    "ITEM_DESCRIPTION",
+                    "ITEM_VALUE",
+                    "GROUP_COUNTER",
+                    "SPEC_NAME",
+                    "IS_REQUIRED"
+                 };
+
+            bool oBulkResult = BulkInsert(oDataTable, "TBEDMI_ITEM_VALUE", oColumnNames);
+
+            if (!oBulkResult)
+            {
+                _logger.Error("Bulk Insert for MessageId [{0}] failed!", pMessageId);
+                return false;
+            }
+
+            _logger.Info("Bulk Insert finished. [{0}] rows inserted for MessageId [{1}].", oDataTable.Rows.Count, pMessageId);
+            return true;
+        }
+
+        private bool BulkInsert(DataTable pDataTable, string pDestinationTable, List<string> pColumnNames)
+        {
+            using (var oSqlBulkCopy = new SqlBulkCopy(_database.MSSQL.GetConnection()))
+            {
+                oSqlBulkCopy.DestinationTableName = pDestinationTable;
+                foreach (var columnItem in pColumnNames)
+                {
+                    oSqlBulkCopy.ColumnMappings.Add(new SqlBulkCopyColumnMapping(columnItem, columnItem));
+                }
+
+                try
+                {
+                    oSqlBulkCopy.WriteToServer(pDataTable);
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error(ex);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private DataTable PrepareDataTable(string pMessageId, List<ValidProperty> pProperties, ZugferdResult pDocument)
+        {
+            DataTable oDataTable = new DataTable();
+            oDataTable.Columns.Add(new DataColumn("REFERENCE_GUID", typeof(string)));
+            oDataTable.Columns.Add(new DataColumn("ITEM_DESCRIPTION", typeof(string)));
+            oDataTable.Columns.Add(new DataColumn("ITEM_VALUE", typeof(string)));
+            oDataTable.Columns.Add(new DataColumn("GROUP_COUNTER", typeof(Int32)));
+            oDataTable.Columns.Add(new DataColumn("SPEC_NAME", typeof(string)));
+            oDataTable.Columns.Add(new DataColumn("IS_REQUIRED", typeof(bool)));
+
+            // Erste Zeile enthält die Spezifikation
+            DataRow oFirstRow = oDataTable.NewRow();
+            oFirstRow["REFERENCE_GUID"] = pMessageId;
+            oFirstRow["ITEM_DESCRIPTION"] = "Verwendete Spezifikation der E-Rechnung";
+            oFirstRow["ITEM_VALUE"] = pDocument.Specification;
+            oFirstRow["GROUP_COUNTER"] = 0;
+            oFirstRow["SPEC_NAME"] = "ZUGFERD_SPECIFICATION";
+            oFirstRow["IS_REQUIRED"] = false;
+
+            _logger.Debug("Mapping Property [ZUGFERD_SPECIFICATION] with value [{0}]", pDocument.Specification);
+            oDataTable.Rows.Add(oFirstRow);
+
+            //' Zweite Zeile enthält das verwendete XML Schema
+            DataRow oSecondRow = oDataTable.NewRow();
+            oSecondRow["REFERENCE_GUID"] = pMessageId;
+            oSecondRow["ITEM_DESCRIPTION"] = "Verwendetes XML-Schema (XSD) der E-Rechnung";
+            oSecondRow["ITEM_VALUE"] = pDocument.UsedXMLSchema;
+            oSecondRow["GROUP_COUNTER"] = 0;
+            oSecondRow["SPEC_NAME"] = "ZUGFERD_XML_SCHEMA";
+            oSecondRow["IS_REQUIRED"] = false;
+
+            _logger.Debug("Mapping Property [ZUGFERD_XML_SCHEMA] with value [{0}]", pDocument.UsedXMLSchema);
+            oDataTable.Rows.Add(oSecondRow);
+
+            //' Dritte Zeile enthält das verwendete Datei-Format des Belegs (PDF/XML)
+            if (pDocument.ReceiptFileType != null)
+            {
+                DataRow oThirdRow = oDataTable.NewRow();
+                oThirdRow["REFERENCE_GUID"] = pMessageId;
+                oThirdRow["ITEM_DESCRIPTION"] = "Dateityp der E-Rechnung";
+                oThirdRow["ITEM_VALUE"] = pDocument.ReceiptFileType;
+                oThirdRow["GROUP_COUNTER"] = 0;
+                oThirdRow["SPEC_NAME"] = "RECEIPT_FILE_TYPE";
+                oThirdRow["IS_REQUIRED"] = false;
+
+                _logger.Debug("Mapping Property [RECEIPT_FILE_TYPE] with value [{0}]", pDocument.ReceiptFileType);
+                oDataTable.Rows.Add(oThirdRow);
+            }
+
+            foreach (var propertyItem in pProperties)
+            {
+
+                // ItemType = 3 => eingebettete Datei, nicht den base64 speichern
+                if (propertyItem.ItemType == 3)
+                {
+                    continue;
+                }
+
+                // ItemType = 0 (normale texte) dürfen nicht leer sein - leere Werte werden überlesen
+                if (propertyItem.ItemType == 0 && string.IsNullOrEmpty(propertyItem.Value))
+                {
+                    continue;
+                }
+
+                // If GroupCounter is -1, it means this is a default property that can only occur once.
+                // Set the actual inserted value to 0
+                var oGroupCounterValue = propertyItem.GroupCounter < 0 ? 0 : propertyItem.GroupCounter;
+
+                if (propertyItem.Value.Length > 4000)
+                {
+                    _logger.Warn("Value for field [{0}] is longer than 4000 characters, will be truncated!", propertyItem.TableColumn);
+                    propertyItem.Value = propertyItem.Value.Substring(0, 4000);
+                }
+
+                // Description mit BT-Feld aufbereiten
+                var betterDescription = propertyItem.Description;
+                if (!string.IsNullOrEmpty(propertyItem.EN16931_ID))
+                {
+                    betterDescription = propertyItem.EN16931_ID + " (" + propertyItem.Description + ")";
+                }
+
+                DataRow newRow = oDataTable.NewRow();
+                newRow["REFERENCE_GUID"] = pMessageId;
+                newRow["ITEM_DESCRIPTION"] = betterDescription;
+                newRow["ITEM_VALUE"] = propertyItem.Value;
+                newRow["GROUP_COUNTER"] = oGroupCounterValue;
+                newRow["SPEC_NAME"] = propertyItem.TableColumn;
+                newRow["IS_REQUIRED"] = propertyItem.IsRequired;
+
+                _logger.Debug("Mapping Property [{0}] with value [{1}]", propertyItem.TableColumn, propertyItem.Value);
+                oDataTable.Rows.Add(newRow);
+            }
+
+            return oDataTable;
+        }
+
+        private bool DeleteExistingPropertyValues(string pMessageId)
         {
             try
             {
-                if (pProperty.ItemType == 3)
+                var delItemValueSQL = "DELETE FROM TBEDMI_ITEM_VALUE WHERE REFERENCE_GUID = '" + pMessageId + "';";
+                var oCommand = new SqlCommand(delItemValueSQL);
+                var retValue = _database.MSSQL.ExecuteNonQuery(oCommand);
+
+                if (!retValue)
                 {
-                    // Wir speichern keine Attachment-Werte in die DB
+                    _logger.Warn("DELETE FROM TBEDMI_ITEM_VALUE NOT successfull");
-                    return true;
+                    return false;
                 }
 
-                if (pProperty.ItemType == 0 && string.IsNullOrEmpty(pProperty.Value.ToString()))
+                _logger.Debug("DELETE FROM TBEDMI_ITEM_VALUE successfull");
-                {
-                    // 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", itemValue.Replace("'", "''")),
-                    new SqlParameter("@CREATEDWHO", ADDED_WHO),
-                    new SqlParameter("@GROUP_COUNTER", pProperty.GroupCounter),
-                    new SqlParameter("@SPEC_NAME", pProperty.TableColumn),
-                    new SqlParameter("@IS_REQUIRED", pProperty.IsRequired)
-                };
-
-                var oCommand = new SqlCommand(oSql);
-                oCommand.Parameters.AddRange(oParams);
-
-                return _database.MSSQL.ExecuteNonQuery(oCommand);
             }
             catch (Exception ex)
             {
                 _logger.Error(ex);
                 return false;
-            }    
+            }
+
+            try
+            {
+                var delItemFilesSQL = "DELETE FROM TBEDMI_ITEM_FILES WHERE REFERENCE_GUID = '" + pMessageId + "';";
+                var oCommand = new SqlCommand(delItemFilesSQL);
+                var retValue = _database.MSSQL.ExecuteNonQuery(oCommand);
+
+                if (!retValue)
+                {
+                    _logger.Warn("DELETE FROM TBEDMI_ITEM_FILES NOT successfull");
+                    return false;
+                }
+                _logger.Debug("DELETE FROM TBEDMI_ITEM_FILES successfull");
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex);
+                return false;
+            }
+
+            return true;
         }
 
         /// <summary>
         /// Ermittelt die Ausgabe-nachricht für einen Fehlercode 
         /// </summary>
-        public string GetRejectionMessage(string pErrorCode)
+        private 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 searchTitle = string.Empty;
-            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 (pErrorCode.Contains("2000"))
-            if (messageItem != null)
             {
-                _logger.Info("GetRejectionMessage() - messageItem: '" + messageItem.String1 + "'");
+                searchTitle = "ZUGFERD_Rejection_" + pErrorCode + "_Web";
-                return messageItem.String1;
+            }
+            else if (pErrorCode.Contains("REFERENCES_Rejection_3000"))
+            {
+                searchTitle = pErrorCode + "_Web";
+            }
+            else if (pErrorCode.Contains("AMOUNT_CALC"))
+            {
+                searchTitle = "AMOUNT_CALC_REJECTION_Web";
+            }
+            else
+            {
+                searchTitle = "ZUGFERD_Rejection_20006_Web";
+            }
+
+            // Sprachgenauen Text suchen.
+            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) &&
+                                                                i.Language.Equals(_UserLanguageCode, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+            if (messageItem == null && 
+                !_UserLanguageCode.Equals(GERMAN, StringComparison.OrdinalIgnoreCase)) {
+
+                _logger.Info("GetRejectionMessage() - Es wurde kein passender Text für die Sprache [{0}] gefunden.", _UserLanguageCode);
+
+                // Wenn kein sprachgenauer Text vorliegt, hole den deutschen Text.
+                messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) &&
+                                                                i.Language.Equals(GERMAN, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            }
+
+            if (messageItem != null && !string.IsNullOrEmpty(pErrorCode))
+            {
+                var resultText = string.Empty;
+
+                // Der REJECTION-Code wird in allen Meldungen ausgetauscht.
+                if (messageItem.String1.Contains("@REJECTION_CODE", StringComparison.OrdinalIgnoreCase))
+                {
+                    var substituteText = this.GetLabelText("Ablehnungscode", _UserLanguageCode);
+                    substituteText = string.IsNullOrEmpty(substituteText) ? "Ablehnungscode" : substituteText;
+                    substituteText = substituteText + ": " + pErrorCode;
+
+                    resultText = Regex.Replace(messageItem.String1, "@REJECTION_CODE", substituteText, RegexOptions.IgnoreCase);
+                } 
+                else
+                {
+                    resultText = messageItem.String1;
+                }
+
+                _logger.Info("GetRejectionMessage() - messageItem: '" + resultText + "'");
+                return resultText;
             }
             else
             {
@@ -478,6 +1028,15 @@ namespace ZUGFeRDRESTService.Controllers
             }
         }
 
+        private string GetLabelText(string pLabel, string pLanguage)
+        {
+            // Sprachgenauen Text suchen.
+            var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(pLabel, StringComparison.OrdinalIgnoreCase) &&
+                                                                i.Language.Equals(pLanguage, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+
+            return messageItem != null ? messageItem.String1 : string.Empty;
+        }
+
         private string GetRejectionCodeNumber(ErrorCodes rejectionCode)
         {
             switch (rejectionCode)

WEBSERVICES/ZUGFeRDRESTService/Pages/Index.cshtml

@@ -15,7 +15,12 @@
         <label>Benutzerkennung/Email:</label>
         <input type="email" name="user_id" required />
     </p>
-    
+
+    <p>
+        <label>Sprachcode (de-DE etc.):</label>
+        <input type="text" name="language_id" value="de-DE" required />
+    </p>
+
     <button type="submit">Submit</button>
 </form>
 

WEBSERVICES/ZUGFeRDRESTService/appsettings.Development.json

@@ -20,11 +20,11 @@
     },
 	"Zugferd": {
       "AllowZugferd10": true,
-      "AllowZugferd2x": false,
+      "AllowZugferd2x": true,
-      "AllowZugferd23x": false,
+      "AllowZugferd23x": true,
-      "AllowFacturX": false,
+      "AllowFacturX": true,
-      "AllowXRechnung": false,
+      "AllowXRechnung": true,
-      "AllowPeppolBISBill3x": false
+      "AllowPeppolBISBill3x": true
     },
     "GDPictureVersion": "",
     "MaxFileSizeInMegabytes": 25