Jobs: Version 1.12.1.0

Base/Base.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Modules.Base</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -46,8 +46,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

Base/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Base")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.1.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.1")>
+<Assembly: AssemblyVersion("1.1.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.1")>
+<Assembly: AssemblyFileVersion("1.1.0.0")>

Base/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <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()>  _

Base/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", "16.8.1.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

Base/packages.config

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

Config/Config.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.Config</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,8 +45,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -81,6 +82,7 @@
     <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>

Config/ConfigUtils.vb

@@ -51,7 +51,6 @@ Public Class ConfigUtils
         For Each oPath In IO.Directory.EnumerateFiles(SourceDirectory, FilePattern)
             Dim oFileInfo = New IO.FileInfo(oPath)
 
-            _Logger.NewBlock($"File {oFileInfo.Name}")
             _Logger.Debug("Processing file [{0}]", oFileInfo.Name)
 
             _Logger.Debug("Copying [{0}] to TargetDirectory..", oFileInfo.Name)
@@ -76,7 +75,6 @@ Public Class ConfigUtils
         For Each oDirectoryPath In IO.Directory.EnumerateDirectories(SourceDirectory, "*", IO.SearchOption.TopDirectoryOnly)
             Dim oDirInfo As New IO.DirectoryInfo(oDirectoryPath)
 
-            _Logger.NewBlock($"Directory {oDirInfo.Name}")
             _Logger.Debug("Processing directory [{0}]", oDirInfo.Name)
 
             ' Don't copy TargetDirectory if subpath of SourceDirectory or if MigrationDirectory

Config/My Project/AssemblyInfo.vb

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

Config/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

Config/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", "15.7.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

Config/packages.config

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

Database/Adapters/MSSQLServer.vb

@@ -340,7 +340,7 @@ Public Class MSSQLServer
             pSqlCommandObject.CommandTimeout = pTimeout
 
             Using oAdapter As New SqlDataAdapter(pSqlCommandObject)
-                Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", pSqlCommandObject.CommandText)
+                Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}] and Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))
                 oAdapter.Fill(oTable)
             End Using
 
@@ -427,7 +427,7 @@ Public Class MSSQLServer
         Dim oTransaction As SqlTransaction = MaybeGetTransaction(pSqlConnection, pTransactionMode, pTransaction)
 
         Try
-            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", pSqlCommandObject.CommandText)
+            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}] and Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))
 
             pSqlCommandObject.Connection = pSqlConnection
             pSqlCommandObject.Transaction = oTransaction
@@ -437,7 +437,7 @@ Public Class MSSQLServer
             Return True
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn("ExecuteNonQueryWithConnectionObject: Error in ExecuteNonQueryWithConnectionObject while executing command: [{0}]-[{1}]", SqlCommand, SqlConnection.ConnectionString)
+            Logger.Warn("ExecuteNonQueryWithConnectionObject: Error in ExecuteNonQueryWithConnectionObject while executing command: [{0}]", pSqlCommandObject.CommandText)
             Return False
         Finally
             MaybeCommitTransaction(oTransaction, pTransactionMode)
@@ -517,6 +517,9 @@ Public Class MSSQLServer
         Dim oResult As Object = Nothing
 
         Try
+
+            Logger.Debug("GetScalarValueWithConnectionObject: Running Query [{0}] with Parameters [{1}]", pSqlCommandObject, GetParameterListAsString(pSqlCommandObject))
+
             pSqlCommandObject.Connection = pSqlConnection
             pSqlCommandObject.CommandTimeout = pTimeout
             pSqlCommandObject.Transaction = oTransaction
@@ -601,4 +604,13 @@ Public Class MSSQLServer
         Dim res = command.EndExecuteNonQuery(result)
         Logger.Info("Finished executing Async database operation: {0}", command.CommandText)
     End Sub
+
+    Private Function GetParameterListAsString(pSQLCommand As SqlCommand) As String
+        Dim oList = pSQLCommand.Parameters.
+            Cast(Of SqlParameter).
+            Select(Function(p) $"({p.ParameterName}={p.Value})").
+            ToList()
+
+        Return String.Join(",", oList)
+    End Function
 End Class

Database/Adapters/Oracle.vb

@@ -127,7 +127,7 @@ Public Class Oracle
         End Try
     End Function
 
