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

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
@@ -23,24 +27,35 @@
       </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" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.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="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </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" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
+    </providers>
+    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
+  </entityFramework>
 </configuration>

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -24,7 +24,9 @@ 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.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
         Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar()
         Me.buttonPrint = New DevExpress.XtraBars.BarButtonItem()
@@ -62,8 +64,6 @@ Partial Class DocumentViewer
         Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
         Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
         Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
-        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
-        Me.lblInfo = New System.Windows.Forms.Label()
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -73,10 +73,99 @@ 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(1012, 557)
+        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"
         '
+        'RichEditControl1
+        '
+        Me.RichEditControl1.Location = New System.Drawing.Point(616, 270)
+        Me.RichEditControl1.MenuManager = Me.BarManager1
+        Me.RichEditControl1.Name = "RichEditControl1"
+        Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
+        Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
+        Me.RichEditControl1.ReadOnly = True
+        Me.RichEditControl1.Size = New System.Drawing.Size(249, 161)
+        Me.RichEditControl1.TabIndex = 0
+        Me.RichEditControl1.TabStop = False
+        Me.RichEditControl1.Visible = False
+        '
         'BarManager1
         '
         Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.ToolbarDocumentViewer})
@@ -278,15 +367,15 @@ Partial Class DocumentViewer
         Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
         Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
         Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(841, 33)
+        Me.barDockControlTop.Size = New System.Drawing.Size(1012, 33)
         '
         'barDockControlBottom
         '
         Me.barDockControlBottom.CausesValidation = False
         Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.barDockControlBottom.Location = New System.Drawing.Point(0, 555)
+        Me.barDockControlBottom.Location = New System.Drawing.Point(0, 590)
         Me.barDockControlBottom.Manager = Me.BarManager1
-        Me.barDockControlBottom.Size = New System.Drawing.Size(841, 0)
+        Me.barDockControlBottom.Size = New System.Drawing.Size(1012, 0)
         '
         'barDockControlLeft
         '
@@ -294,15 +383,15 @@ Partial Class DocumentViewer
         Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
         Me.barDockControlLeft.Location = New System.Drawing.Point(0, 33)
         Me.barDockControlLeft.Manager = Me.BarManager1
-        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 522)
+        Me.barDockControlLeft.Size = New System.Drawing.Size(0, 557)
         '
         'barDockControlRight
         '
         Me.barDockControlRight.CausesValidation = False
         Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(841, 33)
+        Me.barDockControlRight.Location = New System.Drawing.Point(1012, 33)
         Me.barDockControlRight.Manager = Me.BarManager1
-        Me.barDockControlRight.Size = New System.Drawing.Size(0, 522)
+        Me.barDockControlRight.Size = New System.Drawing.Size(0, 557)
         '
         'BarStaticItem1
         '
@@ -346,7 +435,7 @@ Partial Class DocumentViewer
         '
         'SpreadsheetControl1
         '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(31, 152)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(316, 270)
         Me.SpreadsheetControl1.MenuManager = Me.BarManager1
         Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
         Me.SpreadsheetControl1.ReadOnly = True
@@ -369,44 +458,26 @@ Partial Class DocumentViewer
         Me.lbFileNotLoaded.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
         Me.lbFileNotLoaded.Location = New System.Drawing.Point(3, 74)
         Me.lbFileNotLoaded.Name = "lbFileNotLoaded"
-        Me.lbFileNotLoaded.Size = New System.Drawing.Size(835, 72)
+        Me.lbFileNotLoaded.Size = New System.Drawing.Size(1006, 72)
         Me.lbFileNotLoaded.TabIndex = 0
         Me.lbFileNotLoaded.Tag = ""
         Me.lbFileNotLoaded.Text = "Die Datei konnte nicht geladen werden"
         Me.lbFileNotLoaded.Visible = False
         '
-        'RichEditControl1
-        '
-        Me.RichEditControl1.Location = New System.Drawing.Point(395, 238)
-        Me.RichEditControl1.MenuManager = Me.BarManager1
-        Me.RichEditControl1.Name = "RichEditControl1"
-        Me.RichEditControl1.Size = New System.Drawing.Size(400, 200)
-        Me.RichEditControl1.TabIndex = 5
-        Me.RichEditControl1.Visible = False
-        '
-        'lblInfo
-        '
-        Me.lblInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        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.TabIndex = 10
-        Me.lblInfo.Text = "Infotext"
-        '
         '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.lbFileNotLoaded)
+        Me.Controls.Add(Me.RichEditControl1)
+        Me.Controls.Add(Me.SpreadsheetControl1)
+        Me.Controls.Add(Me.GdViewer)
         Me.Controls.Add(Me.barDockControlLeft)
         Me.Controls.Add(Me.barDockControlRight)
         Me.Controls.Add(Me.barDockControlBottom)
         Me.Controls.Add(Me.barDockControlTop)
         Me.Name = "DocumentViewer"
-        Me.Size = New System.Drawing.Size(841, 555)
+        Me.Size = New System.Drawing.Size(1012, 590)
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -421,6 +492,7 @@ Partial Class DocumentViewer
 
     Friend WithEvents GdViewer As GdPicture14.GdViewer
     Friend WithEvents OpenFileDialog As OpenFileDialog
+    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
     Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
     Friend WithEvents PrintDocument1 As Printing.PrintDocument
     Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
@@ -458,6 +530,4 @@ Partial Class DocumentViewer
     Friend WithEvents lbFileNotLoaded As DevExpress.XtraEditors.LabelControl
     Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
-    Friend WithEvents lblInfo As Label
 End Class

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>

Controls.DocumentViewer/DocumentViewer.vb

@@ -22,8 +22,8 @@ Public Class DocumentViewer
 
     Private Enum ViewerMode
         GDPicture
+        RichText
         Excel
-        Richtext
     End Enum
 
     Private Enum FileLoadMode
@@ -55,22 +55,18 @@ Public Class DocumentViewer
 
     Private _hide_file_info_from_user As Boolean = False
 
-
     Private _FileStream As Stream
     Private _FilePath As String
     Private _FileInfo As FileInfo
     Private _FileLoadMode As FileLoadMode = FileLoadMode.File
-    Private _ViewOverride As String = ""
 
     ' List of all created temp files when converting msg files
     Private _TempFiles As New List(Of String)
 
     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
+
     Public Class ToolbarSettings
         Public Property ShowPrintButton As Boolean = True
         Public Property ShowFitWidthButton As Boolean = True
@@ -83,7 +79,6 @@ Public Class DocumentViewer
     End Class
 
     Public Property FileLoaded As Boolean = False
-    Public Property Viewer_ForceTemporaryMode As Boolean = False
     Public ReadOnly Property AnnotationsSaved As Boolean
         Get
             Return Not _AnnotationsPending
@@ -95,45 +90,22 @@ Public Class DocumentViewer
     ''' </summary>
     ''' <param name="pLogConfig">A LogConfig object</param>
     ''' <param name="pLicenseKey">The GDPicture.NET License Key</param>
-    Public Function Init(pLogConfig As LogConfig, pLicenseKey As String, Optional pToolbarSettings As ToolbarSettings = Nothing) As Boolean
+    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String, pToolbarSettings As ToolbarSettings)
         _logConfig = pLogConfig
         _logger = pLogConfig.GetLogger()
-
-        If pToolbarSettings Is Nothing Then
-            pToolbarSettings = New ToolbarSettings
-        End If
-
-        Try
         _email = New Email2(pLogConfig)
-            If pLicenseKey = String.Empty Then
-                _logger.Warn("License key was not provided during init-process!")
-                Return False
-            End If
         _licenseKey = pLicenseKey
         _licenseManager.RegisterKEY(_licenseKey)
         _Annotations = New Annotations(pLogConfig)
-            ' Defer creating Search until GdViewer is ready
+        _Search = New Search(pLogConfig, GdViewer)
-            EnsureSearchInitialized()
         _ToolbarSettings = pToolbarSettings
 
         Dim oConfigPath = ConfigPath()
         _Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath)
-            Return True
+    End Sub
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function
 
-    ' Create the Search helper only when both the log config and the GdViewer control exist
+    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String)
-    Private Sub EnsureSearchInitialized()
+        Init(pLogConfig, pLicenseKey, New ToolbarSettings())
-        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>
@@ -141,6 +113,7 @@ Public Class DocumentViewer
     ''' </summary>
     Public Sub LoadFile(FilePath As String)
         FileLoaded = False
+
         If _licenseKey = String.Empty Then
             _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
             Exit Sub
@@ -155,9 +128,10 @@ Public Class DocumentViewer
         _FileLoadMode = FileLoadMode.File
         _FileInfo = New FileInfo(FilePath)
 
-        _logger.Info("Loading file [{0}] from Filesystem", FilePath)
+        _logger.Info("Loading File [{0}] from Filesystem", FilePath)
-        SetViewerMode(_FileInfo.Extension)
         FileLoaded = DoLoadFile(FilePath)
+
+        SetViewerMode(_FileInfo.Extension)
         UpdateMainUi()
     End Sub
 
@@ -167,7 +141,10 @@ Public Class DocumentViewer
     Public Sub LoadFile(FileName As String, Stream As Stream)
         FileLoaded = False
 