-    Public Function GetDatatable(pSQLCommand As String, pTimeout As Integer) As DataTable Implements IDatabase.GetDatatable
+    Public Function GetDatatable(pSQLCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable Implements IDatabase.GetDatatable
         Try
             Using oConnection = GetConnection(CurrentConnectionString)
                 Dim oSQLCommand As OracleCommand
@@ -151,8 +151,8 @@ Public Class Oracle
         End Try
     End Function
 
-    Private Function GetDatatable(pSQLCommand As String) As DataTable Implements IDatabase.GetDatatable
+    Public Function GetDatatable(SqlCommand As SqlClient.SqlCommand, Optional Timeout As Integer = 120) As DataTable Implements IDatabase.GetDatatable
-        Return GetDatatable(pSQLCommand, _Timeout)
+        Throw New NotImplementedException()
     End Function
 
     Public Function ExecuteNonQuery(pSQLCommand As String, pTimeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery
@@ -250,4 +250,6 @@ Public Class Oracle
             Return "Invalid ConnectionString"
         End Try
     End Function
+
+
 End Class

Database/App.config

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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" />
+  <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
   </configSections>
   <entityFramework>
-    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
+    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird"/>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
-      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
+      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird"/>
     </providers>
   </entityFramework>
   
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

Database/Database.vbproj

@@ -11,9 +11,10 @@
     <AssemblyName>DigitalData.Modules.Database</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -59,8 +60,8 @@
       <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
@@ -99,7 +100,6 @@
     <Compile Include="Dispatcher.vb" />
     <Compile Include="Exceptions.vb" />
     <Compile Include="Adapters\Firebird.vb" />
-    <Compile Include="Helpers.vb" />
     <Compile Include="IDatabase.vb" />
     <Compile Include="Adapters\ODBC.vb" />
     <Compile Include="Adapters\Oracle.vb" />
@@ -108,6 +108,7 @@
     <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>

Database/Helpers.vb

@@ -1,10 +0,0 @@
-Public Class Helpers
-
-    Public Shared Function MaybeEscapeSQLCommand(pSQLCommand As String) As String
-
-
-
-    End Function
-
-
-End Class

Database/My Project/AssemblyInfo.vb

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

Database/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

Database/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", "15.7.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

Database/packages.config

@@ -3,6 +3,6 @@
   <package id="EntityFramework" version="6.4.4" targetFramework="net461" />
   <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net461" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net461" />
 </packages>

EDMIAPI/EDMI.API.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.EDMI.API</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,8 +45,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -101,6 +102,7 @@
     <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>

EDMIAPI/My Project/AssemblyInfo.vb

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

EDMIAPI/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
         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("DigitalData.Modules.EDMIAPI.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.EDMI.API.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

EDMIAPI/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", "15.7.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
@@ -63,7 +63,7 @@ Namespace My
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Module MySettingsProperty
         
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
         Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMI.API.My.MySettings
             Get
                 Return Global.DigitalData.Modules.EDMI.API.My.MySettings.Default

EDMIAPI/app.config

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <system.diagnostics>
         <sources>
             <!-- Dieser Abschnitt definiert die Protokollierungskonfiguration für My.Application.Log -->
             <source name="DefaultSource" switchName="DefaultSwitch">
                 <listeners>
-                    <add name="FileLog" />
+                    <add name="FileLog"/>
                     <!-- Auskommentierung des nachfolgenden Abschnitts aufheben, um in das Anwendungsereignisprotokoll zu schreiben -->
                     <!--<add name="EventLog"/>-->
                 </listeners>
             </source>
         </sources>
         <switches>
-            <add name="DefaultSwitch" value="Information" />
+            <add name="DefaultSwitch" value="Information"/>
         </switches>
         <sharedListeners>
-            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
+            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
             <!-- Auskommentierung des nachfolgenden Abschnitts aufheben und APPLICATION_NAME durch den Namen der Anwendung ersetzen, um in das Anwendungsereignisprotokoll zu schreiben -->
             <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
         </sharedListeners>
@@ -25,7 +25,7 @@
             <netTcpBinding>
                 <binding name="NetTcpBinding_IEDMIService" transferMode="Streamed">
                     <security>
-                        <transport sslProtocols="None" />
+                        <transport sslProtocols="None"/>
                     </security>
                 </binding>
             </netTcpBinding>
@@ -33,7 +33,7 @@
         <client>
             <endpoint address="net.tcp://localhost:9000/DigitalData/Services/Main" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IEDMIService" contract="EDMIServiceReference.IEDMIService" name="NetTcpBinding_IEDMIService">
                 <identity>
-                    <userPrincipalName value="Administrator@dd-san01.dd-gan.local.digitaldata.works" />
+                    <userPrincipalName value="Administrator@dd-san01.dd-gan.local.digitaldata.works"/>
                 </identity>
             </endpoint>
         </client>
@@ -41,9 +41,9 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

EDMIAPI/packages.config

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

Encryption/Encryption.vbproj

@@ -10,8 +10,9 @@
     <AssemblyName>DigitalData.Modules.Encryption</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,8 +46,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

Encryption/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Encryption")>
 <Assembly: AssemblyCopyright("Copyright ©  2021")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.2.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.1.0.0")>
+<Assembly: AssemblyVersion("1.2.0.0")>
-<Assembly: AssemblyFileVersion("1.1.0.0")>
+<Assembly: AssemblyFileVersion("1.2.0.0")>

Encryption/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <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()>  _

Encryption/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", "16.8.1.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

Encryption/packages.config

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

Filesystem/File.vb

@@ -109,11 +109,21 @@ Public Class File
     ''' <summary>
     ''' Adds file version string to given filename `Destination` if that file already exists.
     ''' </summary>
-    ''' <param name="Destination"></param>
+    ''' <param name="pFilePath">Filepath to check</param>
-    ''' <returns></returns>
+    ''' <returns>Versioned string</returns>
-    Public Function GetVersionedFilename(Destination As String) As String
+    Public Function GetVersionedFilename(pFilePath As String) As String
+        Return GetVersionedFilenameWithFilecheck(pFilePath, Function(pPath As String) IO.File.Exists(pFilePath))
+    End Function
+
+    ''' <summary>
+    ''' Adds file version string to given filename `Destination` if that file already exists.
+    ''' </summary>
+    ''' <param name="pFilePath">Filepath to check</param>
+    ''' <param name="pFileExistsAction">Custom action to check for file existence</param>
+    ''' <returns>Versioned string</returns>
+    Public Function GetVersionedFilenameWithFilecheck(pFilePath As String, pFileExistsAction As Func(Of String, Boolean)) As String
         Try
-            Dim oFileName As String = Destination
+            Dim oFileName As String = pFilePath
             Dim oFinalFileName = oFileName
 
             Dim oDestinationDir = Path.GetDirectoryName(oFileName)
@@ -131,7 +141,7 @@ Public Class File
             ' Shorten the filename (only filename, without extension or version)
             ' by cutting the length in half. This should work no matter how long the path and/or filename are.
             ' The initial check operates on the full path to catch all scenarios.
-            If Destination.Length > MAX_FILE_PATH_LENGTH Then
+            If pFilePath.Length > MAX_FILE_PATH_LENGTH Then
                 _Logger.Info("Filename is too long. Filename will be cut to prevent further errors.")
                 _Logger.Info("Original Filename is: {0}", oFileNameWithoutExtension)
                 Dim oNewLength As Integer = Math.Round(oFileNameWithoutExtension.Length / 2)
@@ -147,15 +157,15 @@ Public Class File
                 _Logger.Debug("Intermediate Filename is {0}", oFinalFileName)
                 _Logger.Debug("File version: {0}", oFileVersion)
                 oFileVersion += 1
-            Loop While (IO.File.Exists(oFinalFileName))
+            Loop While pFileExistsAction(oFinalFileName) = True
 
             _Logger.Debug("Final Filename is {0}", oFinalFileName)
 
             Return oFinalFileName
         Catch ex As Exception
-            _Logger.Warn("Filename {0} could not be versioned. Original filename will be returned!", Destination)
+            _Logger.Warn("Filename {0} could not be versioned. Original filename will be returned!", pFilePath)
             _Logger.Error(ex)
-            Return Destination
+            Return pFilePath
         End Try
     End Function
 
@@ -195,6 +205,8 @@ Public Class File
             oStringVersion = 1
         End If
 
+        _Logger.Debug("Versioned: String [{0}], Version [{1}]", pString, oStringVersion)
+
         Return New Tuple(Of String, Integer)(pString, oStringVersion)
     End Function
 

Filesystem/Filesystem.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.Filesystem</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,8 +45,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
@@ -86,6 +87,7 @@
     <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>

Filesystem/My Project/AssemblyInfo.vb

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

Filesystem/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

Filesystem/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", "15.7.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

Filesystem/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
   <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
 </packages>

Interfaces/ActiveDirectoryInterface.vb

@@ -193,6 +193,8 @@ Public Class ActiveDirectoryInterface
                                                     .FirebirdSyskey = oMap.FirebirdSyskey,
                                                     .MSSQLColumn = oMap.MSSQLColumn
                                                 })
+                                            Else
+                                                _logger.Debug("Attribute [{0}] is empty.", oMap.AttributeName)
                                             End If
                                         Next
                                     Else

Interfaces/ActiveDirectoryInterface/ActiveDirectoryUser.vb

@@ -8,6 +8,7 @@ Public Class ADUser
     Public Property GivenName As String
     Public Property Middlename As String
     Public Property Email As String
+    Public Property Language As String
 
     Public CustomAttributes As List(Of CustomAttribute)
 

Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb

@@ -42,7 +42,7 @@ Namespace SyncUsers
             End Try
 
             For Each oUser In Users
-                Dim oUserId As Int64
+                Dim oUserId As Long
                 Dim oUserExists As Boolean
 
                 ' Check if user already exists
@@ -68,7 +68,7 @@ Namespace SyncUsers
                         _logger.Debug("Creating new user for [{0}]", oUser)
                         oUserId = CreateUser(oUser)
                         _logger.Debug("User created with Id [{0}]", oUserId)
-                        _logger.Info("Added new User [{0}]", oUser.samAccountName)
+                        _logger.Info("Added new User [{0}]", oUser)
 
                         oCreatedUsers.Add(oUser)
                     Else
@@ -76,7 +76,7 @@ Namespace SyncUsers
                         oUserId = UpdateUser(oUser)
                         If oUserId <> 0 Then
                             _logger.Debug("User created with Id [{0}]", oUserId)
-                            _logger.Info("Updated User [{0}]", oUser.samAccountName)
+                            _logger.Info("Updated User [{0}]", oUser)
 
                             oUpdatedUsers.Add(oUser)
                         End If
@@ -84,7 +84,7 @@ Namespace SyncUsers
 
                 Catch ex As Exception
                     _logger.Error(ex)
-                    _logger.Warn("Could Not create/update user [{0}]. Skipping.", oUser.samAccountName)
+                    _logger.Warn("Could Not create/update user [{0}]. Skipping.", oUser)
                     Continue For
                 End Try
 
@@ -99,7 +99,7 @@ Namespace SyncUsers
                 ' Add the user to group
                 Try
                     If AddUserToGroup(oUserId, oGroupId) Then
-                        _logger.Info("User [{0}] added to group [{1}]", oUser.samAccountName, GroupName)
+                        _logger.Info("User [{0}] added to group [{1}]", oUser, GroupName)
                     End If
                 Catch ex As Exception
                     _logger.Error(ex)
@@ -175,7 +175,8 @@ Namespace SyncUsers
                 Dim oSQL As String = $"SELECT GUID FROM TBDD_USER WHERE UPPER(USERNAME) = UPPER('{UserName}')"
                 Dim oUserId = _mssql.GetScalarValue(oSQL)
 
-                If IsDBNull(oUserId) OrElse oUserId = 0 Then
+                If IsDBNull(oUserId) OrElse IsNothing(oUserId) OrElse oUserId = 0 Then
+                    _logger.Debug("User [{0}] does not exist", UserName)
                     Return 0
                 End If
 
@@ -194,9 +195,15 @@ Namespace SyncUsers
                 End If
 
                 Dim oUserId As Integer = GetUserId(User.samAccountName)
+                _logger.Debug("UserId of User [{0}] is [{1}]", User, oUserId)
 
                 If oUserId = 0 Then
-                    Dim oSQL As String = $"INSERT INTO TBDD_USER (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO) VALUES ('{User?.GivenName}', '{User?.Surname?.Replace("'", "''")}', UPPER('{User?.samAccountName?.Replace("'", "''")}'), '{User?.Email?.Replace("'", "''")}', '{ADDED_WHO}')"
+                    Dim oPrename = User.GivenName.EscapeForSQL()
+                    Dim oSurname = User.Surname.EscapeForSQL()
+                    Dim oUsername = User.samAccountName.EscapeForSQL()
+                    Dim oEmail = User.Email.EscapeForSQL()
+
+                    Dim oSQL As String = $"INSERT INTO TBDD_USER (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO) VALUES ('{oPrename}', '{oSurname}', UPPER('{oUsername}'), '{oEmail}', '{ADDED_WHO}')"
                     Dim oResult = _mssql.ExecuteNonQuery(oSQL)
 
                     If oResult = True Then
@@ -230,11 +237,11 @@ Namespace SyncUsers
                 Dim oUserId As Integer = GetUserId(User.samAccountName)
                 If Not IsNothing(oUserId) Then
                     If oUserId > 0 Then
-                        Dim oGivenName As String = EscapeQuotes(User.GivenName)
+                        Dim oPrename = User.GivenName.EscapeForSQL()
-                        Dim oSurname As String = EscapeQuotes(User.Surname)
+                        Dim oSurname = User.Surname.EscapeForSQL()
-                        Dim oEmail As String = EscapeQuotes(User.Email)
+                        Dim oEmail = User.Email.EscapeForSQL()
 
-                        Dim oSQL As String = $"UPDATE TBDD_USER SET PRENAME = '{oGivenName}', NAME = '{oSurname}', EMAIL = '{oEmail}', CHANGED_WHO = '{ADDED_WHO}' WHERE GUID = {oUserId}"
+                        Dim oSQL As String = $"UPDATE TBDD_USER SET PRENAME = '{oPrename}', NAME = '{oSurname}', EMAIL = '{oEmail}', CHANGED_WHO = '{ADDED_WHO}' WHERE GUID = {oUserId}"
                         Dim oResult = _mssql.ExecuteNonQuery(oSQL)
 
                         If oResult = True Then
@@ -256,11 +263,6 @@ Namespace SyncUsers
             End Try
         End Function
 
-        Private Function EscapeQuotes(pString As String)
-            Dim oString = Utils.NotNull(pString, String.Empty)
-            Return oString.Replace("'", "''")
-        End Function
-
         Public Sub AddCustomAttributesToUser(User As ADUser, UserId As Integer) Implements ISyncUsers.AddCustomAttributesToUser
             Dim oCustomAttributes = User.CustomAttributes
 

Interfaces/Interfaces.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Modules.Interfaces</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,8 +51,8 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

Interfaces/My Project/AssemblyInfo.vb

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

Interfaces/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.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

Interfaces/ZUGFeRDInterface.vb

@@ -4,53 +4,116 @@ Imports System.Xml.Serialization
 Imports System.Xml.XPath
 Imports System.Xml.Xsl
 Imports DigitalData.Modules.Interfaces.Exceptions
+Imports DigitalData.Modules.Interfaces.ZUGFeRD
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
 
 Public Class ZUGFeRDInterface
-    Private _logConfig As LogConfig
+    Private ReadOnly _logConfig As LogConfig
-    Private _logger As Logger
+    Private ReadOnly _logger As Logger
+    Private ReadOnly _Options As ZugferdOptions
+
+    ' These constants define the specification markers for the different
+    ' zugferd document schema versions. These markers need to be used to 
+    ' define the property map in the database (column SPECIFICATION).
+    Public Const ZUGFERD_SPEC_DEFAULT = "DEFAULT"
+    Public Const ZUGFERD_SPEC_10 = "ZUGFERD_10"
+    Public Const ZUGFERD_SPEC_2x = "ZUGFERD_2x"
+
+    Private ReadOnly ValidFilenames As New List(Of String) From {
+        PDFEmbeds.ZUGFERD_XML_FILENAME.ToUpper,
+        PDFEmbeds.FACTUR_X_XML_FILENAME_DE.ToUpper,
+        PDFEmbeds.FACTUR_X_XML_FILENAME_FR.ToUpper
+    }
+
+    Private AllowedFilenames As New List(Of String)
 
     Public Enum ErrorType
         NoValidFile
         NoZugferd
         NoValidZugferd
         MissingProperties
+        UnsupportedFormat
+        UnknownError
     End Enum
 
     Public ReadOnly Property FileGroup As FileGroups
     Public ReadOnly Property PropertyValues As PropertyValues
 
-    Public Sub New(LogConfig As LogConfig, GDPictureKey As String)
+    Public Class ZugferdOptions
-        _logConfig = LogConfig
+        Public Property AllowFacturX_Filename As Boolean = True
+        Public Property AllowXRechnung_Filename As Boolean = True
+        Public Property AllowZugferd_1_0_Schema As Boolean = True
+        Public Property AllowZugferd_2_x_Schema As Boolean = True
+    End Class
+
+    Public Class ZugferdResult
+        Public Property DataFileName As String
+        Public Property XPathObject As XPathDocument
+        Public Property SchemaObject As Object
+        Public Property Specification As String
+    End Class
+
+    ''' <summary>
+    ''' Create a new instance of ZUGFeRDInterface
+    ''' </summary>
+    ''' <param name="pLogConfig">A LogConfig object</param>
+    ''' <param name="pGDPictureKey">A valid GDPicture License</param>
+    ''' <param name="pOptions">Optional parameters to control various settings</param>
+    Public Sub New(pLogConfig As LogConfig, pGDPictureKey As String, Optional pOptions As ZugferdOptions = Nothing)
+        _logConfig = pLogConfig
         _logger = _logConfig.GetLogger()
 
+        If pOptions Is Nothing Then
+            _Options = New ZugferdOptions()
+        Else
+            _Options = pOptions
+        End If
+
+        ApplyFilenameOptions(_Options)
+
         FileGroup = New FileGroups(_logConfig)
         PropertyValues = New PropertyValues(_logConfig)
 
         Try
             Dim oLicenseManager As New LicenseManager
-            oLicenseManager.RegisterKEY(GDPictureKey)
+            oLicenseManager.RegisterKEY(pGDPictureKey)
         Catch ex As Exception
             _logger.Warn("GDPicture License could not be registered!")
             _logger.Error(ex)
         End Try
     End Sub
 
+    Private Sub ApplyFilenameOptions(pOptions As ZugferdOptions)
+        Dim oAllowedFilenames As List(Of String) = ValidFilenames
+
+        If pOptions.AllowFacturX_Filename = False Then
+            oAllowedFilenames = oAllowedFilenames.
+                Except(New List(Of String) From {PDFEmbeds.FACTUR_X_XML_FILENAME_FR}).ToList()
+        End If
+
+        If pOptions.AllowXRechnung_Filename = False Then
+            oAllowedFilenames = oAllowedFilenames.
+                Except(New List(Of String) From {PDFEmbeds.FACTUR_X_XML_FILENAME_DE}).ToList()
+        End If
+
+        AllowedFilenames = oAllowedFilenames
+    End Sub
+
+
     ''' <summary>
     ''' Validates a ZUGFeRD File and extracts the XML Document from it
     ''' </summary>
     ''' <param name="Path"></param>
     ''' <exception cref="ZUGFeRDExecption"></exception>
-    ''' <returns></returns>
+    Public Function ExtractZUGFeRDFileWithGDPicture(Path As String) As ZugferdResult
-    Public Function ExtractZUGFeRDFileWithGDPicture(Path As String) As Object
+        Dim oResult = ValidateZUGFeRDFileWithGDPicture(Path)
-        Dim oXmlDocument = ValidateZUGFeRDFileWithGDPicture(Path)
 
-        If IsNothing(oXmlDocument) Then
+        'If IsNothing(oResult.SchemaObject) Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
+        '    Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
-        End If
+        'End If
 
-        Return SerializeZUGFeRDDocument(oXmlDocument)
+        Return SerializeZUGFeRDDocument(oResult)
     End Function
 
     ''' <summary>
@@ -58,29 +121,28 @@ Public Class ZUGFeRDInterface
     ''' </summary>
     ''' <param name="Stream"></param>
     ''' <exception cref="ZUGFeRDExecption"></exception>
-    ''' <returns></returns>
+    Public Function ExtractZUGFeRDFileWithGDPicture(Stream As Stream) As ZugferdResult
-    Public Function ExtractZUGFeRDFileWithGDPicture(Stream As Stream) As Object
+        Dim oResult = ValidateZUGFeRDFileWithGDPicture(Stream)
-        Dim oXmlDocument = ValidateZUGFeRDFileWithGDPicture(Stream)
 
-        If IsNothing(oXmlDocument) Then
+        'If IsNothing(oResult.SchemaObject) Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
+        '    Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
-        End If
+        'End If
 
-        Return SerializeZUGFeRDDocument(oXmlDocument)
+        Return SerializeZUGFeRDDocument(oResult)
     End Function
 
     ''' <summary>
     ''' Validates a ZUGFeRD File and extracts the XML Document from it
     ''' </summary>
-    ''' <param name="Stream"></param>
+    ''' <param name="pStream"></param>
     ''' <exception cref="ZUGFeRDExecption"></exception>
-    ''' <returns></returns>
+    ''' <returns>The embedded xml data as an XPath document</returns>
-    Public Function ValidateZUGFeRDFileWithGDPicture(Stream As Stream) As XPathDocument
+    Public Function ValidateZUGFeRDFileWithGDPicture(pStream As Stream) As ZugferdResult
         Dim oEmbedExtractor = New PDFEmbeds(_logConfig)
-        Dim oAllowedExtensions = New List(Of String) From {"xml"}
 
         Try
-            Dim oFiles = oEmbedExtractor.Extract(Stream, oAllowedExtensions)
+            ' Extract XML attachments only!
+            Dim oFiles = oEmbedExtractor.Extract(pStream, New List(Of String) From {"xml"})
 
             ' Attachments are in this case the files that are embedded into a pdf file,
             ' like for example the zugferd-invoice.xml file
@@ -97,12 +159,18 @@ Public Class ZUGFeRDInterface
         End Try
     End Function
 
-    Public Function ValidateZUGFeRDFileWithGDPicture(Path As String) As XPathDocument
+    ''' <summary>
+    ''' Validates a ZUGFeRD File and extracts the XML Document from it
+    ''' </summary>
+    ''' <param name="pPath"></param>
+    ''' <exception cref="ZUGFeRDExecption"></exception>
+    ''' <returns>The embedded xml data as an XPath document</returns>
+    Public Function ValidateZUGFeRDFileWithGDPicture(pPath As String) As ZugferdResult
         Dim oEmbedExtractor = New PDFEmbeds(_logConfig)
-        Dim oAllowedExtensions = New List(Of String) From {"xml"}
 
         Try
-            Dim oFiles = oEmbedExtractor.Extract(Path, oAllowedExtensions)
+            ' Extract XML attachments only!
+            Dim oFiles = oEmbedExtractor.Extract(pPath, New List(Of String) From {"xml"})
 
             ' Attachments are in this case the files that are embedded into a pdf file,
             ' like for example the zugferd-invoice.xml file
@@ -119,38 +187,42 @@ Public Class ZUGFeRDInterface
         End Try
     End Function
 
-    Private Function HandleEmbeddedFiles(Results As List(Of PDFEmbeds.EmbeddedFile)) As XPathDocument
+    Private Function HandleEmbeddedFiles(pResults As List(Of PDFEmbeds.EmbeddedFile)) As ZugferdResult
-        Dim oXmlDocument As XPathDocument
+        If pResults Is Nothing Then
-
-        If Results Is Nothing Then
             Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil die Attachments nicht gelesen werden konnten.")
         End If
 
-        If Results.Count = 0 Then
+        If pResults.Count = 0 Then
             Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil sie keine Attachments enthält.")
         End If
 
-        Dim oValidFilenames As New List(Of String) From {
-            PDFEmbeds.ZUGFERD_XML_FILENAME.ToUpper,
-            PDFEmbeds.FACTUR_X_XML_FILENAME_DE.ToUpper,
-            PDFEmbeds.FACTUR_X_XML_FILENAME_FR.ToUpper
-        }
-
         ' Find the first file which filename matches the valid filenames for embedded invoice files
-        Dim oFoundResult As PDFEmbeds.EmbeddedFile = Results.
+        Dim oValidResult As PDFEmbeds.EmbeddedFile = pResults.
-            Where(Function(result) oValidFilenames.Contains(result.FileName.ToUpper)).
+            Where(Function(f) ValidFilenames.Contains(f.FileName.ToUpper)).
             FirstOrDefault()
 
-        If oFoundResult Is Nothing Then
+        If oValidResult Is Nothing Then
-            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil die zugferd-invoice.xml nicht gefunden wurde.")
+            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil keine entsprechende XML-Datei gefunden wurde.")
+        End If
+
+        ' Search the embedded files for the ones which are allowed as per the configuration.
+        ' The config might say, allow ZUGFeRD but not Factur-X.
+        Dim oAllowedResult As PDFEmbeds.EmbeddedFile = pResults.
+            Where(Function(f) AllowedFilenames.Contains(f.FileName.ToUpper)).
+            FirstOrDefault()
+
+        If oAllowedResult Is Nothing Then
+            Throw New ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Datei ist eine ZUGFeRD Datei, aber das Format wird nicht unterstützt.", oAllowedResult.FileName)
         End If
 
         Try
-            Using oStream As New MemoryStream(oFoundResult.FileContents)
+            Using oStream As New MemoryStream(oAllowedResult.FileContents)
-                oXmlDocument = New XPathDocument(oStream)
+                Return New ZugferdResult With {
+                    .DataFileName = oAllowedResult.FileName,
+                    .XPathObject = New XPathDocument(oStream)
+                }
             End Using
 
-            Return oXmlDocument
         Catch ex As ZUGFeRDExecption
             ' Don't log ZUGFeRD Exceptions here, they should be handled by the calling code.
             ' It also produces misleading error messages when checking if an attachment is a zugferd file.
@@ -162,44 +234,78 @@ Public Class ZUGFeRDInterface
         End Try
     End Function
 
-    Public Function SerializeZUGFeRDDocument(Document As XPathDocument) As Object
+    Private Class AllowedType
+        Public SchemaType As Type
+        Public Specification As String
+    End Class
+
+    Public Function SerializeZUGFeRDDocument(pResult As ZugferdResult) As ZugferdResult
         Try
-            Dim oNavigator As XPathNavigator = Document.CreateNavigator()
+            Dim oNavigator As XPathNavigator = pResult.XPathObject.CreateNavigator()
             Dim oReader As XmlReader
-            Dim oResult = Nothing
 
-            Dim oTypes As New List(Of Type) From {
+            Dim oObject As Object = Nothing
-                GetType(ZUGFeRD.Version1_0.CrossIndustryDocumentType),
+            Dim oSpecification As String = Nothing
-                GetType(ZUGFeRD.Version2_0.CrossIndustryInvoiceType),
+
-                GetType(ZUGFeRD.Version2_1_1.CrossIndustryInvoiceType),
+            Dim oAllowedTypes As New List(Of AllowedType)
-                GetType(ZUGFeRD.Version2_2_FacturX.CrossIndustryInvoiceType)
+
+            If _Options.AllowZugferd_1_0_Schema Then
+                oAllowedTypes.Add(New AllowedType With {
+                    .SchemaType = GetType(Version1_0.CrossIndustryDocumentType),
+                    .Specification = ZUGFERD_SPEC_10
+                })
+            End If
+
+            If _Options.AllowZugferd_2_x_Schema Then
+                oAllowedTypes.AddRange(New List(Of AllowedType) From {
+                    New AllowedType With {
+                        .SchemaType = GetType(Version2_0.CrossIndustryInvoiceType),
+                        .Specification = ZUGFERD_SPEC_2x
+                    },
+                    New AllowedType With {
+                        .SchemaType = GetType(Version2_1_1.CrossIndustryInvoiceType),
+                        .Specification = ZUGFERD_SPEC_2x
+                    },
+                    New AllowedType With {
+                        .SchemaType = GetType(Version2_2_FacturX.CrossIndustryInvoiceType),
+                        .Specification = ZUGFERD_SPEC_2x
                     }
+                })
+            End If
 
-            For Each oType In oTypes
+            For Each oType In oAllowedTypes
-                _logger.Debug("Trying Type [{0}]", oType.FullName)
+                Dim oTypeName As String = oType.SchemaType.FullName
-                Dim oSerializer As New XmlSerializer(oType)
+                Dim oSerializer As New XmlSerializer(oType.SchemaType)
+                _logger.Debug("Trying Type [{0}]", oTypeName)
 
                 Try
                     oReader = oNavigator.ReadSubtree()
-                    oResult = oSerializer.Deserialize(oReader)
+
-                    _logger.Debug("Serializing with type [{0}] succeeded", oType.FullName)
+                    oObject = oSerializer.Deserialize(oReader)
+                    oSpecification = oType.Specification
+
+                    _logger.Debug("Serializing with type [{0}] succeeded", oTypeName)
                     Exit For
                 Catch ex As Exception
-                    _logger.Debug("Serializing with type [{0}] failed", oType.FullName)
+                    _logger.Debug("Serializing with type [{0}] failed", oTypeName)
                     _logger.Debug(ex.Message)
                     _logger.Error(ex.InnerException?.Message)
                 End Try
             Next
 
-            If oResult Is Nothing Then
+            If oObject Is Nothing Then
                 Throw New ApplicationException("No Types matched the given document. Document could not be serialized.")
             End If
 
-            Return oResult
+            pResult.Specification = oSpecification
+            pResult.SchemaObject = oObject
+
+            Return pResult
 
         Catch ex As Exception
             _logger.Error(ex)
-            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, "Datei ist eine ungültige ZUGFeRD Datei.")
+            Dim oMessage = "Datei ist eine ungültige ZUGFeRD Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
+            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, oMessage)
         End Try
     End Function
 

Interfaces/ZUGFeRDInterface/Exceptions.vb

@@ -4,10 +4,23 @@
 
         Public ReadOnly Property ErrorType() As ZUGFeRDInterface.ErrorType
 
+        ''' <summary>
+        ''' Contains the name of the extracted xml file if already extracted.
+        ''' </summary>
+        ''' <returns>A filename like zugferd-invoice.xml</returns>
+        Public ReadOnly Property XmlFile As String = String.Empty
+
         Public Sub New(ErrorType As ZUGFeRDInterface.ErrorType, Message As String)
             MyBase.New(Message)
 
             _ErrorType = ErrorType
         End Sub
+
+        Public Sub New(ErrorType As ZUGFeRDInterface.ErrorType, Message As String, pXmlFileName As String)
+            MyBase.New(Message)
+
+            _ErrorType = ErrorType
+            _XmlFile = pXmlFileName
+        End Sub
     End Class
 End Class

Interfaces/ZUGFeRDInterface/PDFEmbeds.vb

@@ -28,7 +28,7 @@ Public Class PDFEmbeds
     Public Function Extract(FilePath As String, AllowedExtensions As List(Of String)) As List(Of EmbeddedFile)
         Dim oFile As New List(Of EmbeddedFile)
         Dim oFileInfo As FileInfo
-        Dim oExtensions = AllowedExtensions.ConvertAll(New Converter(Of String, String)(Function(ext) ext.ToUpper))
+        Dim oExtensions = AllowedExtensions.Select(Function(ext) ext.ToUpper).ToList()
 
         Logger.Debug("Extracting embedded files from [{0}]", FilePath)
 
@@ -69,7 +69,7 @@ Public Class PDFEmbeds
     ''' <param name="AllowedExtensions">List of allowed extensions to be extracted</param>
     Public Function Extract(Stream As Stream, AllowedExtensions As List(Of String)) As List(Of EmbeddedFile)
         Dim oResults As New List(Of EmbeddedFile)
-        Dim oExtensions = AllowedExtensions.ConvertAll(New Converter(Of String, String)(Function(ext) ext.ToUpper))
+        Dim oExtensions = AllowedExtensions.Select(Function(ext) ext.ToUpper).ToList()
 
         Logger.Debug("Extracting embedded files from stream")
 

Interfaces/ZUGFeRDInterface/PropertyValues.vb

@@ -24,7 +24,7 @@ Public Class PropertyValues
         Public TableName As String
         Public TableColumn As String
 
-        Public ISRequired As Boolean
+        Public IsRequired As Boolean
         Public GroupCounter As Integer = -1
 
         Public Description As String
@@ -99,9 +99,7 @@ Public Class PropertyValues
                     Dim oIsRequired As Boolean = oColumn.Key.IsRequired
                     Dim oPropertyDescription As String = oColumn.Key.Description
                     Dim oRowCounter = oRowIndex + oGlobalGroupCounter + 1
-                    If IsNothing(oRowCounter) Then
 
-                    End If
                     ' Returns nothing if oColumn.Value contains an empty list
                     Dim oPropertyValue = oColumn.Value.ElementAtOrDefault(oRowIndex)
 
@@ -127,7 +125,7 @@ Public Class PropertyValues
                         .GroupCounter = oRowCounter,
                         .TableName = oTableName,
                         .TableColumn = oTableColumn,
-                        .ISRequired = oIsRequired
+                        .IsRequired = oIsRequired
                     })
                 Next
             Next
@@ -139,6 +137,7 @@ Public Class PropertyValues
         For Each oItem As KeyValuePair(Of String, XmlItemProperty) In oDefaultProperties
             Dim oPropertyValueList As List(Of Object)
             Dim oTableColumn As String = oItem.Value.TableColumn
+            Dim oPropertyDescription As String = oItem.Value.Description
             Dim oPropertyValue As Object = Nothing
             Dim oTableName = oItem.Value.TableName
             Dim oIsRequired = oItem.Value.IsRequired
@@ -146,7 +145,7 @@ Public Class PropertyValues
             Try
                 oPropertyValueList = GetPropValue(Document, oItem.Key)
             Catch ex As Exception
-                _logger.Warn("{2} # Unknown error occurred while fetching specification [{0}] in group [{1}]:", oTableColumn, oItem.Value.GroupScope, MessageId)
+                _logger.Warn("{2} # Unknown error occurred while fetching specification [{0}] in group [{1}]:", oPropertyDescription, oItem.Value.GroupScope, MessageId)
                 _logger.Error(ex)
                 oPropertyValueList = New List(Of Object)
             End Try
@@ -164,24 +163,24 @@ Public Class PropertyValues
 
                             ' This should hopefully show config errors
                             If TypeOf oPropertyValue Is List(Of Object) Then
-                                _logger.Warn("Item with TableColumn [{0}] may be configured incorrectly", oTableColumn)
+                                _logger.Warn("Item with specification [{0}] may be configured incorrectly", oPropertyDescription)
                                 oPropertyValue = Nothing
                             End If
                     End Select
                 End If
             Catch ex As Exception
-                _logger.Warn("Unknown error occurred while processing specification [{0}]:", oTableColumn)
+                _logger.Warn("Unknown error occurred while processing specification [{0}]:", oPropertyDescription)
                 _logger.Error(ex)
                 oPropertyValue = Nothing
             End Try
 
             If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
                 If oItem.Value.IsRequired Then
-                    _logger.Warn("{0} # Specification [{1}] is empty, but marked as required! Skipping.", MessageId, oTableColumn)
+                    _logger.Warn("{0} # Specification [{1}] is empty, but marked as required! Skipping.", MessageId, oPropertyDescription)
-                    oResult.MissingProperties.Add(oTableColumn)
+                    oResult.MissingProperties.Add(oPropertyDescription)
                     Continue For
                 Else
-                    _logger.Debug("{0} # oPropertyValue for specification [{1}] is empty or not found. Skipping.", MessageId, oTableColumn)
+                    _logger.Debug("{0} # oPropertyValue for specification [{1}] is empty or not found. Skipping.", MessageId, oPropertyDescription)
 
                     Continue For
                 End If
@@ -193,7 +192,7 @@ Public Class PropertyValues
                 .Value = oPropertyValue,
                 .TableName = oTableName,
                 .TableColumn = oTableColumn,
-                .ISRequired = oIsRequired
+                .IsRequired = oIsRequired
              })
         Next
 

Interfaces/ZUGFeRDInterface/XmlItemProperty.vb

@@ -1,8 +1,14 @@
 Public Class XmlItemProperty
+    Public IsRequired As Boolean
+    Public IsGrouped As Boolean
+
     Public TableName As String
     Public TableColumn As String
     Public Description As String
-    Public IsRequired As Boolean
-    Public IsGrouped As Boolean
     Public GroupScope As String
+
+    ''' <summary>
+    ''' Document version, eg. ZUGFeRD Schema version
+    ''' </summary>
+    Public Specification As String
 End Class

Interfaces/app.config

@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

Interfaces/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>

Jobs/App.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

Jobs/EDMI/GraphQL/GraphQLJob.vb

@@ -1,223 +0,0 @@
-Option Explicit On
-
-Imports System.IO
-Imports DigitalData.Modules.Interfaces
-Imports DigitalData.Modules.Jobs
-Imports DigitalData.Modules.Config
-Imports DigitalData.Modules.Logging
-Imports Newtonsoft.Json.Linq
-Imports System.Collections.Generic
-Imports System.Linq
-Imports System.Text.RegularExpressions
-Imports DigitalData.Modules.Database
-Imports System.Data
-
-Public Class GraphQLJob
-    Inherits JobBase
-    Implements IJob(Of GraphQLArgs)
-
-    Private _GraphQL As GraphQLInterface = Nothing
-
-    Private Const PLACEHOLDER_STATIC = "STATIC:"
-
-    Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer)
-        MyBase.New(LogConfig, Nothing, MSSQL)
-    End Sub
-
-    Public Sub Start(Args As GraphQLArgs) Implements IJob(Of GraphQLArgs).Start
-        Try
-            Dim oConfigPath As String = Args.QueryConfigPath
-            Dim oConfigManager As New ConfigManager(Of GraphQLConfig)(_LogConfig, oConfigPath)
-
-            With oConfigManager.Config
-                _GraphQL = New GraphQLInterface(_LogConfig, .BaseUrl, .Email, .Password, .CertificateFingerprint)
-            End With
-
-            ' Login to get cookie
-            _Logger.Debug("Logging in")
-            Dim oLoginResponse = _GraphQL.Login()
-
-            ' save cookie for future requests
-            _GraphQL.SaveCookies(oLoginResponse.Cookies.Item(0))
-
-            _Logger.Debug("Loading Queries")
-
-            ' Load query data from TBCUST_JOBRUNNER_QUERY
-            Dim oQueryTable As DataTable = _MSSQL.GetDatatable("SELECT * FROM TBCUST_JOBRUNNER_QUERY ORDER BY OPERATION_NAME, CLEAR_BEFORE_FILL ASC")
-            Dim oQueryList As New List(Of GraphQL.Query)
-
-            ' Save query data to business objects
-            For Each oRow As DataRow In oQueryTable.Rows
-                Dim oQuery As New GraphQL.Query With {
-                    .Id = oRow.Item("GUID"),
-                    .Name = oRow.Item("TITLE"),
-                    .ClearBeforeFill = oRow.Item("CLEAR_BEFORE_FILL"),
-                    .ConnectionId = oRow.Item("CON_ID"), ' TODO: Connection String?
-                    .DestinationTable = oRow.Item("DESTINATION_TABLE"),
-                    .OperationName = oRow.Item("OPERATION_NAME"),
-                    .MappingBasePath = oRow.Item("MAPPING_BASE_PATH"),
-                    .QueryString = oRow.Item("QUERY_STRING"),
-                    .QueryConstraint = oRow.Item("QUERY_CONSTRAINT")
-                }
-                oQueryList.Add(oQuery)
-            Next
-
-            _Logger.Debug("Getting the data from GraphQL")
-
-            For Each oQuery As GraphQL.Query In oQueryList
-                Try
-                    _Logger.NewBlock($"Query [{oQuery.Name}]")
-
-                    Dim oConnectionId As Integer = oQuery.ConnectionId
-                    Dim oConnectionString = _MSSQL.Get_ConnectionStringforID(oConnectionId)
-
-                    Dim oDatabase As New MSSQLServer(_LogConfig, oConnectionString)
-
-                    ' Reset all records to status = 0
-                    _Logger.Info("Resetting data with constraint [{1}]", oQuery.Name, oQuery.QueryConstraint)
-
-                    Dim oResetSQL = $"UPDATE {oQuery.DestinationTable} SET STATUS = 0"
-                    If oQuery.QueryConstraint <> String.Empty Then
-                        oResetSQL &= $" WHERE {oQuery.QueryConstraint}"
-                    End If
-                    _MSSQL.ExecuteNonQuery(oResetSQL)
-
-                    _Logger.Info("Getting data..", oQuery.Name)
-
-                    ' get the data from GraphQL
-                    Dim oDataResponse = _GraphQL.GetData(oQuery.QueryString, oQuery.OperationName)
-                    Dim oResult As String
-
-                    ' write data to string
-                    Using oStream = oDataResponse.GetResponseStream()
-                        Using oReader As New StreamReader(oStream)
-                            oResult = oReader.ReadToEnd()
-                        End Using
-                    End Using
-
-                    ' Fill the query object with field mapping data from TBCUST_JOBRUNNER_QUERY_MAPPING
-                    Dim oSQL As String = "SELECT t2.* FROM TBCUST_JOBRUNNER_QUERY_MAPPING t
-                                          JOIN TBCUST_JOBRUNNER_MAPPING t2 ON t.MAPPING_ID = t2.GUID
-                                          WHERE t.QUERY_ID = {0}"
-                    Dim oMappingTable As DataTable = _MSSQL.GetDatatable(String.Format(oSQL, oQuery.Id))
-
-                    For Each oMapping As DataRow In oMappingTable.Rows
-                        oQuery.MappingFields.Add(New GraphQL.FieldMapping With {
-                            .DestinationColumn = oMapping.Item("DestinationColumn"),
-                            .SourcePath = oMapping.Item("SourcePath")
-                        })
-                    Next
-
-                    ' Handle the response from GraphQL and insert Data
-                    Dim oQueryHandleResult = HandleResponse(oResult, oQuery, oDatabase)
-
-                    If IsNothing(oQueryHandleResult) Then
-                        Continue For
-                    End If
-
-                    ' Finally delete all old records
-                    Dim oDeleteSQL = $"DELETE FROM {oQuery.DestinationTable} WHERE STATUS = 0"
-                    If oQuery.QueryConstraint <> String.Empty Then
-                        oDeleteSQL &= $" AND {oQuery.QueryConstraint}"
-                    End If
-
-                    _Logger.Info("Success, deleting old records..", oQuery.Name)
-                    _MSSQL.ExecuteNonQuery(oDeleteSQL)
-
-                Catch ex As Exception
-                    _Logger.Warn("Error while getting Data for Name/OperationName [{0}]/[{1}]", oQuery.Name, oQuery.OperationName)
-                    _Logger.Error(ex)
-
-                    _Logger.Info("Failure, deleting new records..", oQuery.Name)
-
-                    ' If a crash happens, delete all records which were inserted in this run,
-                    ' thus going back to the previous state
-                    Dim oDeleteSQL = $"DELETE FROM {oQuery.DestinationTable} WHERE STATUS = 1"
-                    If oQuery.QueryConstraint <> String.Empty Then
-                        oDeleteSQL &= $" AND {oQuery.QueryConstraint}"
-                    End If
-                    _MSSQL.ExecuteNonQuery(oDeleteSQL)
-                Finally
-                    _Logger.EndBlock()
-                End Try
-            Next
-
-            ' logout
-            _Logger.Debug("Logging out")
-            Dim oLogoutResponse = _GraphQL.Logout()
-        Catch ex As Exception
-            _Logger.Error(ex)
-            Throw ex
-        End Try
-    End Sub
-
-    Private Function HandleResponse(JsonString As String, QueryData As GraphQL.Query, DB As Database.MSSQLServer) As GraphQL.Query
-        Dim oObj As JObject = JObject.Parse(JsonString)
-        Dim oResultList As JToken
-
-        If _GraphQL.ReadJSONPathFragmented(oObj, QueryData.MappingBasePath) = False Then
-            _Logger.Warn("There is an error in the MappingBasePath [{1}] configuration of query [{0}]", QueryData.Name, QueryData.MappingBasePath)
-        End If
-
-        Try
-            oResultList = oObj.SelectToken(QueryData.MappingBasePath, errorWhenNoMatch:=True)
-        Catch ex As Exception
-            _Logger.Warn("HandleResponse: Could not find BasePath: [{0}] for query [{1}]", QueryData.MappingBasePath, QueryData.Name)
-            _Logger.Error(ex)
-            Return Nothing
-        End Try
-
-        If oResultList Is Nothing Then
-            _Logger.Warn("HandleResponse: Could not find BasePath: [{0}] for query [{1}]", QueryData.MappingBasePath, QueryData.Name)
-            Return Nothing
-        End If
-
-        _Logger.Info("HandleResponse: Processing Queue [{0}] with [{1}] Items", QueryData.Name, oResultList.Count)
-
-        For Each oResultItem As JToken In oResultList
-            Try
-                Dim oValues As New List(Of String)
-                Dim oKeys As New List(Of String)
-
-                For Each oMapping In QueryData.MappingFields
-                    Dim oValue As String = String.Empty
-
-                    If oMapping.SourcePath.StartsWith(PLACEHOLDER_STATIC) Then
-                        oValue = oMapping.SourcePath.Replace(PLACEHOLDER_STATIC, String.Empty)
-                    Else
-                        Dim oToken = oResultItem.SelectToken(oMapping.SourcePath)
-
-                        If oToken Is Nothing Then
-                            _Logger.Warn("HandleResponse: Could not find value at SourcePath: {0}", oMapping.SourcePath)
-                            oValue = String.Empty
-                        Else
-                            oValue = oToken.ToString
-                        End If
-                    End If
-
-                    oValues.Add(oValue)
-                    oKeys.Add(oMapping.DestinationColumn)
-                Next
-
-                Dim oColumnValues = oValues.
-                    Select(Function(Value) Regex.Replace(Value, "'", "''")).
-                    Select(Function(Value) $"'{Value}'").
-                    ToList()
-                Dim oValueString = String.Join(",", oColumnValues)
-
-                Dim oColumns = String.Join(",", oKeys.ToArray)
-                Dim oSQL As String = $"INSERT INTO {QueryData.DestinationTable} ({oColumns}) VALUES ({oValueString})"
-
-                DB.ExecuteNonQuery(oSQL)
-            Catch ex As Exception
-                _Logger.Error(ex)
-            End Try
-        Next
-
-        Return QueryData
-    End Function
-
-    Public Function ShouldStart(Arguments As GraphQLArgs) As Boolean Implements IJob(Of GraphQLArgs).ShouldStart
-        Return Arguments.Enabled
-    End Function
-End Class

Jobs/Exceptions.vb

@@ -40,6 +40,17 @@ Public Class Exceptions
         End Sub
     End Class
 
+    Public Class UnsupportedFerdException
+        Inherits ApplicationException
+
+        Public ReadOnly Property XmlFile As String
+
+        Public Sub New(pXmlFile As String)
+            MyBase.New("ZUGFeRD document found but is not supported!")
+            _XmlFile = pXmlFile
+        End Sub
+    End Class
+
     Public Class NoFerdsException
         Inherits ApplicationException
 

Jobs/GraphQL/GraphQLJob.vb

@@ -0,0 +1,284 @@
+Option Explicit On
+
+Imports System.Collections.Generic
+Imports System.Data
+Imports System.IO
+Imports System.Linq
+Imports System.Net.NetworkInformation
+Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Interfaces
+Imports DigitalData.Modules.Jobs.GraphQL
+Imports DigitalData.Modules.Language
+Imports DigitalData.Modules.Logging
+Imports Newtonsoft.Json.Linq
+
+Public Class GraphQLJob
+    Inherits JobBase
+    Implements IJob(Of GraphQLArgs)
+
+    Private _GraphQL As GraphQLInterface = Nothing
+
+    Private Const PLACEHOLDER_STATIC = "STATIC:"
+    Private Const JOB_NAME = "GraphQL Job"
+
+    Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer)
+        MyBase.New(LogConfig, Nothing, MSSQL)
+    End Sub
+
+    Public Sub Start(Args As GraphQLArgs) Implements IJob(Of GraphQLArgs).Start
+        Try
+            Dim oConfigPath As String = Args.QueryConfigPath
+            Dim oConfigManager As New ConfigManager(Of GraphQLConfig)(_LogConfig, oConfigPath)
+
+            With oConfigManager.Config
+                _GraphQL = New GraphQLInterface(_LogConfig, .BaseUrl, .Email, .Password, .CertificateFingerprint)
+            End With
+
+            ' Login to get cookie
+            _Logger.Debug("Logging in")
+            Dim oLoginResponse = _GraphQL.Login()
+
+            ' save cookie for future requests
+            _GraphQL.SaveCookies(oLoginResponse.Cookies.Item(0))
+
+            _Logger.Debug("Loading Queries")
+
+            ' Load query data from TBCUST_JOBRUNNER_QUERY
+            Dim oQueryTable As DataTable = _MSSQL.GetDatatable("SELECT * FROM TBCUST_JOBRUNNER_QUERY ORDER BY SEQUENCE")
+            Dim oQueryList As New List(Of Query)
+
+            ' Save query data to business objects
+            For Each oRow As DataRow In oQueryTable.Rows
+                Dim oQuery As New Query With {
+                    .Id = oRow.Item("GUID"),
+                    .Name = oRow.Item("TITLE"),
+                    .ClearBeforeFill = oRow.ItemEx("CLEAR_BEFORE_FILL", False),
+                    .ConnectionId = oRow.ItemEx("CON_ID", 1), ' TODO: Connection String?
+                    .DestinationTable = oRow.ItemEx("DESTINATION_TABLE", String.Empty),
+                    .OperationName = oRow.ItemEx("OPERATION_NAME", String.Empty),
+                    .MappingBasePath = oRow.ItemEx("MAPPING_BASE_PATH", String.Empty),
+                    .QueryString = oRow.ItemEx("QUERY_STRING", String.Empty)
+                }
+
+                If oQuery.DestinationTable = String.Empty Then
+                    _Logger.Warn("Value [DestinationTable] could not be read. Configuration incomplete.")
+                End If
+
+                If oQuery.OperationName = String.Empty Then
+                    _Logger.Warn("Value [OperationName] could not be read. Configuration incomplete.")
+                End If
+
+                If oQuery.MappingBasePath = String.Empty Then
+                    _Logger.Warn("Value [MappingBasePath] could not be read. Configuration incomplete.")
+                End If
+
+                If oQuery.QueryString = String.Empty Then
+                    _Logger.Warn("Value [QueryString] could not be read. Configuration incomplete.")
+                End If
+
+                oQueryList.Add(oQuery)
+            Next
+
+            _Logger.Debug("Running [{0}] queries.", oQueryList.Count)
+
+            ' run
+            For Each oQuery As Query In oQueryList
+                _Logger.Debug("Running Query [{0}].", oQuery.Name)
+                Dim oQueryResult = RunQuery(oQuery)
+                _Logger.Info("Query [{0}] finished with Result [{1}]", oQuery.Name, oQueryResult)
+            Next
+
+            ' logout
+            _Logger.Debug("Logging out")
+            Dim oLogoutResponse = _GraphQL.Logout()
+
+            _Logger.Info("Finished GraphQL Job")
+
+        Catch ex As Exception
+            _Logger.Warn("Finished GraphQL Job with errors")
+            _Logger.Error(ex)
+            Throw ex
+        End Try
+    End Sub
+
+    Private Function RunQuery(pQuery As Query)
+        Try
+            _Logger.Info("Executing Query [{0}]", pQuery.Name)
+
+            Dim oConnectionId As Integer = pQuery.ConnectionId
+            Dim oConnectionString = _MSSQL.Get_ConnectionStringforID(oConnectionId)
+
+            If oConnectionString = String.Empty Then
+                _Logger.Warn("Could not get Connection String for ConnectionId [{0}]", oConnectionId)
+            End If
+
+            Dim oDatabase As New MSSQLServer(_LogConfig, oConnectionString)
+
+            'TODO: ONly set status when clear before fill is false
+            'TODO: ADDED_WHO which contains the query id which inserted the rows
+
+            ' Clear Table before inserting
+            If pQuery.ClearBeforeFill = True Then
+                If DeleteWithQueryName(pQuery) = False Then
+                    Throw New ApplicationException($"Error while clearing table before fill for Query [{pQuery.Name}]")
+                End If
+            End If
+
+            ' Reset all records to status = 0
+            If pQuery.ClearBeforeFill = False Then
+                _Logger.Info("Resetting data for Query [{0}]", pQuery.Name)
+                If UpdateWithStatus(pQuery, 0) = False Then
+                    Throw New ApplicationException($"Error while resetting status of current Records for Query [{pQuery.Name}]")
+                End If
+            End If
+
+            ' get the data from GraphQL
+            _Logger.Info("Getting data..", pQuery.Name)
+            Dim oDataResponse = _GraphQL.GetData(pQuery.QueryString, pQuery.OperationName)
+            Dim oResult As String
+
+            ' write data to string
+            Using oStream = oDataResponse.GetResponseStream()
+                Using oReader As New StreamReader(oStream)
+                    oResult = oReader.ReadToEnd()
+                End Using
+            End Using
+
+            ' Fill the query object with field mapping data from TBCUST_JOBRUNNER_QUERY_MAPPING
+            Dim oSQL As String = "SELECT t2.* FROM TBCUST_JOBRUNNER_QUERY_MAPPING t
+                                          JOIN TBCUST_JOBRUNNER_MAPPING t2 ON t.MAPPING_ID = t2.GUID
+                                          WHERE t.QUERY_ID = {0}"
+            Dim oMappingTable As DataTable = _MSSQL.GetDatatable(String.Format(oSQL, pQuery.Id))
+            For Each oMapping As DataRow In oMappingTable.Rows
+                pQuery.MappingFields.Add(New GraphQL.FieldMapping With {
+                    .DestinationColumn = oMapping.Item("DestinationColumn"),
+                    .SourcePath = oMapping.Item("SourcePath")
+                })
+            Next
+
+            ' Handle the response from GraphQL and insert Data
+            Dim oWriteDataResult As GraphQL.Query = WriteNewQueryData(oResult, pQuery, oDatabase)
+
+            If IsNothing(oWriteDataResult) Then
+                Throw New ApplicationException($"Error while handling Result of Query [{pQuery.Name}]")
+            End If
+
+            _Logger.Info("New Data successfully inserted for Query [{0}]", pQuery.Name)
+
+            ' Finally delete all old records
+            If pQuery.ClearBeforeFill = False Then
+                _Logger.Info("Deleting old records for Query [{0}].", pQuery.Name)
+                If DeleteWithStatus(pQuery, 0) = False Then
+                    Throw New ApplicationException($"Error while deleting current Records for Query [{pQuery.Name}]")
+                End If
+            End If
+
+            Return True
+
+        Catch ex As Exception
+            _Logger.Warn("Error while getting Data for Name/OperationName [{0}]/[{1}]", pQuery.Name, pQuery.OperationName)
+            _Logger.Error(ex)
+
+            ' If a crash happens, delete all records which were inserted in this run,
+            ' thus going back to the previous state
+            _Logger.Info("Failure, deleting new records..", pQuery.Name)
+
+            If pQuery.ClearBeforeFill = False Then
+                If DeleteWithStatus(pQuery, 1) = False Then
+                    Throw New ApplicationException($"Error while deleting new Records for Query [{pQuery.Name}]")
+                End If
+            End If
+
+            Return False
+
+        Finally
+            _Logger.Debug("Finished running Query [{0}].", pQuery.Name)
+        End Try
+    End Function
+
+    Private Function DeleteWithQueryName(pQuery)
+        Dim oDeleteSQL = $"TRUNCATE TABLE {pQuery.DestinationTable}"
+        Return _MSSQL.ExecuteNonQuery(oDeleteSQL)
+    End Function
+
+    Private Function DeleteWithStatus(pQuery As Query, pStatus As Integer)
+        Dim oDeleteSQL = $"DELETE FROM {pQuery.DestinationTable} WHERE STATUS = {pStatus} AND ADDED_QUERY_ID = '{pQuery.Id}'"
+        Return _MSSQL.ExecuteNonQuery(oDeleteSQL)
+    End Function
+
+    Private Function UpdateWithStatus(pQuery As Query, pStatus As Integer)
+        Dim oResetSQL = $"UPDATE {pQuery.DestinationTable} SET STATUS = {pStatus} WHERE ADDED_QUERY_ID = '{pQuery.Id}'"
+        Return _MSSQL.ExecuteNonQuery(oResetSQL)
+    End Function
+
+    Private Function WriteNewQueryData(JsonString As String, QueryData As GraphQL.Query, DB As Database.MSSQLServer) As GraphQL.Query
+        Dim oObj As JObject = JObject.Parse(JsonString)
+        Dim oResultList As JToken
+
+        If _GraphQL.ReadJSONPathFragmented(oObj, QueryData.MappingBasePath) = False Then
+            _Logger.Warn("There is an error in the MappingBasePath [{1}] configuration of query [{0}]", QueryData.Name, QueryData.MappingBasePath)
+        End If
+
+        Try
+            oResultList = oObj.SelectToken(QueryData.MappingBasePath, errorWhenNoMatch:=True)
+        Catch ex As Exception
+            _Logger.Warn("WriteNewQueryData: Could not find BasePath: [{0}] for query [{1}]", QueryData.MappingBasePath, QueryData.Name)
+            _Logger.Error(ex)
+            Return Nothing
+        End Try
+
+        If oResultList Is Nothing Then
+            _Logger.Warn("WriteNewQueryData: Could not find BasePath: [{0}] for query [{1}]", QueryData.MappingBasePath, QueryData.Name)
+            Return Nothing
+        End If
+
+        _Logger.Info("WriteNewQueryData: Processing Queue [{0}] with [{1}] Items", QueryData.Name, oResultList.Count)
+
+        For Each oResultItem As JToken In oResultList
+            Try
+                ' ADDED_WHO, ADDED_QUERY_ID are system fields which are used to correctly fill
+                ' and delete rows in the destination table without touching rows from other queries
+                Dim oKeys As New List(Of String) From {"ADDED_WHO", "ADDED_QUERY_ID", "STATUS"}
+                Dim oValues As New List(Of String) From {JOB_NAME, QueryData.Id, "1"}
+
+                For Each oMapping In QueryData.MappingFields
+                    Dim oValue As String = String.Empty
+
+                    If oMapping.SourcePath.StartsWith(PLACEHOLDER_STATIC) Then
+                        oValue = oMapping.SourcePath.Replace(PLACEHOLDER_STATIC, String.Empty)
+                    Else
+                        Dim oToken = oResultItem.SelectToken(oMapping.SourcePath)
+
+                        If oToken Is Nothing Then
+                            _Logger.Warn("WriteNewQueryData: Could not find value at SourcePath: {0}", oMapping.SourcePath)
+                            oValue = String.Empty
+                        Else
+                            oValue = oToken.ToString
+                        End If
+                    End If
+
+                    oValues.Add(oValue)
+                    oKeys.Add(oMapping.DestinationColumn)
+                Next
+
+                Dim oColumnString = String.Join(",", oKeys.ToArray)
+
+                Dim oValueList = oValues.Select(Function(Value) $"'{Value.EscapeForSQL}'").ToList()
+                Dim oValueString = String.Join(",", oValueList)
+
+                Dim oSQL As String = $"INSERT INTO {QueryData.DestinationTable} ({oColumnString}) VALUES ({oValueString})"
+
+                DB.ExecuteNonQuery(oSQL)
+            Catch ex As Exception
+                _Logger.Error(ex)
+            End Try
+        Next
+
+        Return QueryData
+    End Function
+
+    Public Function ShouldStart(Arguments As GraphQLArgs) As Boolean Implements IJob(Of GraphQLArgs).ShouldStart
+        Return Arguments.Enabled
+    End Function
+End Class