-
+        If _licenseKey = String.Empty Then
+            _logger.Warn("License key was not provided. File [{0}] not loaded.", FileName)
+            Exit Sub
+        End If
 
         Dim oExtension As String = FileName.Substring(FileName.LastIndexOf("."))
 
@@ -236,18 +213,8 @@ Public Class DocumentViewer
     End Function
 
     Public Sub CloseDocument()
-        Try
-            ' 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
@@ -312,6 +279,12 @@ Public Class DocumentViewer
         _Config.Save()
     End Sub
 
+    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
+        Dim oControlWidth = RichEditControl1.Width - 100
+        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
+        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
+    End Sub
+
     Private Sub btnOpen_Click(sender As Object, e As EventArgs)
         GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
         GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
@@ -323,23 +296,33 @@ 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
+        If _ViewerMode = ViewerMode.GDPicture Then
             GdViewer.DisplayPreviousPage()
+        ElseIf _ViewerMode = ViewerMode.RichText Then
+            Dim oCmd As New PreviousPageCommand(RichEditControl1)
+            oCmd.Execute()
+        End If
     End Sub
 
-    Private Sub BtnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
+    Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
+        If _ViewerMode = ViewerMode.GDPicture Then
             GdViewer.DisplayNextPage()
+        ElseIf _ViewerMode = ViewerMode.RichText Then
+            Dim oCmd As New NextPageCommand(RichEditControl1)
+            oCmd.Execute()
+        End If
     End Sub
 
-    Private Sub BtnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick
+    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
@@ -361,11 +344,21 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnZoomOut_Click(sender As Object, e As EventArgs) Handles buttonZoomOut.ItemClick
+        If _ViewerMode = ViewerMode.GDPicture Then
             GdViewer.ZoomOUT()
+        ElseIf _ViewerMode = ViewerMode.RichText Then
+            Dim oCmd As New ZoomOutCommand(RichEditControl1)
+            oCmd.Execute()
+        End If
     End Sub
 
     Private Sub btnZoomIn_Click(sender As Object, e As EventArgs) Handles buttonZoomIn.ItemClick
+        If _ViewerMode = ViewerMode.GDPicture Then
             GdViewer.ZoomIN()
+        ElseIf _ViewerMode = ViewerMode.RichText Then
+            Dim oCmd As New ZoomInCommand(RichEditControl1)
+            oCmd.Execute()
+        End If
     End Sub
 
     Private Sub btnPrint_Click(sender As Object, e As EventArgs) Handles buttonPrint.ItemClick
@@ -376,11 +369,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
 
@@ -405,7 +398,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
@@ -459,18 +452,16 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub SetViewerMode(Extension As String)
-        If _ViewOverride = "Richtext" Then
-            _ViewerMode = ViewerMode.Richtext
-        Else
         Select Case Extension.ToUpper
-                Case "CSV"
+            Case ".MSG"
+                _ViewerMode = ViewerMode.RichText
+            Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                _ViewerMode = ViewerMode.RichText
+            Case ".XLSX", ".XLS", "CSV"
                 _ViewerMode = ViewerMode.Excel
-                    'Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                    '   _ViewerMode = ViewerMode.RichText
             Case Else
                 _ViewerMode = ViewerMode.GDPicture
         End Select
-        End If
     End Sub
     Private Sub FreeFile()
         Try
@@ -479,50 +470,51 @@ Public Class DocumentViewer
             End If
             Dim oExtension As String = _FileInfo.Extension.ToUpper
             Select Case _ViewerMode
+                Case ViewerMode.RichText
+                    _logger.Debug("Closing RichText Editor")
+                    RichEditControl1.CreateNewDocument()
+
                 Case ViewerMode.Excel
                     _logger.Debug("Closing Excel Editor")
                     SpreadsheetControl1.CreateNewDocument()
+
                 Case Else
                     _logger.Debug("Closing GDPicture Viewer")
                     GdViewer.CloseDocument()
+
             End Select
         Catch ex As Exception
             _logger.Warn($"Unexpected error in FreeFile: {ex.Message}")
         End Try
     End Sub
-    Private Function DoLoadFile(FilePath As String, Optional ViewOverride As String = "") As Boolean
+    Private Function DoLoadFile(FilePath As String) As Boolean
         Try
-            ' Ensure the embedded GdViewer control exists before using it
+            _logger.Debug($"Starting DoLoadFile with [{FilePath}] ...")
-            If Not EnsureViewerReady() Then
-                _logger?.Warn("GdViewer control is not initialized yet. Delaying load.")
-                Return False
-            End If
-
-            lblInfo.Visible = False
             Dim oFileInfo = New FileInfo(FilePath)
             Dim oExtension As String = oFileInfo.Extension.ToUpper
 
             lbFileNotLoaded.Visible = False
 
-            SpreadsheetControl1.Visible = False
             RichEditControl1.Visible = False
-
-            SpreadsheetControl1.Dock = DockStyle.None
             RichEditControl1.Dock = DockStyle.None
 
-            If ViewOverride = "Richtext" Then
+            SpreadsheetControl1.Visible = False
-                RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+            SpreadsheetControl1.Dock = DockStyle.None
-                RichEditControl1.Visible = True
+
-                GdViewer.Visible = False
-                RichEditControl1.Dock = DockStyle.Fill
-                _ViewOverride = "Richtext"
-                _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"
-            Else
-                _ViewOverride = ""
             Select Case oExtension.ToUpper
-                    Case ".CSV"
+                Case ".MSG"
+                    'msg is converted to eml and then displayed in GDPicture
+                    Dim oEmlPath As String = _email.Convert_ToEml(FilePath)
+                    _TempFiles.Add(oEmlPath)
+                    DoLoadFile(oEmlPath)
+
+                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".XLSX", ".XLS", ".CSV"
                     Dim oFormat = GetSpreadsheetFormat(oExtension)
                     SpreadsheetControl1.LoadDocument(FilePath, oFormat)
 
@@ -530,47 +522,24 @@ Public Class DocumentViewer
                     oRange.AutoFitColumns()
 
                     SpreadsheetControl1.Visible = True
-                        GdViewer.Visible = False
                     SpreadsheetControl1.Dock = DockStyle.Fill
 
                 Case Else
-                        Select Case oExtension.ToUpper
+                    _logger.Debug($"Loading GDViewer with extension [{oExtension}] ...")
-                            Case ".EML", ".DOC", ".DOCX", ".XLS", ".XLSX", ".ODT", ".RTF", ".TXT"
-                                GdViewer.ForceTemporaryMode = False
-                        End Select
-
                     GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                        If Viewer_ForceTemporaryMode = True Then
                     GdViewer.ForceTemporaryMode = True
-                        End If
-
                     GdViewer.AnnotationDropShadow = True
-                        GdViewer.BackColor = Color.White
 
-                        Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath)
+                    If GdViewer.DisplayFromFile(FilePath) <> GdPictureStatus.OK Then
-                        If oGDPState <> GdPictureStatus.OK Then
-                            _logger.Warn($"GdPictureStatus is [{oGDPState}]")
-                            If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then
-                                DoLoadFile(FilePath, "Richtext")
-                            Else
                         Dim oFileName = IO.Path.GetFileName(FilePath)
                         lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
                         lbFileNotLoaded.Visible = True
                     End If
 
-                        Else
-                            If GdViewer.Visible = False Then
-                                GdViewer.Visible = True
-                            End If
-                        End If
-
             End Select
-            End If
-            If _ViewOverride = "Richtext" Then
-                _ViewerMode = ViewerMode.Richtext
-            End If
 
+            UpdateMainUi()
 
             Return True
         Catch ex As Exception
@@ -579,55 +548,53 @@ 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()
-        If Not GdViewer Is Nothing Then
+        If _ViewerMode = ViewerMode.GDPicture Then
             GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
+        ElseIf _ViewerMode = ViewerMode.RichText Then
+            Dim oCmd As New FitToPageCommand(RichEditControl1)
+            oCmd.Execute()
         End If
     End Sub
 
     Private Sub FitToWidth()
-        If Not GdViewer Is Nothing Then
+        If _ViewerMode = ViewerMode.GDPicture Then
             GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+        ElseIf _ViewerMode = ViewerMode.RichText Then
+            Dim oCmd As New FitWidthCommand(RichEditControl1)
+            oCmd.Execute()
         End If
-
     End Sub
 
     Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
-
         Try
+            RichEditControl1.Visible = False
+            RichEditControl1.Dock = DockStyle.None
 
             SpreadsheetControl1.Visible = False
             SpreadsheetControl1.Dock = DockStyle.None
 
             Select Case Extension.ToUpper
+                Case ".MSG"
 
-                Case ".CSV"
+                    Dim oTempFileName = Path.Combine(IO.Path.GetTempPath(), Guid.NewGuid.ToString & ".msg")
+                    Using oFileStream As New FileStream(oTempFileName, FileMode.Create)
+                        Stream.Seek(0, SeekOrigin.Begin)
+                        Stream.CopyTo(oFileStream)
+                        Stream.Flush()
+                    End Using
+
+                    Dim oEmlPath As String = _email.Convert_ToEml(oTempFileName)
+                    DoLoadFile(oEmlPath)
+
+                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                    RichEditControl1.LoadDocument(Stream, GetDocumentFormat(Extension))
+
+                    RichEditControl1.ActiveViewType = XtraRichEdit.RichEditViewType.PrintLayout
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".XLSX", ".XLS", ".CSV"
                     SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
 
                     Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