Jobs/GraphQL/GraphQLQuery.vb

@@ -6,9 +6,7 @@ Namespace GraphQL
         Public Property Name As String
         Public Property ConnectionId As String = ""
         Public Property ClearBeforeFill As Boolean = False
-        Public Property ClearCommand As String = ""
         Public Property QueryString As String = ""
-        Public Property QueryConstraint As String = ""
         Public Property OperationName As String = ""
         Public Property DestinationTable As String = ""
 

Jobs/JobConfig.vb

@@ -1,8 +1,19 @@
 Imports System.Collections.Generic
 
 Public Class JobConfig
-    Public Enabled As Boolean
+    Public Property Name As JobType
-    Public StartImmediately As Boolean
+    Public Property Enabled As Boolean = False
-    Public CronExpression As String
+    Public Property StartWithoutDelay As Boolean = False
-    Public Arguments As Dictionary(Of String, String)
+    Public Property CronSchedule As String = ""
+
+    Public Property ArgsString As String = ""
+
+    <Xml.Serialization.XmlIgnore>
+    Public Property Args As New Dictionary(Of String, String)
+
+    Public Enum JobType
+        ADSync
+        GraphQL
+        Test
+    End Enum
 End Class

Jobs/JobConfigParser.vb

@@ -13,46 +13,17 @@ Public Class JobConfigParser
     ''' </summary>
     ''' <param name="ConfigString"></param>
     ''' <returns>A populated JobConfig object</returns>
-    Public Shared Function ParseConfig(ConfigString As String) As JobConfig
+    Public Shared Function ParseConfig(pJobConfig As JobConfig) As JobConfig
-        If JobOptionsRegex.IsMatch(ConfigString) Then
-            Dim oMatches = JobOptionsRegex.Matches(ConfigString)
-            Dim oOptions As New JobConfig
 
-            Dim oSplitOptions As String() = ConfigString.Split(ARGS_LIST_DELIMITER)
+        ' 24.11.2022: This only parses the optional Job arguments,
+        ' everything is comparmentalized in the Service config
+        pJobConfig.Args = ParseOptionalArguments(pJobConfig.ArgsString)
+        Return pJobConfig
 
-            If oSplitOptions.Length = 3 Then
-                oOptions = ParseEnabled(oSplitOptions(0), oOptions)
-                oOptions.CronExpression = oSplitOptions(1)
-                oOptions.Arguments = ParseOptionalArguments(oSplitOptions(2))
-            ElseIf oSplitOptions.Length = 2 Then
-                oOptions = ParseEnabled(oSplitOptions(0), oOptions)
-                oOptions.CronExpression = oSplitOptions(1)
-                oOptions.Arguments = New Dictionary(Of String, String)
-            Else
-                Throw New ArgumentException("Config Malformed")
-            End If
 
-            Return oOptions
-        Else
-            Throw New ArgumentException("Config Malformed")
-        End If
     End Function
 
-    Public Shared Function ParseEnabled(EnabledValue As String, Options As JobConfig) As JobConfig
-        Select Case EnabledValue
-            Case "True"
-                Options.Enabled = True
-                Options.StartImmediately = False
-            Case "Debug"
-                Options.Enabled = True
-                Options.StartImmediately = True
-            Case Else
-                Options.Enabled = False
-                Options.StartImmediately = False
-        End Select
 
-        Return Options
-    End Function
 
     Private Shared Function ParseOptionalArguments(ArgsString As String) As Dictionary(Of String, String)
         Dim oArgsDictionary As New Dictionary(Of String, String)

Jobs/Jobs.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Modules.Jobs</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Empty</MyType>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -91,17 +91,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="EDMI\ADSync\ADSyncArgs.vb" />
+    <Compile Include="ADSync\ADSyncArgs.vb" />
-    <Compile Include="EDMI\ADSync\ADSyncJob.vb" />
+    <Compile Include="ADSync\ADSyncJob.vb" />
-    <Compile Include="EDMI\GraphQL\GraphQLArgs.vb" />
+    <Compile Include="GraphQL\GraphQLArgs.vb" />
-    <Compile Include="EDMI\GraphQL\GraphQLConfig.vb" />
+    <Compile Include="GraphQL\GraphQLConfig.vb" />
-    <Compile Include="EDMI\GraphQL\GraphQLJob.vb" />
+    <Compile Include="GraphQL\GraphQLJob.vb" />
-    <Compile Include="EDMI\GraphQL\GraphQLQuery.vb" />
+    <Compile Include="GraphQL\GraphQLQuery.vb" />
-    <Compile Include="EDMI\ZUGFeRD\EmailData.vb" />
+    <Compile Include="ZUGFeRD\EmailData.vb" />
-    <Compile Include="EDMI\ZUGFeRD\EmailFunctions.vb" />
+    <Compile Include="ZUGFeRD\EmailFunctions.vb" />
-    <Compile Include="EDMI\ZUGFeRD\EmailStrings.vb" />
+    <Compile Include="ZUGFeRD\EmailStrings.vb" />
-    <Compile Include="EDMI\ZUGFeRD\ImportZUGFeRDFiles.vb" />
+    <Compile Include="ZUGFeRD\ImportZUGFeRDFiles.vb" />
-    <Compile Include="EDMI\ZUGFeRD\WorkerArgs.vb" />
+    <Compile Include="ZUGFeRD\WorkerArgs.vb" />
     <Compile Include="Exceptions.vb" />
     <Compile Include="JobInterface.vb" />
     <Compile Include="JobBase.vb" />
@@ -116,6 +116,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Language, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Language\bin\Debug\DigitalData.Modules.Language.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>
@@ -123,8 +127,8 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

Jobs/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Modules.Jobs")>
-<Assembly: AssemblyCopyright("Copyright © 2021")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.12.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:
 
-<Assembly: AssemblyVersion("1.8.6.0")>
+<Assembly: AssemblyVersion("1.12.1.0")>
-<Assembly: AssemblyFileVersion("1.8.6.0")>
+<Assembly: AssemblyFileVersion("1.12.1.0")>

Jobs/My Project/Settings.Designer.vb

@@ -12,11 +12,12 @@ Option Strict On
 Option Explicit On
 
 
+Namespace My
     
-<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-Partial Friend NotInheritable Class Settings
+    Partial Friend NotInheritable Class Settings
         Inherits Global.System.Configuration.ApplicationSettingsBase
         
         Private Shared defaultInstance As Settings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New Settings()),Settings)
@@ -52,7 +53,8 @@ Partial Friend NotInheritable Class Settings
                 Return defaultInstance
             End Get
         End Property
-End Class
+    End Class
+End Namespace
 
 Namespace My
     
@@ -62,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Jobs.Settings
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Jobs.My.Settings
             Get
-                Return Global.DigitalData.Modules.Jobs.Settings.Default
+                Return Global.DigitalData.Modules.Jobs.My.Settings.Default
             End Get
         End Property
     End Module

Jobs/ZUGFeRD/EmailFunctions.vb

@@ -1,5 +1,6 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Language
 Imports System.Data
 Imports System.IO
 Imports System.Data.SqlClient
@@ -83,13 +84,14 @@ Public Class EmailFunctions
             Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT.Replace(EmailStrings.constNAME_ZUGFERD_PORTAL, NamePortal), oCompleteBodyText)
 
             Dim oEmailAddress = pEmailData.From
-            Dim oAttachment = pEmailData.Attachment
+            Dim oAttachmentPath = pEmailData.Attachment
-            If oAttachment <> String.Empty Then
+            If oAttachmentPath <> String.Empty Then
-                _logger.Debug($"Attachment_String [{oAttachment}]!")
+                _logger.Debug($"Attachment_String [{oAttachmentPath}]!")
-                If IO.File.Exists(oAttachment) = False Then
+                If IO.File.Exists(oAttachmentPath) = False Then
-                    _logger.Info($"Attachment.File [{oAttachment}] is not existing!!!")
+                    _logger.Info($"Attachment.File [{oAttachmentPath}] is not existing!!!")
                 End If
             End If
+            Dim oAttachmentPathEscaped = oAttachmentPath.Replace("'", "''")
 
             If IsNothing(oEmailAddress) OrElse String.IsNullOrWhiteSpace(oEmailAddress) Then
                 _logger.Warn("Could not find email-address for MessageId {0}", MessageId)
@@ -133,7 +135,7 @@ Public Class EmailFunctions
                        ,'{oFinalBodyText}'
                        ,'{SourceProcedure}'
                        ,'{oCreatedWho}'
-                       ,'{oAttachment}')"
+                       ,'{oAttachmentPathEscaped}')"
                 _mssql.ExecuteNonQuery(oInsert)
             Else
                 'If oDTResult.Rows.Count = 0 Then
@@ -163,10 +165,19 @@ Public Class EmailFunctions
             _logger.Debug("Got Email Data for FileId {0}", MessageId)
             oRow = oDatatable.Rows.Item(oDatatable.Rows.Count - 1)
 
+            Dim oFromDefault = String.Format("No Sender found for ({0})", MessageId)
+            Dim oFrom = oRow.ItemEx("EMAIL_FROM", oFromDefault)
+
+            Dim oAttachmentDefault = String.Format("No Attachment found for ({0})", MessageId)
+            Dim oAttachment = oRow.ItemEx("EMAIL_ATTMT1", oAttachmentDefault)
+
+            Dim oSubjectDefault = String.Format("No Subject found for ({0})", MessageId)
+            Dim oSubject = oRow.ItemEx("EMAIL_SUBJECT", oSubjectDefault)
+
             Return New EmailData() With {
-                .From = oRow.Item("EMAIL_FROM"),
+                .From = oFrom,
-                .Attachment = oRow.Item("EMAIL_ATTMT1"),
+                .Attachment = oAttachment,
-                .Subject = oRow.Item("EMAIL_SUBJECT")
+                .Subject = oSubject
             }
         Catch ex As Exception
             _logger.Warn("Could not fetch Email Data for FileId {0}", MessageId)

Jobs/ZUGFeRD/EmailStrings.vb

@@ -20,9 +20,9 @@
 
     Public Const EMAIL_MD5_ERROR = "<p>Die von Ihnen gesendete Rechnung wurde bereits von unserem System verarbeitet.</p>"
 
-    Public Const EMAIL_TOO_MUCH_FERDS = "<p>Ihre Email enthielt mehr als ein ZUGFeRD-Dokument.</p>"
+    Public Const EMAIL_TOO_MUCH_FERDS = "<p>In Ihrer Email ({0}) sind mehr als ein ZUGFeRD Dokument enthalten. Bitte prüfen Sie Rechnung an Anhänge. Nur eine Rechnung darf das ZUGFeRD-Format enthalten</p>"
 
-    Public Const EMAIL_NO_FERDS = "<p>Ihre Email enthielt keine ZUGFeRD-Dokumente.</p>"
+    Public Const EMAIL_NO_FERDS = "<p>Ihre Email ({0}) enthielt keine ZUGFeRD-Dokumente.</p>"
 
     Public Const EMAIL_FILE_SIZE_REACHED = "
         <p>Die von Ihnen gesendete Rechnung oder einer der Rechnungs-Anhänge überschreitet die erlaubte Größe von <strong>{0} MB</strong>.</p>
@@ -32,9 +32,13 @@
     "
 
     Public Const EMAIL_INVALID_DOCUMENT = "
-        <p>Ihre Email enthielt ein ZUGFeRD Dokument, welches aber inkorrekt formatiert wurde.</p>
+        <p>Ihre Email ({0}) enthielt ein ZUGFeRD Dokument, welches aber inkorrekt formatiert wurde.</p>
         <p>Mögliche Gründe für ein inkorrektes Format:<ul>
             <li>Betrags-Werte weisen ungültiges Format auf (25,01 anstatt 25.01)</li>
         </ul></p>
     "
+
+    Public Const EMAIL_UNSUPPORTED_DOCUMENT = "
+        <p>Ihre Email ({0}) enthielt ein ZUGFeRD Format ({1}), welches zur Zeit noch nicht freigeschaltet ist.</p>
+    "
 End Class

Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -26,35 +26,33 @@ Public Class ImportZUGFeRDFiles
 
     Private Const DIRECTORY_DONT_MOVE = "DIRECTORY_DONT_MOVE"
 
-
     ' List of allowed extensions for PDF/A Attachments
     ' This list should not contain xml so the zugferd xml file will be filtered out
-    Private ReadOnly AllowedExtensions As List(Of String) = New List(Of String) From {"docx", "doc", "pdf", "xls", "xlsx", "ppt", "pptx", "txt"}
+    Private ReadOnly AllowedExtensions As New List(Of String) From {"docx", "doc", "pdf", "xls", "xlsx", "ppt", "pptx", "txt"}
 
     Private ReadOnly _logger As Logger
     Private ReadOnly _logConfig As LogConfig
-    Private ReadOnly _zugferd As ZUGFeRDInterface
     Private ReadOnly _firebird As Firebird
     Private ReadOnly _filesystem As Filesystem.File
-    Private ReadOnly _EmailOutAccountId As Integer
     Private ReadOnly _mssql As MSSQLServer
     Private ReadOnly _email As EmailFunctions
+    Private ReadOnly _gdpictureLicenseKey As String
 
+    Private _zugferd As ZUGFeRDInterface
+    Private _EmailOutAccountId As Integer
 
-    Public Sub New(LogConfig As LogConfig, Firebird As Firebird, pEmailOutAccount As Integer, pPortalName As String, Optional MSSQL As MSSQLServer = Nothing)
+    Public Sub New(LogConfig As LogConfig, Firebird As Firebird, Optional MSSQL As MSSQLServer = Nothing)
         _logConfig = LogConfig
         _logger = LogConfig.GetLogger()
         _firebird = Firebird
         _filesystem = New Filesystem.File(_logConfig)
         _mssql = MSSQL
-        _EmailOutAccountId = pEmailOutAccount
         _email = New EmailFunctions(LogConfig, _mssql, _firebird)
 
         _logger.Debug("Registering GDPicture License")
         If _mssql IsNot Nothing Then
             Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
-            Dim oLicenseKey As String = _mssql.GetScalarValue(oSQL)
+            _gdpictureLicenseKey = _mssql.GetScalarValue(oSQL)
-            _zugferd = New ZUGFeRDInterface(_logConfig, oLicenseKey)
         Else
             _logger.Warn("GDPicture License could not be registered! MSSQL is not enabled!")
             Throw New ArgumentNullException("MSSQL")
@@ -125,6 +123,14 @@ Public Class ImportZUGFeRDFiles
         Dim oPropertyExtractor = New PropertyValues(_logConfig)
         Dim oAttachmentExtractor = New PDFEmbeds(_logConfig)
 
+        _EmailOutAccountId = oArgs.EmailOutProfileId
+
+        Dim oOptions As New ZUGFeRDInterface.ZugferdOptions() With {
+            .AllowFacturX_Filename = oArgs.AllowFacturX,
+            .AllowXRechnung_Filename = oArgs.AllowXRechnung
+        }
+        _zugferd = New ZUGFeRDInterface(_logConfig, _gdpictureLicenseKey, oOptions)
+
         _logger.Debug("Starting Job {0}", [GetType].Name)
 
         Try
@@ -192,14 +198,17 @@ Public Class ImportZUGFeRDFiles
                         Dim oMissingProperties As New List(Of String)
                         Dim oMD5CheckSum As String = String.Empty
 
-                        _logger.NewBlock($"Message Id {oMessageId}")
                         _logger.Info("Start processing file group {0}", oMessageId)
 
                         Try
                             For Each oFile In oFileGroupFiles
                                 ' 09.12.2021: oDocument is now an Object, because have different classes corresponding to the 
                                 '   different versions of ZUGFeRD and the type is unknown at compile-time.
-                                Dim oDocument As Object
+                                ' 17.11.2022: oDocument is now a Tuple of (String, Object), to be able to return the filename
+                                '   of the extracted xml file.
+                                ' 21.12.2022: oDocument is now an object of type ZugferdResult to be able to save
+                                '   the new meta data, ie. the type of schema (zugferd version)
+                                Dim oDocument As ZUGFeRDInterface.ZugferdResult
 
                                 ' Start a global group counter for each file
                                 Dim oGlobalGroupCounter = 0
@@ -238,6 +247,10 @@ Public Class ImportZUGFeRDFiles
                                             oEmailAttachmentFiles.Add(oFile)
                                             Continue For
 
+                                        Case ZUGFeRDInterface.ErrorType.UnsupportedFormat
+                                            _logger.Info("File [{0}/{1}] is an unsupported ZUFeRD document format!", oFile.Name, ex.XmlFile)
+                                            Throw New UnsupportedFerdException(ex.XmlFile)
+
                                         Case ZUGFeRDInterface.ErrorType.NoValidZugferd
                                             _logger.Warn("File [{0}] is an Incorrectly formatted ZUGFeRD document!", oFile.Name)
                                             Throw New InvalidFerdException()
@@ -272,7 +285,8 @@ Public Class ImportZUGFeRDFiles
                                 ' Check the document against the configured property map and return:
                                 ' - a List of valid properties 
                                 ' - a List of missing properties
-                                Dim oCheckResult = _zugferd.PropertyValues.CheckPropertyValues(oDocument, oArgs.PropertyMap, oMessageId)
+                                Dim oPropertyMap = GetPropertyMapFor(oArgs, oDocument.Specification)
+                                Dim oCheckResult = _zugferd.PropertyValues.CheckPropertyValues(oDocument.SchemaObject, oPropertyMap, oMessageId)
 
                                 _logger.Info("Properties checked: [{0}] missing properties / [{1}] valid properties found.", oCheckResult.MissingProperties.Count, oCheckResult.ValidProperties.Count)
 
@@ -314,7 +328,7 @@ Public Class ImportZUGFeRDFiles
                                     End If
 
                                     Dim oCommand = $"INSERT INTO {oProperty.TableName} (REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, GROUP_COUNTER,SPEC_NAME,IS_REQUIRED) VALUES 
-                                            ('{oMessageId}', '{oProperty.Description}', '{oProperty.Value.Replace("'", "''")}', {oGroupCounterValue},'{oProperty.TableColumn}','{oProperty.ISRequired}')"
+                                            ('{oMessageId}', '{oProperty.Description}', '{oProperty.Value.Replace("'", "''")}', {oGroupCounterValue},'{oProperty.TableColumn}','{oProperty.IsRequired}')"
                                     _logger.Debug("Mapping Property [{0}]  with value [{1}], Will be inserted into table [{2}]", oProperty.TableColumn, oProperty.Value.Replace("'", "''"), oProperty.TableName)
                                     ' Insert into SQL Server
                                     If oArgs.InsertIntoSQLServer = True Then
@@ -380,6 +394,19 @@ Public Class ImportZUGFeRDFiles
                             _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException", _EmailOutAccountId, oArgs.NamePortal)
                             AddRejectedState(oMessageId, "MD5HashException", "Die gesendete Rechnung wurde bereits verarbeitet!", "", oSQLTransaction)
 
+                        Catch ex As UnsupportedFerdException
+                            _logger.Error(ex)
+
+                            ' When UnsupportedFerdException is thrown, we don't have a MD5Hash yet.
+                            ' That 's why we set it to String.Empty here.
+                            Create_HistoryEntry(oMessageId, String.Empty, "REJECTED - ZUGFeRD yes but unsupported format", oFBTransaction)
+
+                            Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
+                            Dim oBody As String = String.Format(EmailStrings.EMAIL_UNSUPPORTED_DOCUMENT, oEmailData.Subject, ex.XmlFile)
+
+                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "UnsupportedFerdException", _EmailOutAccountId, oArgs.NamePortal)
+                            AddRejectedState(oMessageId, "UnsupportedFerdException", "Nicht unterstütztes Datenformat", "", oSQLTransaction)
+
                         Catch ex As InvalidFerdException
                             _logger.Error(ex)
 
@@ -387,8 +414,9 @@ Public Class ImportZUGFeRDFiles
                             ' That 's why we set it to String.Empty here.
                             Create_HistoryEntry(oMessageId, String.Empty, "REJECTED - ZUGFeRD yes but incorrect format", oFBTransaction)
 
-                            Dim oBody = EmailStrings.EMAIL_INVALID_DOCUMENT
                             Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
+                            Dim oBody = String.Format(EmailStrings.EMAIL_INVALID_DOCUMENT, oEmailData.Subject)
+
                             _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException", _EmailOutAccountId, oArgs.NamePortal)
                             AddRejectedState(oMessageId, "InvalidFerdException", "Inkorrekte Formate", "", oSQLTransaction)
 
@@ -397,8 +425,9 @@ Public Class ImportZUGFeRDFiles
 
                             Create_HistoryEntry(oMessageId, oMD5CheckSum, "REJECTED - More than one ZUGFeRD-document in email", oFBTransaction)
 
-                            Dim oBody = EmailStrings.EMAIL_TOO_MUCH_FERDS
                             Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
+                            Dim oBody = String.Format(EmailStrings.EMAIL_TOO_MUCH_FERDS, oEmailData.Subject)
+
                             _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId, oArgs.NamePortal)
                             AddRejectedState(oMessageId, "TooMuchFerdsException", "Email enthielt mehr als ein ZUGFeRD-Dokument", "", oSQLTransaction)
 
@@ -407,8 +436,9 @@ Public Class ImportZUGFeRDFiles
 
                             Create_HistoryEntry(oMessageId, oMD5CheckSum, "REJECTED - no ZUGFeRD-Document in email", oFBTransaction)
 
-                            Dim oBody = EmailStrings.EMAIL_NO_FERDS
                             Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
+                            Dim oBody = String.Format(EmailStrings.EMAIL_NO_FERDS, oEmailData.Subject)
+
                             _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId, oArgs.NamePortal)
                             AddRejectedState(oMessageId, "NoFerdsException", " Email enthielt keine ZUGFeRD-Dokumente", "", oSQLTransaction)
 
@@ -516,8 +546,6 @@ Public Class ImportZUGFeRDFiles
                                 _logger.Warn("Could not move files!")
                                 _logger.Error(ex)
                                 Throw ex
-                            Finally
-                                _logger.EndBlock()
                             End Try
 
                             Try
@@ -555,6 +583,26 @@ Public Class ImportZUGFeRDFiles
         End Try
     End Sub
 
+    Private Function GetPropertyMapFor(pWorkerArgs As WorkerArgs, pSpecification As String) As Dictionary(Of String, XmlItemProperty)
+        Dim oPropertyMap = DoGetPropertyMapFor(pWorkerArgs, pSpecification)
+
+        _logger.Debug("Found [{0}] Properties for Specification [{1}].", oPropertyMap.Count, pSpecification)
+
+        ' If no properties were found, fall back to the default specification before giving up
+        If oPropertyMap.Count = 0 Then
+            _logger.Warn("No Properties found for Specification [{0}]. Loading default property map!", pSpecification)
+            Return DoGetPropertyMapFor(pWorkerArgs, ZUGFeRDInterface.ZUGFERD_SPEC_DEFAULT)
+        End If
+
+        Return oPropertyMap
+    End Function
+
+    Private Function DoGetPropertyMapFor(pWorkerArgs As WorkerArgs, pSpecification As String) As Dictionary(Of String, XmlItemProperty)
+        Return pWorkerArgs.PropertyMap.
+            Where(Function(kv) kv.Value.Specification = pSpecification).
+            ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
+    End Function
+
     Private Sub MoveFiles(
                          Args As WorkerArgs,
                          MessageId As String,

Jobs/ZUGFeRD/WorkerArgs.vb

@@ -14,10 +14,18 @@ Public Class WorkerArgs
     ' Property Parameter
     Public PropertyMap As New Dictionary(Of String, XmlItemProperty)
 
+    ' Email Parameter
+    Public EmailOutProfileId As Integer = 0
+
     ' Misc Flag Parameters
     Public InsertIntoSQLServer As Boolean = False
     Public ExceptionEmailAddress As String = Nothing
     Public IgnoreRejectionStatus As Boolean = False
     Public MaxAttachmentSizeInMegaBytes As Integer = -1
     Public NamePortal As String = "NO PORTAL_NAME IN CONFIG"
+
+    Public AllowFacturX As Boolean = True
+    Public AllowXRechnung As Boolean = True
+    Public AllowZugferd10 As Boolean = True
+    Public AllowZugferd2x As Boolean = True
 End Class

Jobs/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>

Language/Language.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.Language</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,8 +45,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -83,6 +84,7 @@
     <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>

Language/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Language")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.7.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.6.0.0")>
+<Assembly: AssemblyVersion("1.7.0.0")>
-<Assembly: AssemblyFileVersion("1.6.0.0")>
+<Assembly: AssemblyFileVersion("1.7.0.0")>

Language/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

Language/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", "15.7.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

Language/StringEx.vb

@@ -12,4 +12,14 @@ Public Module StringEx
         If String.IsNullOrEmpty(pString) Then Return pString
         Return pString.Substring(0, Math.Min(pLength, pString.Length))
     End Function
+
+    ''' <summary>
+    ''' Replaces single quotes in text for SQL Commands.
+    ''' </summary>
+    ''' <param name="pString">The string</param>
+    ''' <returns>The escaped string.</returns>
+    <Extension()>
+    Public Function EscapeForSQL(pString As String) As String
+        Return Utils.NotNull(pString, String.Empty).Replace("'", "''")
+    End Function
 End Module

Language/packages.config

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

License/License.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.License</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,8 +45,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -84,6 +85,7 @@
     <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>

License/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Modules.License")>
-<Assembly: AssemblyCopyright("Copyright ©  2019")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.1.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.1.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.1.0.0")>

License/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

License/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", "15.7.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

License/packages.config

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

Logging.Test/Logging.Test.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Modules.Logging.Test</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -19,6 +19,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -82,6 +83,7 @@
     <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>

Logging.Test/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

Logging.Test/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", "15.7.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

Logging/LogConfig.vb

@@ -75,12 +75,14 @@ Public Class LogConfig
     Private Const FILE_NAME_FORMAT_DEBUG As String = "${shortdate}-${var:product}${var:suffix}${event-properties:item=ModuleName}-Debug.log"
     Private Const FILE_NAME_FORMAT_TRACE As String = "${shortdate}-${var:product}${var:suffix}${event-properties:item=ModuleName}-Trace.log"
     Private Const FILE_NAME_FORMAT_ERROR As String = "${shortdate}-${var:product}${var:suffix}${event-properties:item=ModuleName}-Error.log"
+    Private Const FILE_NAME_FORMAT_JSON As String = "${shortdate}-${var:product}${var:suffix}${event-properties:item=ModuleName}.log.json"
 
     Private Const TARGET_DEFAULT As String = "defaultTarget"
     Private Const TARGET_ERROR_EX As String = "errorExceptionTarget"
     Private Const TARGET_ERROR As String = "errorTarget"
     Private Const TARGET_DEBUG As String = "debugTarget"
     Private Const TARGET_TRACE As String = "traceTarget"