@@ -639,9 +606,7 @@ Public Class DocumentViewer
                 Case Else
                     GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                    If Viewer_ForceTemporaryMode = True Then
                     GdViewer.ForceTemporaryMode = True
-                    End If
                     GdViewer.AnnotationDropShadow = True
 
                     GdViewer.DisplayFromStream(Stream)
@@ -731,6 +696,29 @@ Public Class DocumentViewer
                 buttonLastPage.Visibility = ToVisibility(True)
                 txtCurrentPage.Visibility = ToVisibility(True)
 
+            Case ViewerMode.RichText
+                ToolbarDocumentViewer.Visible = True
+
+                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
+                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
+                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonNextPage.Visibility = ToVisibility(True)
+                buttonPrevPage.Visibility = ToVisibility(True)
+                buttonPrint.Visibility = ToVisibility(False)
+                buttonRotateLeft.Visibility = ToVisibility(False)
+                buttonRotateRight.Visibility = ToVisibility(False)
+                buttonFlipX.Visibility = ToVisibility(False)
+                buttonFlipY.Visibility = ToVisibility(False)
+                buttonFirstPage.Visibility = ToVisibility(False)
+                buttonLastPage.Visibility = ToVisibility(False)
+                buttonSettings.Visibility = ToVisibility(False)
+                txtCurrentPage.Visibility = ToVisibility(False)
+                txtSearch.Visibility = ToVisibility(False)
+                btnSearch2.Visibility = ToVisibility(False)
+                btnNextHighlight.Visibility = ToVisibility(False)
+                btnPrevHighlight.Visibility = ToVisibility(False)
+
             Case ViewerMode.Excel
                 ToolbarDocumentViewer.Visible = False
 
@@ -753,27 +741,25 @@ Public Class DocumentViewer
                 btnSearch2.Visibility = ToVisibility(False)
                 btnNextHighlight.Visibility = ToVisibility(False)
                 btnPrevHighlight.Visibility = ToVisibility(False)
-            Case Else
+
-                ToolbarDocumentViewer.Visible = False
+
+
         End Select
     End Sub
 
     Private Sub btnSearch2_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnSearch2.ItemClick
-        EnsureSearchInitialized()
+        If Not String.IsNullOrEmpty(txtSearch.EditValue) Then
-        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
-        EnsureSearchInitialized()
+        _Search.PrevHighlight()
-        _Search?.PrevHighlight()
     End Sub
 
     Private Sub btnNextHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnNextHighlight.ItemClick
-        EnsureSearchInitialized()
+        _Search.NextHighlight()
-        _Search?.NextHighlight()
     End Sub
 
     Private Sub txtSearch_EditValueChanged(sender As Object, e As EventArgs) Handles txtSearch.EditValueChanged

Controls.DocumentViewer/DocumentViewer.vbproj

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

Controls.DocumentViewer/My Project/AssemblyInfo.vb

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

Controls.DocumentViewer/packages.config

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

Controls.LookupGrid/My Project/AssemblyInfo.vb

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

Controls.LookupGrid/frmLookupGrid.Designer.vb

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

Controls.LookupGrid/frmLookupGrid.resx

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

Controls.LookupGrid/frmLookupGrid.vb

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

Controls.RegexEditor/RegexEditor.vbproj

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

DBCleaner/DBCleaner.vbproj

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

DBCleaner/packages.config

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

GDPicture_NewPDF_net48/App.config

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-    </startup>
-    <applicationSettings>
-        <ZUGFeRDTest.My.MySettings>
-            <setting name="FB_DATABASE" serializeAs="String">
-                <value>172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB</value>
-            </setting>
-            <setting name="FB_DATASOURCE" serializeAs="String">
-                <value>172.24.12.50</value>
-            </setting>
-        </ZUGFeRDTest.My.MySettings>
-    </applicationSettings>
-    <userSettings>
-        <ZUGFeRDTest.My.MySettings>
-            <setting name="FB_USER" serializeAs="String">
-                <value>sysdba</value>
-            </setting>
-            <setting name="FB_PASS" serializeAs="String">
-                <value>dd</value>
-            </setting>
-            <setting name="MD5Cheksum" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="MSSQL_CONNECTIONSTRING" serializeAs="String">
-                <value>Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd</value>
-            </setting>
-        </ZUGFeRDTest.My.MySettings>
-    </userSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.Runtime" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.Core" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.XML.API" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.Util" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.SwingAWT" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.Security" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.Beans" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.Media" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.XML.Bind" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="IKVM.OpenJDK.Jdbc" publicKeyToken="13235d27fcbfff58" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="itext.kernel" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="itext.pdfa" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="itext.io" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.1.4.0" newVersion="7.1.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="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>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

GDPicture_NewPDF_net48/Form1.Designer.vb

@@ -1,65 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class Form1
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()>
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
-
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()>
-    Private Sub InitializeComponent()
-        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
-        Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
-        Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog()
-        Me.Button1 = New System.Windows.Forms.Button()
-        Me.SuspendLayout()
-        '
-        'OpenFileDialog1
-        '
-        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
-        '
-        'OpenFileDialog2
-        '
-        Me.OpenFileDialog2.FileName = "OpenFileDialog2"
-        Me.OpenFileDialog2.Filter = "XML files (*.xml)|*.xml"
-        '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(30, 43)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 64)
-        Me.Button1.TabIndex = 13
-        Me.Button1.Text = "Create GDPicture"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
-        'Form1
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(344, 152)
-        Me.Controls.Add(Me.Button1)
-        Me.Name = "Form1"
-        Me.Text = "E-Invoice-TEST-Tool"
-        Me.ResumeLayout(False)
-
-    End Sub
-
-    Friend WithEvents OpenFileDialog1 As OpenFileDialog
-    Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
-    Friend WithEvents OpenFileDialog2 As OpenFileDialog
-    Friend WithEvents Button1 As Button
-End Class

GDPicture_NewPDF_net48/Form1.resx

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="FolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>159, 17</value>
-  </metadata>
-  <metadata name="OpenFileDialog2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>328, 17</value>
-  </metadata>
-</root>

GDPicture_NewPDF_net48/Form1.vb