+    Private Const TARGET_JSON As String = "jsonTarget"
     'Private Const TARGET_MEMORY As String = "memoryTarget"
 
     Private Const LOG_FORMAT_BASE As String = "${time}|${logger:shortName=True}|${level:uppercase=true}"
@@ -101,8 +103,9 @@ Public Class LogConfig
     Private ReadOnly _basePath As String = _failSafePath
 
     Private _config As LoggingConfiguration
-    Private _isDebug As Boolean = False
+    Private _EnableDebugLogging As Boolean = False
-    Private _isTrace As Boolean = False
+    Private _EnableTraceLogging As Boolean = False
+    Private _EnableJsonLogging As Boolean = False
 
 #End Region
 #Region "Public Properties"
@@ -137,21 +140,31 @@ Public Class LogConfig
     ''' <returns>True, if debug log will be written. False otherwise.</returns>
     Public Property Debug As Boolean
         Get
-            Return _isDebug
+            Return _EnableDebugLogging
         End Get
-        Set(isDebug As Boolean)
+        Set(value As Boolean)
-            _isDebug = isDebug
+            _EnableDebugLogging = value
-            ReloadConfig(isDebug, _isTrace)
+            ReloadConfig()
         End Set
     End Property
 
     Public Property Trace As Boolean
         Get
-            Return _isTrace
+            Return _EnableTraceLogging
         End Get
-        Set(isTrace As Boolean)
+        Set(value As Boolean)
-            _isTrace = isTrace
+            _EnableTraceLogging = value
-            ReloadConfig(_isDebug, isTrace)
+            ReloadConfig()
+        End Set
+    End Property
+
+    Public Property EnableJsonLog As Boolean
+        Get
+            Return _EnableJsonLogging
+        End Get
+        Set(value As Boolean)
+            _EnableJsonLogging = value
+            ReloadConfig()
         End Set
     End Property
 
@@ -443,6 +456,7 @@ Public Class LogConfig
         _config.AddTarget(TARGET_DEFAULT, GetDefaultLogTarget(_basePath))
         _config.AddTarget(TARGET_DEBUG, GetDebugLogTarget(_basePath))
         _config.AddTarget(TARGET_TRACE, GetTraceLogTarget(_basePath))
+        _config.AddTarget(TARGET_JSON, GetJsonLogTarget(_basePath))
         '_config.AddTarget(TARGET_MEMORY, GetMemoryDebugTarget())
 
         ' Add default rules
@@ -478,21 +492,31 @@ Public Class LogConfig
     ''' <summary>
     ''' Reconfigures and re-adds all loggers, optionally adding the debug rule.
     ''' </summary>
-    ''' <param name="Debug">Adds the Debug rule if true.</param>
+    Private Sub ReloadConfig()
-    ''' <param name="Trace">Adds the Trace rule if true.</param>
+        Dim oLogger = GetLogger()
-    Private Sub ReloadConfig(Optional Debug As Boolean = False, Optional Trace As Boolean = False)
+
         ' Clear Logging Rules
         _config.LoggingRules.Clear()
 
         ' Add default rules
         AddDefaultRules(_config)
 
-        ' Add debug rule, if configured
+        ' Add json rule, if configured
-        If Debug = True Then
+        If _EnableJsonLogging = True Then
-            _config.AddRule(LogLevel.Debug, LogLevel.Error, TARGET_DEBUG)
+            oLogger.Info("JSON Logging is now Enabled.")
+            _config.AddRule(LogLevel.Debug, LogLevel.Error, TARGET_JSON)
         End If
 
-        If Trace = True Then
+        ' Add debug rule, if configured
+        If _EnableDebugLogging = True Then
+            _config.AddRule(LogLevel.Debug, LogLevel.Error, TARGET_DEBUG)
+            oLogger.Info("DEBUG Logging is now Enabled.")
+        Else
+            oLogger.Debug("DEBUG Logging is now Disabled.")
+        End If
+
+        ' Add trace rule, if configured
+        If _EnableTraceLogging = True Then
             _config.AddRule(LogLevel.Trace, LogLevel.Error, TARGET_TRACE)
         End If
 