@@ -1,31 +0,0 @@
-Imports System.IO
-
-Imports System.Security.Cryptography
-Imports GdPicture14
-
-
-Public Class Form1
-    Private _GDPictureLizenz As String
-
-
-    Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
-
-        _GDPictureLizenz = "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q=="
-
-    End Sub
-
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim LicenseManager = New LicenseManager()
-        LicenseManager.RegisterKEY(_GDPictureLizenz)
-        Using gdpicturePDF As New GdPicturePDF
-            ' Create a new PDF/A-2a compliant document (blank, no pages yet)
-            Dim status As GdPictureStatus = gdpicturePDF.NewPDF(PdfConformance.PDF_A_2a)
-            If status = GdPictureStatus.OK Then
-                MsgBox("Status is OK")
-            Else
-                MsgBox($"The NewPDF(PdfConformance.PDF_A_2a) method has failed 
-                with the status: {status.ToString()}", MsgBoxStyle.Critical)
-            End If
-        End Using
-    End Sub
-End Class

GDPicture_NewPDF_net48/GDPicture_NewPDF_net48.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36310.24 d17.14
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GDPicture_NewPDF_net48", "GDPicture_NewPDF_net48.vbproj", "{16156434-E471-43F1-8030-76A0DA17CD5A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{16156434-E471-43F1-8030-76A0DA17CD5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16156434-E471-43F1-8030-76A0DA17CD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7FB9D072-A417-47E9-ACA3-99FC76D948C3}
-	EndGlobalSection
-EndGlobal

GDPicture_NewPDF_net48/GDPicture_NewPDF_net48.vbproj

@@ -1,269 +0,0 @@
-<?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>{16156434-E471-43F1-8030-76A0DA17CD5A}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <StartupObject>ZUGFeRDTest.My.MyApplication</StartupObject>
-    <RootNamespace>ZUGFeRDTest</RootNamespace>
-    <AssemblyName>ZUGFeRDTest</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>ZUGFeRDTest.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </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>ZUGFeRDTest.xml</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="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>
-    <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.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.Common, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.Document, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.Email, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
-    </Reference>
-    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.14.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.3.14\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.14\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </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="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.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <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.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" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Drawing" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Windows.Forms" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Form1.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.vb">
-      <DependentUpon>Form1.vb</DependentUpon>
-      <SubType>Form</SubType>
-    </Compile>
-    <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>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </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" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.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\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.14\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.14\build\net462\GdPicture.runtimes.windows.targets'))" />
-  </Target>
-  <Import Project="..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.14\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.14\build\net462\GdPicture.runtimes.windows.targets')" />
-</Project>

GDPicture_NewPDF_net48/My Project/Application.Designer.vb

@@ -1,44 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden.  Wenn Sie Änderungen vornehmen möchten
-    ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
-    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
-    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
-    '
-    Partial Friend Class MyApplication
-        
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
-        Public Sub New()
-            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
-            Me.IsSingleInstance = false
-            Me.EnableVisualStyles = true
-            Me.SaveMySettingsOnExit = true
-            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
-        End Sub
-        
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
-        Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.ZUGFeRDTest.Form1
-        End Sub
-        
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
-        Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean
-            Me.MinimumSplashScreenDisplayTime = 0
-            Return MyBase.OnInitialize(commandLineArgs)
-        End Function
-    End Class
-End Namespace

GDPicture_NewPDF_net48/My Project/Application.myapp

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <MySubMain>true</MySubMain>
-  <MainForm>Form1</MainForm>
-  <SingleInstance>false</SingleInstance>
-  <ShutdownMode>0</ShutdownMode>
-  <EnableVisualStyles>true</EnableVisualStyles>
-  <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>0</ApplicationType>
-  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>

GDPicture_NewPDF_net48/My Project/AssemblyInfo.vb

@@ -1,35 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' Allgemeine Informationen über eine Assembly werden über die folgenden
-' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-' die einer Assembly zugeordnet sind.
-
-' Werte der Assemblyattribute überprüfen
-
-<Assembly: AssemblyTitle("ZUGFeRDTest")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("ZUGFeRDTest")>
-<Assembly: AssemblyCopyright("Copyright ©  2018")>
-<Assembly: AssemblyTrademark("")>
-
-<Assembly: ComVisible(False)>
-
-'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
-<Assembly: Guid("f4f2b40b-902e-4edc-b5e0-c11a0d2ab998")>
-
-' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-'
-'      Hauptversion
-'      Nebenversion
-'      Buildnummer
-'      Revision
-'
-' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-' übernehmen, indem Sie "*" eingeben:
-' <Assembly: AssemblyVersion("1.0.*")>
-
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>

GDPicture_NewPDF_net48/My Project/Resources.Designer.vb

@@ -1,63 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-
-Namespace My.Resources
-    
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
-    Friend Module Resources
-        
-        Private resourceMan As Global.System.Resources.ResourceManager
-        
-        Private resourceCulture As Global.System.Globalization.CultureInfo
-        
-        '''<summary>
-        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
-            Get
-                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ZUGFeRDTest.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace

GDPicture_NewPDF_net48/My Project/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

GDPicture_NewPDF_net48/My Project/Settings.Designer.vb

@@ -1,139 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0"),  _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-    Partial Friend NotInheritable Class MySettings
-        Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
-#Region "Automatische My.Settings-Speicherfunktion"
-#If _MyType = "WindowsForms" Then
-    Private Shared addedHandler As Boolean
-
-    Private Shared addedHandlerLockObject As New Object
-
-    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
-        If My.Application.SaveMySettingsOnExit Then
-            My.Settings.Save()
-        End If
-    End Sub
-#End If
-#End Region
-        
-        Public Shared ReadOnly Property [Default]() As MySettings
-            Get
-                
-#If _MyType = "WindowsForms" Then
-               If Not addedHandler Then
-                    SyncLock addedHandlerLockObject
-                        If Not addedHandler Then
-                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                            addedHandler = True
-                        End If
-                    End SyncLock
-                End If
-#End If
-                Return defaultInstance
-            End Get
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB")>  _
-        Public ReadOnly Property FB_DATABASE() As String
-            Get
-                Return CType(Me("FB_DATABASE"),String)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("172.24.12.50")>  _
-        Public ReadOnly Property FB_DATASOURCE() As String
-            Get
-                Return CType(Me("FB_DATASOURCE"),String)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("sysdba")>  _
-        Public Property FB_USER() As String
-            Get
-                Return CType(Me("FB_USER"),String)
-            End Get
-            Set
-                Me("FB_USER") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("dd")>  _
-        Public Property FB_PASS() As String
-            Get
-                Return CType(Me("FB_PASS"),String)
-            End Get
-            Set
-                Me("FB_PASS") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
-        Public Property MD5Cheksum() As String
-            Get
-                Return CType(Me("MD5Cheksum"),String)
-            End Get
-            Set
-                Me("MD5Cheksum") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd")>  _
-        Public Property MSSQL_CONNECTIONSTRING() As String
-            Get
-                Return CType(Me("MSSQL_CONNECTIONSTRING"),String)
-            End Get
-            Set
-                Me("MSSQL_CONNECTIONSTRING") = value
-            End Set
-        End Property
-    End Class
-End Namespace
-
-Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
-    Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.ZUGFeRDTest.My.MySettings
-            Get
-                Return Global.ZUGFeRDTest.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace

GDPicture_NewPDF_net48/My Project/Settings.settings

@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
-  <Profiles />
-  <Settings>
-    <Setting Name="FB_DATABASE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB</Value>
-    </Setting>
-    <Setting Name="FB_DATASOURCE" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">172.24.12.50</Value>
-    </Setting>
-    <Setting Name="FB_USER" Type="System.String" Scope="User">
-      <Value Profile="(Default)">sysdba</Value>
-    </Setting>
-    <Setting Name="FB_PASS" Type="System.String" Scope="User">
-      <Value Profile="(Default)">dd</Value>
-    </Setting>
-    <Setting Name="MD5Cheksum" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="MSSQL_CONNECTIONSTRING" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd</Value>
-    </Setting>
-  </Settings>
-</SettingsFile>

GDPicture_NewPDF_net48/packages.config

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
-  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
-  <package id="GdPicture" version="14.3.14" targetFramework="net48" />
-  <package id="GdPicture.runtimes.windows" version="14.3.14" targetFramework="net48" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.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="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="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" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
-  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
-  <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
-</packages>

GUIs.ClipboardWatcher/ClipboardWatcher.vbproj

@@ -58,39 +58,36 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DigitalData.Controls.DocumentViewer">
-      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.GUIs.Common">
       <HintPath>..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\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.Common/ControlHelper.vb

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

GUIs.Common/DataResultList/frmDataResultList.vb

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

GUIs.Common/DocumentResultList/Watcher.vb

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

GUIs.Common/DocumentResultList/Workspace.vb

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

GUIs.Common/DocumentResultList/frmDocumentResultList.vb

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

GUIs.Common/NNfrmNotification_Startup.vb

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

GUIs.Common/app.config

@@ -103,10 +103,6 @@
         <assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.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

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

GUIs.GlobalIndexer/GlobalIndexer.vbproj

@@ -60,7 +60,7 @@
     <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\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/GUIs.Test.EDMIBenchmark.vbproj

@@ -64,11 +64,11 @@
     </Reference>
     <Reference Include="DigitalData.Modules.EDMI.API, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\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">
       <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>

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

@@ -56,22 +56,22 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\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/App.config

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

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

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

GUIs.Test.TestGUI/MyApplication.vb

@@ -1,49 +0,0 @@
-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

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

GUIs.Test.TestGUI/frmDocView.Designer.vb

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

GUIs.Test.TestGUI/frmDocView.vb

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

GUIs.Test.TestGUI/frmFilesystem.Designer.vb

@@ -23,141 +23,28 @@ Partial Class frmFilesystem
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.Button1 = New System.Windows.Forms.Button()
-        Me.Button2 = New System.Windows.Forms.Button()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.Button3 = New System.Windows.Forms.Button()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
-        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(59, 343)
+        Me.Button1.Location = New System.Drawing.Point(12, 12)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(288, 23)
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
         Me.Button1.TabIndex = 0
-        Me.Button1.Text = "CreateDateDirectory"
+        Me.Button1.Text = "Button1"
         Me.Button1.UseVisualStyleBackColor = True
         '
-        'Button2
-        '
-        Me.Button2.Location = New System.Drawing.Point(6, 71)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(288, 23)
-        Me.Button2.TabIndex = 1
-        Me.Button2.Text = "Stream simple file"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.Button3)
-        Me.GroupBox1.Controls.Add(Me.TextBox1)
-        Me.GroupBox1.Controls.Add(Me.Button2)
-        Me.GroupBox1.Location = New System.Drawing.Point(36, 153)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(709, 157)
-        Me.GroupBox1.TabIndex = 2
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Stream simple file"
-        '
-        'Button3
-        '
-        Me.Button3.Location = New System.Drawing.Point(6, 19)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(181, 23)
-        Me.Button3.TabIndex = 3
-        Me.Button3.Text = "1. Choose file"
-        Me.Button3.UseVisualStyleBackColor = True
-        '
-        'TextBox1
-        '
-        Me.TextBox1.Location = New System.Drawing.Point(6, 45)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(669, 20)
-        Me.TextBox1.TabIndex = 2
-        '
-        'txtServiceAddress
-        '
-        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(81, 13)
-        Me.Label1.TabIndex = 6
-        Me.Label1.Text = "ServiceAdresse"
-        '
-        '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(75, 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(100, 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)
-        Me.GroupBox1.PerformLayout()
-        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 Button2 As Button
-    Friend WithEvents GroupBox1 As GroupBox
-    Friend WithEvents Button3 As Button
-    Friend WithEvents TextBox1 As TextBox
-    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,7 +117,4 @@
   <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,29 +1,8 @@
-Imports System.Collections.Generic
+Imports DigitalData.Modules.Logging
-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.EDMI.API.EDMIServiceReference
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.ZooFlow.State
 
 Public Class frmFilesystem
-    Private Client 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 MYDD_Filesystem As DigitalData.Modules.Filesystem.File
+    Private Filesystem As DigitalData.Modules.Filesystem.File
 
     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"
@@ -31,8 +10,7 @@ Public Class frmFilesystem
     Private Sub frmFilesystem_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
             LogConfig = New LogConfig(LogConfig.PathType.Temp)
-            Logger = LogConfig.GetLogger()
+            Filesystem = New DigitalData.Modules.Filesystem.File(LogConfig)
-            MYDD_Filesystem = New DigitalData.Modules.Filesystem.File(LogConfig)
 
 
             'Using oWriter = IO.File.CreateText("E:\some_test_file.txt")
@@ -56,138 +34,6 @@ Public Class frmFilesystem
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim oDateString = MYDD_Filesystem.CreateDateDirectory("E:\")
+        Dim oDateString = Filesystem.CreateDateDirectory("E:\")
-    End Sub
-
-    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
-        If SaveFileDialog1.ShowDialog = DialogResult.OK Then
-            ' Fallback: einfache Textdatei schreiben
-            System.IO.File.WriteAllText(SaveFileDialog1.FileName, "Some text data")
-        End If
-    End Sub
-
-    Private Async Function Button2_ClickAsync(sender As Object, e As EventArgs) As Task Handles Button2.Click
-        ' Import a file via EDMI Globix ImportFile API to test Service.EDMIService ImportFileMethod
-        Try
-            If Client Is Nothing OrElse ServiceOnline = False Then
-                MsgBox("Bitte zuerst Verbindung zum EDMI Service herstellen.", 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)
-
-                ' Basic user context for testing
-                Dim user As New DigitalData.Modules.ZooFlow.State.UserState() With {
-                    .UserName = Environment.UserName,
-                    .Language = "de-DE",
-                    .LanguageId = 1031
-                }
-
-                Dim oObjectStore As String = "SelectedDocType.ObjectStore"
-                Dim oIDBDoctypeId As Long = 1
-                Dim oObjectKind As String = "DOC"
-                Dim oProfileId As Integer = 1
-                Dim oAttributes As List(Of UserAttributeValue) = Nothing
-                Dim oOptions As New Options.ImportFileOptions
-
-                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)
-
-                Logger.Info("Running Import")
-
-                Dim oResult = Await My.Application.Service.Client.Globix_ImportFileAsync(
-                oFilePath, oProfileId, oAttributes, oObjectStore, oObjectKind, oIDBDoctypeId, oOptions)
-
-                Logger.Info("Import result: [{0}]", oResult.OK)
-                Logger.Info("Imported file got ObjectId [{0}]", oResult.ObjectId)
-
-                If oResult.OK Then
-                    MsgBox("Alles OK")
-                Else
-                    Logger.Warn("Import failed with message: [{0}] and details [{1}]", oResult.ErrorMessage, oResult.ErrorDetails)
-                    Dim oMsg As String, oTitle As String
-                    If My.Application.User.Language = "de-DE" Then
-                        oMsg = $"Die Datei wurde nicht verarbeitet.{vbNewLine}{vbNewLine}Fehler: {oResult.ErrorMessage}"
-                        oTitle = "Achtung"
-                    Else
-                        oMsg = $"Unexpected Error in FileFlow{vbNewLine}{vbNewLine}Fehler: {oResult.ErrorMessage}"
-                        oTitle = "Attention"
-                    End If
-
-
-                    MsgBox("Fehler")
-                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 Function
-
-
-    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)
-
-            Client = New Client(LogConfig, oIPAddress, oPort)
-
-            txtStatus.Text = STATUS_CONNECTING
-            Dim oResult = Client.Connect()
-
-            If oResult = True Then
-                ServiceAddress = $"{oIPAddress}:{oPort}"
-                ServiceOnline = True
-                txtStatus.Text = STATUS_CONNECTED
-                My.Application.Service.Client = Client
-                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(My.LogConfig, oECMConnectionString)
-                Logger.Debug("Establishing IDB connection..")
-                Dim oIDBConnectionString = oClientConfig.ConnectionStringIDB
-                My.DatabaseIDB = New MSSQLServer(My.LogConfig, oIDBConnectionString)
-
-                Logger.Debug("Establishing Database connection with fallback..")
-                My.Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB)
-            Else
-                ServiceAddress = ""
-                ServiceOnline = True
-                txtStatus.Text = STATUS_FAILED
-                ' TODO: Make a connection test that is as elaborate as this one  :D
-                'Select Case oResult
-                '    Case ClassService.ConnectionTestResult.NotFound
-                '        lblStatus.Text = "Dienst konnte nicht gefunden werden. Bitte überprüfen sie Addresse und Port."
-                '    Case ClassService.ConnectionTestResult.EmptyURI
-                '        lblStatus.Text = "Bitte tragen Sie eine gültige Dienst Adresse ein."
-                '    Case ClassService.ConnectionTestResult.Authentication
-                '        lblStatus.Text = "Authentifizierungsfehler. Prüfen Sie, ob sich Ihr Gerät in der korrekten Domäne befindet."
-                '    Case Else
-                '        lblStatus.Text = "Unbekannter Fehler."
-                'End Select
-            End If
-        Catch ex As Exception
-            If Logger IsNot Nothing Then Logger.Error(ex)
-            MsgBox("Fehler beim Verbindungsaufbau", MsgBoxStyle.Critical, Text)
-        End Try
     End Sub
 End Class

GUIs.Test.TestGUI/packages.config

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

GUIs.Test.ZUGFeRDTest/App.config

@@ -2,26 +2,16 @@
 <configuration>
     <configSections>
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="ZUGFeRDTest.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
             <section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="ZUGFeRDTest.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
             <section name="ZUGFeRDTest.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
     </startup>
     <applicationSettings>
-        <ZUGFeRDTest.MySettings>
-            <setting name="FB_DATABASE" serializeAs="String">
-                <value>172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB</value>
-            </setting>
-            <setting name="FB_DATASOURCE" serializeAs="String">
-                <value>172.24.12.50</value>
-            </setting>
-        </ZUGFeRDTest.MySettings>
         <ZUGFeRDTest.My.MySettings>
             <setting name="FB_DATABASE" serializeAs="String">
                 <value>172.24.12.50:E:\DataFiles\Firebird\WISAG\EDMI_MASTER.FDB</value>
@@ -32,20 +22,6 @@
         </ZUGFeRDTest.My.MySettings>
     </applicationSettings>
     <userSettings>
-        <ZUGFeRDTest.MySettings>
-            <setting name="FB_USER" serializeAs="String">
-                <value>sysdba</value>
-            </setting>
-            <setting name="FB_PASS" serializeAs="String">
-                <value>dd</value>
-            </setting>
-            <setting name="MD5Cheksum" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="MSSQL_CONNECTIONSTRING" serializeAs="String">
-                <value>Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;TrustServerCertificate=true;</value>
-            </setting>
-        </ZUGFeRDTest.MySettings>
         <ZUGFeRDTest.My.MySettings>
             <setting name="FB_USER" serializeAs="String">
                 <value>sysdba</value>
@@ -107,6 +83,10 @@
         <assemblyIdentity name="IKVM.OpenJDK.Jdbc" publicKeyToken="13235d27fcbfff58" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.1.5717.0" newVersion="8.1.5717.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -131,6 +111,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
@@ -163,18 +147,6 @@
         <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>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

GUIs.Test.ZUGFeRDTest/Form1.Designer.vb

@@ -1,6 +1,4 @@
-Imports System.Windows.Forms
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class Form1
     Inherits System.Windows.Forms.Form
 
@@ -24,278 +22,248 @@ Partial Class Form1
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        OpenFileDialog1 = New OpenFileDialog()
+        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
-        btRunJob = New Button()
+        Me.btRunJob = New System.Windows.Forms.Button()
-        ListBox1 = New ListBox()
+        Me.ListBox1 = New System.Windows.Forms.ListBox()
-        btValidateSerializePDF = New Button()
+        Me.Button2 = New System.Windows.Forms.Button()
-        btValidateSerializeParseProps = New Button()
+        Me.Button3 = New System.Windows.Forms.Button()
-        btCreateMD5Checksum = New Button()
+        Me.Button4 = New System.Windows.Forms.Button()
-        GroupBox1 = New GroupBox()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        ButtonValidateXMLOnly = New Button()
+        Me.ButtonValidateXMLOnly = New System.Windows.Forms.Button()
-        GroupBox2 = New GroupBox()
+        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        btExtractPDFAttachments = New Button()
+        Me.Button7 = New System.Windows.Forms.Button()
-        GroupBox3 = New GroupBox()
+        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        txtMD5Checksum = New TextBox()
+        Me.txtMD5Checksum = New System.Windows.Forms.TextBox()
-        txtPropName = New TextBox()
+        Me.txtPropName = New System.Windows.Forms.TextBox()
-        GroupBox4 = New GroupBox()
+        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
-        btFindExtractXMLValue = New Button()
+        Me.Button6 = New System.Windows.Forms.Button()
-        FolderBrowserDialog1 = New FolderBrowserDialog()
+        Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
-        GroupBox5 = New GroupBox()
+        Me.GroupBox5 = New System.Windows.Forms.GroupBox()
-        btWriteBinary = New Button()
+        Me.Button5 = New System.Windows.Forms.Button()
-        OpenFileDialog2 = New OpenFileDialog()
+        Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog()
-        Button1 = New Button()
+        Me.Button1 = New System.Windows.Forms.Button()
-        Button2 = New Button()
+        Me.GroupBox1.SuspendLayout()
-        GroupBox1.SuspendLayout()
+        Me.GroupBox2.SuspendLayout()
-        GroupBox2.SuspendLayout()
+        Me.GroupBox3.SuspendLayout()
-        GroupBox3.SuspendLayout()
+        Me.GroupBox4.SuspendLayout()
-        GroupBox4.SuspendLayout()
+        Me.GroupBox5.SuspendLayout()
-        GroupBox5.SuspendLayout()
+        Me.SuspendLayout()
-        SuspendLayout()
         '
         'OpenFileDialog1
         '
-        OpenFileDialog1.FileName = "OpenFileDialog1"
+        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         '
         'btRunJob
         '
-        btRunJob.Location = New System.Drawing.Point(8, 29)
+        Me.btRunJob.Location = New System.Drawing.Point(6, 19)
-        btRunJob.Margin = New Padding(4, 5, 4, 5)
+        Me.btRunJob.Name = "btRunJob"
-        btRunJob.Name = "btRunJob"
+        Me.btRunJob.Size = New System.Drawing.Size(221, 23)
-        btRunJob.Size = New System.Drawing.Size(295, 35)
+        Me.btRunJob.TabIndex = 0
-        btRunJob.TabIndex = 0
+        Me.btRunJob.Text = "Run Job"
-        btRunJob.Text = "Run Job"
+        Me.btRunJob.UseVisualStyleBackColor = True
-        btRunJob.UseVisualStyleBackColor = True
         '
         'ListBox1
         '
-        ListBox1.Anchor = AnchorStyles.Top Or AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right
+        Me.ListBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-        ListBox1.FormattingEnabled = True
+            Or System.Windows.Forms.AnchorStyles.Left) _
-        ListBox1.Location = New System.Drawing.Point(504, 12)
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        ListBox1.Margin = New Padding(4, 5, 4, 5)
+        Me.ListBox1.FormattingEnabled = True
-        ListBox1.Name = "ListBox1"
+        Me.ListBox1.Location = New System.Drawing.Point(378, 8)
-        ListBox1.Size = New System.Drawing.Size(362, 664)
+        Me.ListBox1.Name = "ListBox1"
-        ListBox1.TabIndex = 1
+        Me.ListBox1.Size = New System.Drawing.Size(532, 602)
-        ' 
+        Me.ListBox1.TabIndex = 1
-        ' btValidateSerializePDF
-        ' 
-        btValidateSerializePDF.Location = New System.Drawing.Point(8, 29)
-        btValidateSerializePDF.Margin = New Padding(4, 5, 4, 5)
-        btValidateSerializePDF.Name = "btValidateSerializePDF"
-        btValidateSerializePDF.Size = New System.Drawing.Size(328, 35)
-        btValidateSerializePDF.TabIndex = 2
-        btValidateSerializePDF.Text = "Validate and Serialize PDF"
-        btValidateSerializePDF.UseVisualStyleBackColor = True
-        ' 
-        ' btValidateSerializeParseProps
-        ' 
-        btValidateSerializeParseProps.Location = New System.Drawing.Point(8, 74)
-        btValidateSerializeParseProps.Margin = New Padding(4, 5, 4, 5)
-        btValidateSerializeParseProps.Name = "btValidateSerializeParseProps"
-        btValidateSerializeParseProps.Size = New System.Drawing.Size(328, 35)
-        btValidateSerializeParseProps.TabIndex = 3
-        btValidateSerializeParseProps.Text = "Validate and Serialize PDF and Parse Props"
-        btValidateSerializeParseProps.UseVisualStyleBackColor = True
-        ' 
-        ' btCreateMD5Checksum
-        ' 
-        btCreateMD5Checksum.Location = New System.Drawing.Point(8, 29)
-        btCreateMD5Checksum.Margin = New Padding(4, 5, 4, 5)
-        btCreateMD5Checksum.Name = "btCreateMD5Checksum"
-        btCreateMD5Checksum.Size = New System.Drawing.Size(295, 35)
-        btCreateMD5Checksum.TabIndex = 4
-        btCreateMD5Checksum.Text = "Create MD5 Checksum for PDF"
-        btCreateMD5Checksum.UseVisualStyleBackColor = True
-        ' 
-        ' GroupBox1
-        ' 
-        GroupBox1.Controls.Add(ButtonValidateXMLOnly)
-        GroupBox1.Controls.Add(btRunJob)
-        GroupBox1.Location = New System.Drawing.Point(16, 18)
-        GroupBox1.Margin = New Padding(4, 5, 4, 5)
-        GroupBox1.Name = "GroupBox1"
-        GroupBox1.Padding = New Padding(4, 5, 4, 5)
-        GroupBox1.Size = New System.Drawing.Size(319, 116)
-        GroupBox1.TabIndex = 7
-        GroupBox1.TabStop = False
-        GroupBox1.Text = "Run Job like in eInvoice Service"
-        ' 
-        ' ButtonValidateXMLOnly
-        ' 
-        ButtonValidateXMLOnly.Location = New System.Drawing.Point(8, 74)
-        ButtonValidateXMLOnly.Margin = New Padding(4, 5, 4, 5)
-        ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly"
-        ButtonValidateXMLOnly.Size = New System.Drawing.Size(295, 35)
-        ButtonValidateXMLOnly.TabIndex = 4
-        ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
-        ButtonValidateXMLOnly.UseVisualStyleBackColor = True
-        ' 
-        ' GroupBox2
-        ' 
-        GroupBox2.Controls.Add(btValidateSerializePDF)
-        GroupBox2.Controls.Add(btExtractPDFAttachments)
-        GroupBox2.Controls.Add(btValidateSerializeParseProps)
-        GroupBox2.Location = New System.Drawing.Point(16, 144)
-        GroupBox2.Margin = New Padding(4, 5, 4, 5)
-        GroupBox2.Name = "GroupBox2"
-        GroupBox2.Padding = New Padding(4, 5, 4, 5)
-        GroupBox2.Size = New System.Drawing.Size(480, 167)
-        GroupBox2.TabIndex = 8
-        GroupBox2.TabStop = False
-        GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
-        ' 
-        ' btExtractPDFAttachments
-        ' 
-        btExtractPDFAttachments.Location = New System.Drawing.Point(8, 118)
-        btExtractPDFAttachments.Margin = New Padding(4, 5, 4, 5)
-        btExtractPDFAttachments.Name = "btExtractPDFAttachments"
-        btExtractPDFAttachments.Size = New System.Drawing.Size(328, 35)
-        btExtractPDFAttachments.TabIndex = 3
-        btExtractPDFAttachments.Text = "Extract PDF Attachments"
-        btExtractPDFAttachments.UseVisualStyleBackColor = True
-        ' 
-        ' GroupBox3
-        ' 
-        GroupBox3.Controls.Add(btCreateMD5Checksum)
-        GroupBox3.Controls.Add(txtMD5Checksum)
-        GroupBox3.Location = New System.Drawing.Point(16, 321)
-        GroupBox3.Margin = New Padding(4, 5, 4, 5)
-        GroupBox3.Name = "GroupBox3"
-        GroupBox3.Padding = New Padding(4, 5, 4, 5)
-        GroupBox3.Size = New System.Drawing.Size(480, 131)
-        GroupBox3.TabIndex = 9
-        GroupBox3.TabStop = False
-        GroupBox3.Text = "Open PDF and calculate Checksum"
-        ' 
-        ' txtMD5Checksum
-        ' 
-        txtMD5Checksum.Location = New System.Drawing.Point(8, 75)
-        txtMD5Checksum.Margin = New Padding(4, 5, 4, 5)
-        txtMD5Checksum.Name = "txtMD5Checksum"
-        txtMD5Checksum.Size = New System.Drawing.Size(463, 27)
-        txtMD5Checksum.TabIndex = 5
-        ' 
-        ' txtPropName
-        ' 
-        txtPropName.Location = New System.Drawing.Point(8, 74)
-        txtPropName.Margin = New Padding(4, 5, 4, 5)
-        txtPropName.Name = "txtPropName"
-        txtPropName.Size = New System.Drawing.Size(463, 27)
-        txtPropName.TabIndex = 10
-        ' 
-        ' GroupBox4
-        ' 
-        GroupBox4.Controls.Add(btFindExtractXMLValue)
-        GroupBox4.Controls.Add(txtPropName)
-        GroupBox4.Location = New System.Drawing.Point(16, 462)
-        GroupBox4.Margin = New Padding(4, 5, 4, 5)
-        GroupBox4.Name = "GroupBox4"
-        GroupBox4.Padding = New Padding(4, 5, 4, 5)
-        GroupBox4.Size = New System.Drawing.Size(480, 117)
-        GroupBox4.TabIndex = 11
-        GroupBox4.TabStop = False
-        GroupBox4.Text = "GroupBox4"
-        ' 
-        ' btFindExtractXMLValue
-        ' 
-        btFindExtractXMLValue.Location = New System.Drawing.Point(8, 29)
-        btFindExtractXMLValue.Margin = New Padding(4, 5, 4, 5)
-        btFindExtractXMLValue.Name = "btFindExtractXMLValue"
-        btFindExtractXMLValue.Size = New System.Drawing.Size(295, 35)
-        btFindExtractXMLValue.TabIndex = 11
-        btFindExtractXMLValue.Text = "Find and Extract XML Path Value"
-        btFindExtractXMLValue.UseVisualStyleBackColor = True
-        ' 
-        ' GroupBox5
-        ' 
-        GroupBox5.Controls.Add(btWriteBinary)
-        GroupBox5.Location = New System.Drawing.Point(13, 589)
-        GroupBox5.Margin = New Padding(4, 5, 4, 5)
-        GroupBox5.Name = "GroupBox5"
-        GroupBox5.Padding = New Padding(4, 5, 4, 5)
-        GroupBox5.Size = New System.Drawing.Size(480, 87)
-        GroupBox5.TabIndex = 12
-        GroupBox5.TabStop = False
-        GroupBox5.Text = "GroupBox5"
-        ' 
-        ' btWriteBinary
-        ' 
-        btWriteBinary.Location = New System.Drawing.Point(8, 29)
-        btWriteBinary.Margin = New Padding(4, 5, 4, 5)
-        btWriteBinary.Name = "btWriteBinary"
-        btWriteBinary.Size = New System.Drawing.Size(295, 35)
-        btWriteBinary.TabIndex = 11
-        btWriteBinary.Text = "Write Binary to PDF"
-        btWriteBinary.UseVisualStyleBackColor = True
-        ' 
-        ' OpenFileDialog2
-        ' 
-        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)
+        Me.Button2.Location = New System.Drawing.Point(6, 19)
-        Button2.Name = "Button2"
+        Me.Button2.Name = "Button2"
-        Button2.Size = New System.Drawing.Size(94, 29)
+        Me.Button2.Size = New System.Drawing.Size(246, 23)
-        Button2.TabIndex = 13
+        Me.Button2.TabIndex = 2
-        Button2.Text = "AppFolder"
+        Me.Button2.Text = "Validate and Serialize PDF"
-        Button2.UseVisualStyleBackColor = True
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Button3
+        '
+        Me.Button3.Location = New System.Drawing.Point(6, 48)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(246, 23)
+        Me.Button3.TabIndex = 3
+        Me.Button3.Text = "Validate and Serialize PDF and Parse Props"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'Button4
+        '
+        Me.Button4.Location = New System.Drawing.Point(6, 19)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(221, 23)
+        Me.Button4.TabIndex = 4
+        Me.Button4.Text = "Create MD5 Checksum for PDF"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.ButtonValidateXMLOnly)
+        Me.GroupBox1.Controls.Add(Me.btRunJob)
+        Me.GroupBox1.Location = New System.Drawing.Point(12, 58)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(360, 92)
+        Me.GroupBox1.TabIndex = 7
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "Run Job like in ZUGFeRD Service"
+        '
+        'ButtonValidateXMLOnly
+        '
+        Me.ButtonValidateXMLOnly.Location = New System.Drawing.Point(6, 48)
+        Me.ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly"
+        Me.ButtonValidateXMLOnly.Size = New System.Drawing.Size(221, 23)
+        Me.ButtonValidateXMLOnly.TabIndex = 4
+        Me.ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
+        Me.ButtonValidateXMLOnly.UseVisualStyleBackColor = True
+        '
+        'GroupBox2
+        '
+        Me.GroupBox2.Controls.Add(Me.Button2)
+        Me.GroupBox2.Controls.Add(Me.Button7)
+        Me.GroupBox2.Controls.Add(Me.Button3)
+        Me.GroupBox2.Location = New System.Drawing.Point(12, 156)
+        Me.GroupBox2.Name = "GroupBox2"
+        Me.GroupBox2.Size = New System.Drawing.Size(360, 109)
+        Me.GroupBox2.TabIndex = 8
+        Me.GroupBox2.TabStop = False
+        Me.GroupBox2.Text = "Run Functions on a single file (needs Breakpoint)"
+        '
+        'Button7
+        '
+        Me.Button7.Location = New System.Drawing.Point(6, 77)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(246, 23)
+        Me.Button7.TabIndex = 3
+        Me.Button7.Text = "Extract PDF Attachments"
+        Me.Button7.UseVisualStyleBackColor = True
+        '
+        'GroupBox3
+        '
+        Me.GroupBox3.Controls.Add(Me.Button4)
+        Me.GroupBox3.Controls.Add(Me.txtMD5Checksum)
+        Me.GroupBox3.Location = New System.Drawing.Point(12, 271)
+        Me.GroupBox3.Name = "GroupBox3"
+        Me.GroupBox3.Size = New System.Drawing.Size(360, 85)
+        Me.GroupBox3.TabIndex = 9
+        Me.GroupBox3.TabStop = False
+        Me.GroupBox3.Text = "Open PDF and calculate Checksum"
+        '
+        'txtMD5Checksum
+        '
+        Me.txtMD5Checksum.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ZUGFeRDTest.My.MySettings.Default, "MD5Cheksum", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.txtMD5Checksum.Location = New System.Drawing.Point(6, 49)
+        Me.txtMD5Checksum.Name = "txtMD5Checksum"
+        Me.txtMD5Checksum.Size = New System.Drawing.Size(348, 20)
+        Me.txtMD5Checksum.TabIndex = 5
+        Me.txtMD5Checksum.Text = Global.ZUGFeRDTest.My.MySettings.Default.MD5Cheksum
+        '
+        'txtPropName
+        '
+        Me.txtPropName.Location = New System.Drawing.Point(6, 48)
+        Me.txtPropName.Name = "txtPropName"
+        Me.txtPropName.Size = New System.Drawing.Size(348, 20)
+        Me.txtPropName.TabIndex = 10
+        '
+        'GroupBox4
+        '
+        Me.GroupBox4.Controls.Add(Me.Button6)
+        Me.GroupBox4.Controls.Add(Me.txtPropName)
+        Me.GroupBox4.Location = New System.Drawing.Point(12, 362)
+        Me.GroupBox4.Name = "GroupBox4"
+        Me.GroupBox4.Size = New System.Drawing.Size(360, 80)
+        Me.GroupBox4.TabIndex = 11
+        Me.GroupBox4.TabStop = False
+        Me.GroupBox4.Text = "GroupBox4"
+        '
+        'Button6
+        '
+        Me.Button6.Location = New System.Drawing.Point(6, 19)
+        Me.Button6.Name = "Button6"
+        Me.Button6.Size = New System.Drawing.Size(221, 23)
+        Me.Button6.TabIndex = 11
+        Me.Button6.Text = "Find and Extract XML Path Value"
+        Me.Button6.UseVisualStyleBackColor = True
+        '
+        'GroupBox5
+        '
+        Me.GroupBox5.Controls.Add(Me.Button5)
+        Me.GroupBox5.Location = New System.Drawing.Point(12, 490)
+        Me.GroupBox5.Name = "GroupBox5"
+        Me.GroupBox5.Size = New System.Drawing.Size(360, 122)
+        Me.GroupBox5.TabIndex = 12
+        Me.GroupBox5.TabStop = False
+        Me.GroupBox5.Text = "GroupBox5"
+        '
+        'Button5
+        '
+        Me.Button5.Location = New System.Drawing.Point(6, 19)
+        Me.Button5.Name = "Button5"
+        Me.Button5.Size = New System.Drawing.Size(221, 23)
+        Me.Button5.TabIndex = 11
+        Me.Button5.Text = "Write Binary to PDF"
+        Me.Button5.UseVisualStyleBackColor = True
+        '
+        'OpenFileDialog2
+        '
+        Me.OpenFileDialog2.FileName = "OpenFileDialog2"
+        Me.OpenFileDialog2.Filter = "XML files (*.xml)|*.xml"
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(18, 12)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(180, 23)
+        Me.Button1.TabIndex = 13
+        Me.Button1.Text = "Open Logpath"
+        Me.Button1.UseVisualStyleBackColor = True
         '
         'Form1
         '
-        AutoScaleDimensions = New System.Drawing.SizeF(8F, 20F)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        AutoScaleMode = AutoScaleMode.Font
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        ClientSize = New System.Drawing.Size(879, 690)
+        Me.ClientSize = New System.Drawing.Size(916, 633)
-        Controls.Add(Button2)
+        Me.Controls.Add(Me.Button1)
-        Controls.Add(Button1)
+        Me.Controls.Add(Me.GroupBox5)
-        Controls.Add(GroupBox5)
+        Me.Controls.Add(Me.GroupBox4)
-        Controls.Add(GroupBox4)
+        Me.Controls.Add(Me.GroupBox3)
-        Controls.Add(GroupBox3)
+        Me.Controls.Add(Me.GroupBox2)
-        Controls.Add(GroupBox2)
+        Me.Controls.Add(Me.GroupBox1)
-        Controls.Add(GroupBox1)
+        Me.Controls.Add(Me.ListBox1)
-        Controls.Add(ListBox1)
+        Me.Name = "Form1"
-        Margin = New Padding(4, 5, 4, 5)
+        Me.Text = "Form1"
-        Name = "Form1"
+        Me.GroupBox1.ResumeLayout(False)
-        Text = "E-Invoice-TEST-Tool"
+        Me.GroupBox2.ResumeLayout(False)
-        GroupBox1.ResumeLayout(False)
+        Me.GroupBox3.ResumeLayout(False)
-        GroupBox2.ResumeLayout(False)
+        Me.GroupBox3.PerformLayout()
-        GroupBox3.ResumeLayout(False)
+        Me.GroupBox4.ResumeLayout(False)
-        GroupBox3.PerformLayout()
+        Me.GroupBox4.PerformLayout()
-        GroupBox4.ResumeLayout(False)
+        Me.GroupBox5.ResumeLayout(False)
-        GroupBox4.PerformLayout()
+        Me.ResumeLayout(False)
-        GroupBox5.ResumeLayout(False)
-        ResumeLayout(False)
 
     End Sub
 
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
     Friend WithEvents btRunJob As Button
     Friend WithEvents ListBox1 As ListBox
-    Friend WithEvents btValidateSerializePDF As Button
+    Friend WithEvents Button2 As Button
-    Friend WithEvents btValidateSerializeParseProps As Button
+    Friend WithEvents Button3 As Button
-    Friend WithEvents btCreateMD5Checksum As Button
+    Friend WithEvents Button4 As Button
     Friend WithEvents txtMD5Checksum As TextBox
     Friend WithEvents GroupBox1 As GroupBox
     Friend WithEvents GroupBox2 As GroupBox
     Friend WithEvents GroupBox3 As GroupBox
     Friend WithEvents txtPropName As TextBox
     Friend WithEvents GroupBox4 As GroupBox
-    Friend WithEvents btFindExtractXMLValue As Button
+    Friend WithEvents Button6 As Button
-    Friend WithEvents btExtractPDFAttachments As Button
+    Friend WithEvents Button7 As Button
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
     Friend WithEvents GroupBox5 As GroupBox
-    Friend WithEvents btWriteBinary As Button
+    Friend WithEvents Button5 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.resx

@@ -126,7 +126,4 @@
   <metadata name="OpenFileDialog2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>328, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
 </root>

GUIs.Test.ZUGFeRDTest/My Project/Application.Designer.vb

@@ -34,11 +34,5 @@ Namespace My
         Protected Overrides Sub OnCreateMainForm()
             Me.MainForm = Global.ZUGFeRDTest.Form1
         End Sub
-        
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
-        Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean
-            Me.MinimumSplashScreenDisplayTime = 0
-            Return MyBase.OnInitialize(commandLineArgs)
-        End Function
     End Class
 End Namespace

GUIs.Test.ZUGFeRDTest/My Project/AssemblyInfo.vb

@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("ZUGFeRDTest")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyProduct("ZUGFeRDTest")>
+<Assembly: AssemblyCopyright("Copyright ©  2018")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
 
 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("f4f2b40b-902e-4edc-b5e0-c11a0d2ab998")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.0.0")>

GUIs.Test.ZUGFeRDTest/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

GUIs.Test.ZUGFeRDTest/My Project/Settings.settings

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="" GeneratedClassName="MySettings" UseMySettingsClassName="true">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
   <Profiles />
   <Settings>
     <Setting Name="FB_DATABASE" Type="System.String" Scope="Application">
@@ -18,7 +18,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MSSQL_CONNECTIONSTRING" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;TrustServerCertificate=true;</Value>
+      <Value Profile="(Default)">Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd</Value>
     </Setting>
   </Settings>
 </SettingsFile>

GUIs.Test.ZUGFeRDTest/Program.cs

@@ -1,21 +0,0 @@
-using CoreWCF.Configuration;
-using CoreWCF.Description;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add CoreWCF services
-builder.Services.AddServiceModelServices();
-builder.Services.AddServiceModelMetadata();
-builder.Services.AddSingleton<IServiceBehavior, UseRequestHeadersForMetadataAddressBehavior>();
-
-var app = builder.Build();
-
-app.UseServiceModel(builder =>
-{
-    // TODO add here service endpoints and behaviors
-});
-
-var serviceMetadataBehavior = app.Services.GetRequiredService<ServiceMetadataBehavior>();
-serviceMetadataBehavior.HttpGetEnabled = true;
-
-app.Run();

GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj

@@ -1,58 +1,299 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?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>
-    <RootNamespace>ZUGFeRDTest</RootNamespace>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{16156434-E471-43F1-8030-76A0DA17CD5A}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <StartupObject>ZUGFeRDTest.My.MyApplication</StartupObject>
-    <MyType>WindowsForms</MyType>
+    <RootNamespace>ZUGFeRDTest</RootNamespace>
-    <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>ZUGFeRDTest</AssemblyName>
-    <Company>Digital Data GmbH</Company>
+    <FileAlignment>512</FileAlignment>
-    <AssemblyTitle>Provides baseclasses, methods and constants for DD Products</AssemblyTitle>
+    <MyType>WindowsForms</MyType>
-    <AssemblyVersion>2.0</AssemblyVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileVersion>2.0</FileVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Title>$(AssemblyName)</Title>
+    <TargetFrameworkProfile />
-    <Product>$(AssemblyName)</Product>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>ZUGFeRDTest.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </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>ZUGFeRDTest.xml</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>
-    <PackageReference Include="GdPicture" Version="14.3.18" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
-    <PackageReference Include="NLog" Version="6.0.4" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
-  </ItemGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces">
+    <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Jobs">
+    <Reference Include="DigitalData.Modules.Jobs, Version=1.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.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>
+    <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="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=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="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.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.SqlClient, Version=4.6.1.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SqlClient.4.8.6\lib\net461\System.Data.SqlClient.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <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\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
-
   <ItemGroup>
-    <None Update="My Project\Settings.settings">
+    <Import Include="Microsoft.VisualBasic" />
-      <Generator>SettingsSingleFileGenerator</Generator>
+    <Import Include="System" />
-    </None>
+    <Import Include="System.Collections" />
-    <None Update="MyProject\Settings.settings">
+    <Import Include="System.Collections.Generic" />
-      <Generator>SettingsSingleFileGenerator</Generator>
+    <Import Include="System.Data" />
-    </None>
+    <Import Include="System.Drawing" />
-    <None Update="MyProject\Settings.settings">
+    <Import Include="System.Diagnostics" />
-      <Generator>SettingsSingleFileGenerator</Generator>
+    <Import Include="System.Windows.Forms" />
-    </None>
+    <Import Include="System.Linq" />
-    <None Update="MyProject\Settings.settings">
+    <Import Include="System.Xml.Linq" />
-      <Generator>SettingsSingleFileGenerator</Generator>
+    <Import Include="System.Threading.Tasks" />
-    </None>
   </ItemGroup>
-
+  <ItemGroup>
+    <Compile Include="Form1.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.vb">
+      <DependentUpon>Form1.vb</DependentUpon>
+      <SubType>Form</SubType>
+    </Compile>
+    <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>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </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" />
+    <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>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.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.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.3" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.3.14" targetFramework="net48" />
+  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
@@ -13,6 +13,7 @@
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.1.0" targetFramework="net461" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
   <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
   <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
@@ -30,5 +31,5 @@
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
   <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

Service.EDMIService/EDMIService.vbproj

@@ -79,10 +79,10 @@
       <HintPath>..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Filesystem">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll</HintPath>
+      <HintPath>..\..\DDModules\Filesystem\bin\Debug\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>
+      <HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
@@ -226,7 +226,6 @@
     <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/Methods/IDB/GetFileObject/GetFileObjectMethod.vb

@@ -2,7 +2,6 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports System.IO
-Imports DigitalData.Services.EDMIService.Security
 
 Namespace Methods.IDB.GetFileObject
     Public Class GetFileObjectMethod
@@ -70,29 +69,6 @@ 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()
@@ -109,15 +85,6 @@ 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,7 +3,6 @@ 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
@@ -23,197 +22,6 @@ 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))
@@ -373,6 +181,7 @@ 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

@@ -1,146 +0,0 @@
-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.EmailService/DDEmailService.vbproj

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

Services.EmailService/EmailService.vb

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

Services.EmailService/My Project/AssemblyInfo.vb

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

Services.LicenseService/DDEDMLicenseService.vbproj

@@ -50,11 +50,11 @@
   <ItemGroup>
     <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\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">

Services.ZUGFeRDService/Config.vb

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

Services.ZUGFeRDService/My Project/AssemblyInfo.vb

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

Services.ZUGFeRDService/ThreadRunner.vb

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

WEBSERVICES/ZUGFeRDRESTService/Config.cs

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

WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs

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

WEBSERVICES/ZUGFeRDRESTService/Database.cs

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

WEBSERVICES/ZUGFeRDRESTService/IDatabase.cs

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

WEBSERVICES/ZUGFeRDRESTService/Properties/launchSettings.json

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

WEBSERVICES/ZUGFeRDRESTService/appsettings.Development.json

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

WEBSERVICES/ZUGFeRDRESTService/appsettings.json

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