@@ -501,6 +525,29 @@ Public Class LogConfig
     End Sub
 
 #Region "Log Targets"
+    Private Function GetJsonLogTarget(basePath As String) As FileTarget
+        Dim oJsonLayout = New Layouts.JsonLayout
+        oJsonLayout.Attributes.Add(New Layouts.JsonAttribute("level", "${level}"))
+        oJsonLayout.Attributes.Add(New Layouts.JsonAttribute("message", "${message}"))
+        oJsonLayout.Attributes.Add(New Layouts.JsonAttribute("date", "${shortdate}"))
+        oJsonLayout.Attributes.Add(New Layouts.JsonAttribute("product", "${var:product}"))
+        oJsonLayout.Attributes.Add(New Layouts.JsonAttribute("suffix", "${var:suffix}"))
+        oJsonLayout.Attributes.Add(New Layouts.JsonAttribute("module", "${event-properties:item=ModuleName}"))
+        oJsonLayout.Attributes.Add(New Layouts.JsonAttribute("exception", "${exception:format=Message,StackTrace:innerFormat=Message:maxInnerExceptionLevel=3}"))
+
+        Dim jsonLog As New FileTarget() With {
+            .FileName = Path.Combine(basePath, FILE_NAME_FORMAT_JSON),
+            .Name = TARGET_JSON,
+            .Layout = oJsonLayout,
+            .MaxArchiveFiles = MAX_ARCHIVE_FILES_DEFAULT,
+            .ArchiveEvery = ARCHIVE_EVERY,
+            .KeepFileOpen = KEEP_FILES_OPEN,
+            .Encoding = Text.Encoding.Unicode
+        }
+
+        Return jsonLog
+    End Function
+
     Private Function GetDefaultLogTarget(basePath As String) As FileTarget
         Dim defaultLog As New FileTarget() With {
             .FileName = Path.Combine(basePath, FILE_NAME_FORMAT_DEFAULT),
@@ -560,9 +607,9 @@ Public Class LogConfig
     End Function
 
     Private Function GetTraceLogTarget(basePath As String) As FileTarget
-        Dim debugLog As New FileTarget() With {
+        Dim traceLog As New FileTarget() With {
             .FileName = Path.Combine(basePath, FILE_NAME_FORMAT_TRACE),
-            .Name = TARGET_DEBUG,
+            .Name = TARGET_TRACE,
             .Layout = LOG_FORMAT_DEBUG,
             .MaxArchiveFiles = MAX_ARCHIVE_FILES_DEBUG_DETAIL,
             .ArchiveEvery = ARCHIVE_EVERY,
@@ -573,18 +620,7 @@ Public Class LogConfig
             .Encoding = Text.Encoding.Unicode
         }
 
-        Return debugLog
+        Return traceLog
     End Function
-
-    'Private Function GetMemoryDebugTarget() As MemoryTarget
-    '    Dim memoryLog As New MemoryTarget() With {
-    '        .Layout = LOG_FORMAT_DEBUG,
-    '        .Name = TARGET_MEMORY,
-    '        .OptimizeBufferReuse = True,
-    '        .MaxLogsCount = MAX_MEMORY_LOG_COUNT
-    '    }
-
-    '    Return memoryLog
-    'End Function
 #End Region
 End Class

Logging/Logger.vb

@@ -2,26 +2,4 @@
 
 Public Class Logger
     Inherits NLog.Logger
-
-    <DebuggerStepThrough()>
-    Public Sub NewBlock(blockId As String)
-        Dim message As String = $"-----> Start of Block {blockId}"
-        Dim logEventInfo As New LogEventInfo(LogLevel.Info, Name, message)
-        Dim logEventDebug As New LogEventInfo(LogLevel.Debug, Name, message)
-        Dim WrapperType As Type = GetType(Logger)
-
-        Log(WrapperType, logEventDebug)
-        Log(WrapperType, logEventInfo)
-    End Sub
-
-    <DebuggerStepThrough()>
-    Public Sub EndBlock()
-        Dim message As String = $"<----- End of Block"
-        Dim logEventInfo As New LogEventInfo(LogLevel.Info, Name, message)
-        Dim logEventDebug As New LogEventInfo(LogLevel.Debug, Name, message)
-        Dim WrapperType As Type = GetType(Logger)
-
-        Log(WrapperType, logEventDebug)
-        Log(WrapperType, logEventInfo)
-    End Sub
 End Class

Logging/Logging.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.Logging</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,8 +45,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -79,6 +80,7 @@
     <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>

Logging/My Project/AssemblyInfo.vb

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

Logging/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

Logging/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", "15.7.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

Logging/packages.config

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

Messaging/Limilab.vb

@@ -113,17 +113,21 @@ Public Class Limilab
         End Try
     End Function
     Public Function IMAPGetMessageIDs_AllMails() As List(Of Long)
-        Dim oListuids As New List(Of Long)
         Logger.Debug("Starting IMAPGetMessageIDs ...")
         If Initialized = False Then
             Return Nothing
         End If
         Try
-            Dim oConnect As Boolean = ImapConnect()
+            Dim oConnectionSuccessful As Boolean = ImapConnect()
+            Dim oListuids As List(Of Long)
 
-            If oConnect = True Then
+            If oConnectionSuccessful = True Then
+                Logger.Debug("Checking for new messages..")
                 oListuids = ImapGetMessageIDs_All()
                 CURR_ListUIDs = oListuids
+            Else
+                Logger.Warn("Connection was NOT successful. Returning Nothing.")
+                Return Nothing
             End If
             Return oListuids
         Catch ex As Exception
@@ -223,10 +227,13 @@ Public Class Limilab
     Private Function ImapGetMessageIDs_All() As List(Of Long)
         Dim oListuids As New List(Of Long)
         Try
+            Logger.Debug("Opening Inbox..")
             CurrentImapObject.SelectInbox()
 
+            Logger.Debug("Searching messages..")
             oListuids = CurrentImapObject.Search(Flag.All)
 
+            Logger.Debug("[{0}] messages found.", oListuids.Count)
             Return oListuids
         Catch ex As Exception
             Logger.Error(ex)
@@ -261,9 +268,9 @@ Public Class Limilab
                 oMailBuilder.From.Add(New MailBox(mailfrom))
                 oMailBuilder.[To].Add(New MailBox(oMailReceipiant))
                 oMailBuilder.Subject = mailSubject
-                If ADDED_DATETIME <> "" Then
+                'If ADDED_DATETIME <> "" Then
-                    mailBody &= "<p>Creation-time: " & ADDED_DATETIME
+                '    mailBody &= "<p>Creation-time: " & ADDED_DATETIME
-                End If
+                'End If
                 If Test = True Then
                     oMailBuilder.Html = $"This is a Testmail! <p> The body-text will be replaced within profile! <p> mailsmtp: {mailsmtp} <br> mailport: {mailport}
                                         <br> mailUser: {mailUser} <br> mailPW: XXXX <br> AUTH_TYPE: {AUTH_TYPE}"
@@ -322,7 +329,10 @@ Public Class Limilab
                         oSmtp.Connect(mailsmtp)
                     End If
                     Logger.Debug($"mailUser [{mailUser}]")
+                    If mailUser <> String.Empty Then
                         oSmtp.UseBestLogin(mailUser, mailPW)   ' remove if not needed
+                    End If
+
 
                     oSmtp.SendMessage(email)
                     Logger.Info("Message to " & oMailReceipiant & " has been send.")

Messaging/Messaging.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.Messaging</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,8 +49,8 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -84,6 +85,7 @@
     <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>
@@ -96,6 +98,10 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="MailSender.vb" />
+    <Compile Include="WCF\Binding.vb" />
+    <Compile Include="WCF\Channel.vb" />
+    <Compile Include="WCF\Constants.vb" />
+    <Compile Include="WCF\ServerAddress.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">

Messaging/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("Messaging")>
 <Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("1.9.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.7.4.0")>
+<Assembly: AssemblyVersion("1.9.0.0")>
-<Assembly: AssemblyFileVersion("1.7.4.0")>
+<Assembly: AssemblyFileVersion("1.9.0.0")>

Messaging/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <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()>  _

Messaging/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", "15.7.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

Messaging/WCF/Binding.vb

@@ -0,0 +1,31 @@
+Imports System.Net
+Imports System.ServiceModel
+Imports System.Xml
+
+Namespace WCF
+    Public Class Binding
+        Public Shared Function GetBinding(Optional AuthenticationMode As TcpClientCredentialType = TcpClientCredentialType.Windows) As NetTcpBinding
+            Return New NetTcpBinding() With {
+            .MaxReceivedMessageSize = Constants.ChannelSettings.MAX_RECEIVED_MESSAGE_SIZE,
+            .MaxBufferSize = Constants.ChannelSettings.MAX_BUFFER_SIZE,
+            .MaxBufferPoolSize = Constants.ChannelSettings.MAX_BUFFER_POOL_SIZE,
+            .TransferMode = TransferMode.Streamed,
+            .Security = New NetTcpSecurity() With {
+                .Mode = SecurityMode.Transport,
+                .Transport = New TcpTransportSecurity() With {
+                    .ClientCredentialType = AuthenticationMode
+                }
+            },
+            .ReaderQuotas = New XmlDictionaryReaderQuotas() With {
+                .MaxArrayLength = Constants.ChannelSettings.MAX_ARRAY_LENGTH,
+                .MaxStringContentLength = Constants.ChannelSettings.MAX_STRING_CONTENT_LENGTH
+            }
+        }
+        End Function
+
+        Public Shared Function GetAddress(pHost As String, pPort As Integer, pName As String) As Uri
+            Return New Uri($"net.tcp://{pHost}:{pPort}/DigitalData/Services/{pName}")
+        End Function
+    End Class
+
+End Namespace

Messaging/WCF/Channel.vb

@@ -0,0 +1,52 @@
+Imports System.ServiceModel
+Imports System.Xml
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+
+Namespace WCF
+    Public Class Channel(Of TChannel As IClientChannel)
+        Inherits BaseClass
+
+        Private ReadOnly ChannelFactory As ChannelFactory(Of TChannel)
+
+        Public Event Reconnect As EventHandler
+
+        Public Sub New(pLogConfig As LogConfig, pServerAddress As ServerAddress, Optional pName As String = "Main")
+            MyBase.New(pLogConfig)
+            ChannelFactory = GetChannelFactory(pServerAddress, pName)
+        End Sub
+
+        ''' <summary>
+        ''' Creates a channel and adds a Faulted-Handler
+        ''' </summary>
+        ''' <returns>A channel object</returns>
+        Public Function GetChannel() As TChannel
+            Try
+                Logger.Debug("Creating channel.")
+                Dim oChannel = ChannelFactory.CreateChannel()
+
+                AddHandler oChannel.Faulted, Sub() RaiseEvent Reconnect(Me, Nothing)
+
+                Return oChannel
+            Catch ex As Exception
+                Logger.Error(ex)
+                Throw ex
+            End Try
+        End Function
+
+        ''' <summary>
+        ''' Creates and returns a channel factory with the supplied name and address
+        ''' </summary>
+        ''' <param name="pName">The service name, will be: net.tcp://ip:port/DigitalData/Services/[name]</param>
+        ''' <param name="pAddress">The service address, in the form of ip address and port</param>
+        ''' <returns></returns>
+        Private Function GetChannelFactory(pAddress As ServerAddress, pName As String) As ChannelFactory(Of TChannel)
+            Dim oBinding = Binding.GetBinding()
+            Dim oAddress = New EndpointAddress(Binding.GetAddress(pAddress.Host, pAddress.Port, pName))
+            Dim oFactory = New ChannelFactory(Of TChannel)(oBinding, oAddress)
+            Return oFactory
+        End Function
+
+
+    End Class
+End Namespace

Messaging/WCF/Constants.vb

@@ -0,0 +1,20 @@
+Namespace WCF
+    Public Class Constants
+        Public Const DEFAULT_SERVICE_PORT = 9000
+
+        ''' <summary>
+        '''  Infos about MaxBufferSize and MaxBufferPoolSize
+        '''  https://social.msdn.microsoft.com/Forums/vstudio/en-US/d6e234d3-942f-4e9d-8470-32618d3f3212/maxbufferpoolsize-vs-maxbuffersize?forum=wcf
+        ''' </summary>
+        Public Class ChannelSettings
+            Public Const MAX_RECEIVED_MESSAGE_SIZE = 2147483647 ' 1GB
+            Public Const MAX_BUFFER_SIZE = 104857600 ' 100MB
+            Public Const MAX_BUFFER_POOL_SIZE = 1048576 ' 1MB
+
+            Public Const MAX_CONNECTIONS = 500
+            Public Const MAX_ARRAY_LENGTH = 2147483647
+            Public Const MAX_STRING_CONTENT_LENGTH = 2147483647
+        End Class
+    End Class
+
+End Namespace

Messaging/WCF/ServerAddress.vb

@@ -0,0 +1,7 @@
+Namespace WCF
+    Public Structure ServerAddress
+        Public Host As String
+        Public Port As Integer
+    End Structure
+
+End Namespace