Überarbeitung nach Rückmeldung Marvin (windreamIndexe SQL Editor, Dynmisch verkleinern des pnlValidators, Regexprüfung editvalue, Bedienung Tastaturbefehle, ...)

Abhängigkeiten aktualisieren, build
Windream logging bei createWMobject, file or fodler exists
2025-08-18 11:51:57 +02:00 · 2025-08-13 12:43:38 +02:00 · 2025-07-02 09:14:13 +02:00 · 2025-06-26 17:14:08 +02:00 · 2025-06-25 15:01:15 +02:00 · 2025-06-24 14:51:40 +02:00
128 changed files with 7780 additions and 5810 deletions
--- a/.github/upgrades/dotnet-upgrade-plan.md
+++ b/.github/upgrades/dotnet-upgrade-plan.md
@@ -1,183 +0,0 @@
-# .NET 8.0 Upgrade Plan
-
-## Execution Steps
-
-Execute steps below sequentially one by one in the order they are listed.
-
-1. Validate that an .NET 8.0 SDK required for this upgrade is installed on the machine and if not, help to get it installed.
-2. Ensure that the SDK version specified in global.json files is compatible with the .NET 8.0 upgrade.
-3. Upgrade Logging\Logging.vbproj.
-4. Upgrade Encryption\Encryption.vbproj.
-5. Upgrade Base\Base.vbproj.
-6. Upgrade ZooFlow\ZooFlow.vbproj.
-7. Upgrade Interfaces\Interfaces.vbproj.
-8. Upgrade Database\Database.vbproj.
-9. Upgrade Config\Config.vbproj.
-10. Upgrade Filesystem\Filesystem.vbproj.
-11. Upgrade Messaging\Messaging.vbproj.
-12. Upgrade Windream\Windream.vbproj.
-13. Upgrade Windows\Windows.vbproj.
-14. Upgrade Patterns\Patterns.vbproj.
-15. Upgrade License\License.vbproj.
-16. Upgrade Jobs\Jobs.vbproj.
-17. Upgrade EDMIAPI\EDMI.API.vbproj.
-
-## Settings
-
-This section contains settings and data used by execution steps.
-
-### Excluded projects
-
-Keine Projekte ausgeschlossen.
-
-### Aggregate NuGet packages modifications across all projects
-
-NuGet packages used across all selected projects or their dependencies that need version update in projects that reference them.
-
-| Package Name                               | Current Version | New Version | Description                                                                 |
-|:-------------------------------------------|:---------------:|:-----------:|:----------------------------------------------------------------------------|
-| DigitalData.Modules.Logging                | 2.6.5           |             | No supported .NET 8 compatible package available; evaluate replacement.     |
-| EntityFramework                            | 6.4.4           | 6.5.1       | Required newer EF 6.5.1 for .NET 8 compatibility and LTS support.           |
-| EntityFramework.Firebird                   | 6.4.0           | 10.1.0      | Update to Firebird 10.1.0 for .NET 8 compatibility.                         |
-| GdPicture                                  | 14.3.18         | 14.2.100    | Use 14.2.100 as recommended compatible build.                               |
-| Microsoft.Identity.Client                  | 4.55.0          | 4.79.2      | Security vulnerability fix and current MSAL LTS recommendation.             |
-| Microsoft.IdentityModel.Abstractions       | 6.22.0          | 8.15.0      | Move to latest IdentityModel LTS version.                                   |
-| Microsoft.VisualBasic                      | 10.3.0          |             | Functionality provided by .NET 8 framework reference; remove package.       |
-| Newtonsoft.Json                            | 13.0.3          | 13.0.4      | Bring Newtonsoft.Json to supported patch level.                             |
-| S22.Imap                                   | 3.6.0.0         |             | No supported .NET 8 compatible package available; evaluate alternative.     |
-| System.Buffers                             | 4.6.0           |             | Functionality provided by .NET 8 framework reference; remove package.       |
-| System.Data.Odbc                           | 6.0.1           | 8.0.1       | Update to provider version aligned with .NET 8.                             |
-| System.Memory                              | 4.6.0           |             | Functionality provided by .NET 8 framework reference; remove package.       |
-| System.Numerics.Vectors                    | 4.6.0           |             | Functionality provided by .NET 8 framework reference; remove package.       |
-| System.Runtime.CompilerServices.Unsafe     | 6.1.0           | 6.1.2       | Align with latest patch to match .NET 8 dependencies.                       |
-| System.Threading.Tasks.Extensions          | 4.5.4           |             | Functionality provided by .NET 8 framework reference; remove package.       |
-| System.ValueTuple                          | 4.5.0           |             | Functionality provided by .NET 8 framework reference; remove package.       |
-
-### Project upgrade details
-
-#### Logging/Logging.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-#### Encryption/Encryption.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-#### Base/Base.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0-windows`.
-  - Convert the project file to SDK-style format.
-
-#### ZooFlow/ZooFlow.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0-windows`.
-  - Convert the project file to SDK-style format.
-
-#### Interfaces/Interfaces.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - Update `GdPicture` from `14.3.18` to `14.2.100` (compatibility recommendation).
-  - Update `Newtonsoft.Json` from `13.0.3` to `13.0.4`.
-  - Update `System.Runtime.CompilerServices.Unsafe` from `6.1.0` to `6.1.2`.
-  - Remove `Microsoft.VisualBasic`, `System.Buffers`, `System.Memory`, `System.Numerics.Vectors`, `System.Threading.Tasks.Extensions`, and `System.ValueTuple` because their APIs are provided by the .NET 8 framework.
-
-#### Database/Database.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - Update `EntityFramework.Firebird` from `6.4.0` to `10.1.0`.
-  - Update `EntityFramework` from `6.4.4` to `6.5.1`.
-  - Update `System.Data.Odbc` from `6.0.1` to `8.0.1`.
-
-#### Config/Config.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0-windows`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - Update `EntityFramework.Firebird` from `6.4.0` to `10.1.0`.
-  - Update `EntityFramework` from `6.4.4` to `6.5.1`.
-  - Update `System.Data.Odbc` from `6.0.1` to `8.0.1`.
-
-#### Filesystem/Filesystem.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-#### Messaging/Messaging.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0-windows`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - `DigitalData.Modules.Logging` 2.6.5 has no supported .NET 8 version; evaluate migrating to an updated logging package.
-  - `S22.Imap` 3.6.0.0 has no supported .NET 8 version; evaluate replacement.
-  - Update `Microsoft.Identity.Client` from `4.55.0` to `4.79.2` (security fix).
-  - Update `Microsoft.IdentityModel.Abstractions` from `6.22.0` to `8.15.0`.
-
-#### Windream/Windream.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - `DigitalData.Modules.Logging` 2.6.5 has no supported .NET 8 version; evaluate migrating to an updated logging package.
-
-#### Windows/Windows.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0-windows`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - `DigitalData.Modules.Logging` 2.6.5 has no supported .NET 8 version; evaluate migrating to an updated logging package.
-
-#### Patterns/Patterns.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0-windows`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - `DigitalData.Modules.Logging` 2.6.5 has no supported .NET 8 version; evaluate migrating to an updated logging package.
-
-#### License/License.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-#### Jobs/Jobs.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
-
-NuGet packages changes:
-  - Update `GdPicture` from `14.3.18` to `14.2.100`.
-  - Update `Newtonsoft.Json` from `13.0.3` to `13.0.4`.
-  - Update `System.Runtime.CompilerServices.Unsafe` from `6.1.0` to `6.1.2`.
-  - Remove `Microsoft.VisualBasic`, `System.Buffers`, `System.Memory`, `System.Numerics.Vectors`, `System.Threading.Tasks.Extensions`, and `System.ValueTuple` because their APIs are provided by the .NET 8 framework.
-
-#### EDMIAPI/EDMI.API.vbproj modifications
-
-Project properties changes:
-  - Target framework should be changed from `.NETFramework,Version=v4.6.2` to `net8.0`.
-  - Convert the project file to SDK-style format.
--- a/Base/Base.vbproj
+++ b/Base/Base.vbproj
@@ -1,73 +1,151 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Base</RootNamespace>
    <AssemblyName>DigitalData.Modules.Base</AssemblyName>
+    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.Base</AssemblyTitle>
-    <Description>basisfunktionalitäten für DigitalData Anwendungen</Description>
-    <Company>Digital Data GmbH</Company>
-    <Product>Modules.</Product>
-    <Copyright>Copyright © 2025</Copyright>
-    <AssemblyVersion>1.3.9.0</AssemblyVersion>
-    <FileVersion>1.3.9.0</FileVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Base.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Base.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="NuGet.CommandLine" Version="6.13.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SystemWebAdapters" Version="2.2.1" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
    <Import Include="System.Data" />
-    <Import Include="DigitalData.Modules.Logging" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Update="My Project\Application.Designer.vb">
+    <Compile Include="Base\BaseClass.vb" />
+    <Compile Include="Base\BaseUtils.vb" />
+    <Compile Include="ECM\ECM.vb" />
+    <Compile Include="Encryption\Compression.vb" />
+    <Compile Include="Encryption\Encryption.vb" />
+    <Compile Include="Encryption\EncryptionLegacy.vb" />
+    <Compile Include="DatabaseEx.vb" />
+    <Compile Include="FilesystemEx.vb" />
+    <Compile Include="FileWatcher\FileWatcher.vb" />
+    <Compile Include="FileWatcher\FileWatcherFilters.vb" />
+    <Compile Include="FileWatcher\FileWatcherProperties.vb" />
+    <Compile Include="IDB\Constants.vb" />
+    <Compile Include="MimeEx.vb" />
+    <Compile Include="StringFunctions.vb" />
+    <Compile Include="WindowsEx.vb" />
+    <Compile Include="ModuleExtensions.vb" />
+    <Compile Include="FileEx.vb" />
+    <Compile Include="NativeMethods.vb" />
+    <Compile Include="ObjectEx.vb" />
+    <Compile Include="GraphicsEx.vb" />
+    <Compile Include="LanguageEx.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
-    <Compile Update="My Project\Resources.Designer.vb">
+    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Update="My Project\Settings.Designer.vb">
+    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
+    <Compile Include="ScreenEx.vb" />
+    <Compile Include="StringEx.vb" />
  </ItemGroup>
  <ItemGroup>
-    <None Update="My Project\Application.myapp">
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="README.txt" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
-  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Base")>
+<Assembly: AssemblyDescription("basisfunktionalitäten für DigitalData Anwendungen")>
+<Assembly: AssemblyCompany("Digital Data GmbH")>
+<Assembly: AssemblyProduct("Modules.")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("1.3.9.0")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("f097830c-82fe-4cd0-8df6-e458522c1ddd")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' indem Sie "*" wie unten gezeigt eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.3.9.0")>
+<Assembly: AssemblyFileVersion("1.3.9.0")>
--- a/Base/WindowsEx.vb
+++ b/Base/WindowsEx.vb
@@ -1,5 +1,6 @@
 Imports System.ComponentModel
 Imports System.Runtime.InteropServices
+Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Base.NativeMethods

 Public Class WindowsEx
--- a/Base/packages.config
+++ b/Base/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
+</packages>
--- a/Config/Config.vbproj
+++ b/Config/Config.vbproj
@@ -1,58 +1,163 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{44982F9B-6116-44E2-85D0-F39650B1EF99}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Config</RootNamespace>
    <AssemblyName>DigitalData.Modules.Config</AssemblyName>
-    <MyType>Empty</MyType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.Config</AssemblyTitle>
-    <Description>Stellt Module für die Konfiguration von Produkten bereit</Description>
-    <Company>Digital Data GmbH, Heuchelheim</Company>
-    <Product>Modules.Config</Product>
-    <Copyright>Copyright © 2025</Copyright>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Config.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Config.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.5.1" />
-    <PackageReference Include="EntityFramework.Firebird" Version="10.1.0" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="System.Data.Odbc" Version="8.0.1" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Import Include="DigitalData.Modules.Logging" />
-    <Import Include="DigitalData.Modules.Base" />
-    <Import Include="DigitalData.Modules.Database" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Remove="My Project\Settings.Designer.vb" />
-    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <None Remove="My Project\Application.myapp" />
-    <None Remove="My Project\Settings.settings" />
+    <Compile Include="ConfigAttributes.vb" />
+    <Compile Include="ConfigDbFunct.vb" />
+    <Compile Include="ConfigManager.vb" />
+    <Compile Include="ConfigSample.vb" />
+    <Compile Include="ConfigUtils.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
-    <ProjectReference Include="..\Base\Base.vbproj" />
-    <ProjectReference Include="..\Database\Database.vbproj" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
 </Project>
--- a/Config/ConfigDbFunct.vb
+++ b/Config/ConfigDbFunct.vb
@@ -1,4 +1,4 @@
-Imports NLog
+Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database


@@ -12,7 +12,7 @@ Public Class ConfigDbFunct
    ''' <param name="pLogConfig">An instance of LogConfig</param>
    ''' <param name="pConnectionString">Initial connectionstring for connecting to DD_ECM database.</param>
    ''' <returns>LicenseKey, if found, otherwise String.Empty</returns>
-    Public Shared Function GetProductLicense(pProductName As String, pVersion As String, pLogConfig As Object, pConnectionString As String) As String
+    Public Shared Function GetProductLicense(pProductName As String, pVersion As String, pLogConfig As LogConfig, pConnectionString As String) As String

        Dim oLogger As Logger = pLogConfig.GetLogger()

@@ -36,8 +36,6 @@ Public Class ConfigDbFunct
            Dim oDatabase As MSSQLServer = New MSSQLServer(pLogConfig, oDecryptedConnectionString)

            Dim oSql As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = '" + pProductName + "' AND ACTIVE = 1 AND VERSION = '" + pVersion + "'"
-            oLogger.Debug(String.Format("oSql in GetProductLicense: {0}", oSql))
-            Return String.Empty
            Dim oLicenseString As String = oDatabase.GetScalarValue(oSql)

            Return oLicenseString
--- a/Config/ConfigManager.vb
+++ b/Config/ConfigManager.vb
@@ -1,13 +1,9 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Xml.Serialization
-Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Config.ConfigAttributes
 Imports DigitalData.Modules.Base
-Imports ConnectionStringAttribute = DigitalData.Modules.Config.ConfigAttributes.ConnectionStringAttribute
-Imports ConnectionStringAppServerAttribute = DigitalData.Modules.Config.ConfigAttributes.ConnectionStringAppServerAttribute
-Imports ConnectionStringTestAttribute = DigitalData.Modules.Config.ConfigAttributes.ConnectionStringTestAttribute
-Imports EDMIAppServerAttribute = DigitalData.Modules.Config.ConfigAttributes.EDMIAppServerAttribute
-Imports GlobalSettingAttribute = DigitalData.Modules.Config.ConfigAttributes.GlobalSettingAttribute

 Public Class ConfigManager(Of T)
    Public Const USER_CONFIG_NAME As String = "UserConfig.xml"
@@ -30,7 +26,6 @@ Public Class ConfigManager(Of T)
    Private ReadOnly _Blueprint As T
    Private ReadOnly _BlueprintType As Type
    Private ReadOnly _Serializer As XmlSerializer
-    Private _Config As T

    Private ReadOnly _ExcludedAttributes = New List(Of Type) From {
        GetType(ConnectionStringAttribute),
@@ -66,10 +61,6 @@ Public Class ConfigManager(Of T)
    ''' </summary>
    ''' <returns></returns>
    Public ReadOnly Property Config As T
-        Get
-            Return _Config
-        End Get
-    End Property

    ''' <summary>
    ''' Path to the current user config.
@@ -111,21 +102,18 @@ Public Class ConfigManager(Of T)
    ''' <param name="ApplicationStartupPath">The path to check for a third config file. This is useful when running the Application in an environment where AppData/ProgramData directories are not available</param>
    ''' <param name="ForceUserConfig">Override values from ComputerConfig with UserConfig</param>
    Public Sub New(LogConfig As LogConfig, UserConfigPath As String, ComputerConfigPath As String, Optional ApplicationStartupPath As String = "", Optional ForceUserConfig As Boolean = False)
-        If LogConfig Is Nothing Then Throw New ArgumentNullException(NameOf(LogConfig))
-        If String.IsNullOrWhiteSpace(UserConfigPath) Then Throw New ArgumentException("UserConfigPath must be provided", NameOf(UserConfigPath))
-
        _LogConfig = LogConfig
        _Logger = LogConfig.GetLogger()
        _File = New FilesystemEx(_LogConfig)

-        _Blueprint = Activator.CreateInstance(Of T)()
-        _BlueprintType = _Blueprint.GetType()
+        _Blueprint = Activator.CreateInstance(Of T)
+        _BlueprintType = _Blueprint.GetType
        _Serializer = New XmlSerializer(_BlueprintType)

        _UserDirectory = _File.CreateDirectory(UserConfigPath)
        _UserConfigPath = Path.Combine(_UserDirectory, USER_CONFIG_NAME)

-        If Not String.IsNullOrWhiteSpace(ComputerConfigPath) Then
+        If ComputerConfigPath <> String.Empty Then
            If IO.File.Exists(ComputerConfigPath) Then
                _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath, False)
            Else
@@ -134,9 +122,9 @@ Public Class ConfigManager(Of T)
            _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)
        End If

-        _AppConfigDirectory = ApplicationStartupPath
-        If Not String.IsNullOrWhiteSpace(ApplicationStartupPath) Then
+        If ApplicationStartupPath <> String.Empty Then
            _AppConfigPath = Path.Combine(ApplicationStartupPath, APP_CONFIG_NAME)
+
        End If

        _WriteAllValuesToUserConfig = ForceUserConfig
--- a/Config/ConfigUtils.vb
+++ b/Config/ConfigUtils.vb
@@ -1,15 +1,16 @@
 Imports System.IO
-Imports NLog
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging

 Public Class ConfigUtils
    Private ReadOnly _Logger As Logger
-    ' Private ReadOnly _File As FilesystemEx
+    Private ReadOnly _File As FilesystemEx

    Private Const MIGRATE_DIRECTORY As String = "Migrate"

-    Public Sub New(Logger As NLog.Logger)
-        _Logger = Logger
-        ' _File = New FilesystemEx(LogConfig)
+    Public Sub New(LogConfig As LogConfig)
+        _Logger = LogConfig.GetLogger()
+        _File = New FilesystemEx(LogConfig)
    End Sub

    ''' <summary>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Config")>
+<Assembly: AssemblyDescription("Stellt Module für die Konfiguration von Produkten bereit")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
+<Assembly: AssemblyProduct("Modules.Config")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("6e67fba4-81d1-44bb-81f4-16ad52822192")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.3.0.0")>
+<Assembly: AssemblyFileVersion("1.3.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Config.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Config.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.Config.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
--- a/Config/SampleConfig.vb
+++ b/Config/SampleConfig.vb
@@ -0,0 +1,70 @@
+Imports Config
+Imports NLog
+
+''' <summary>
+''' Sample Config Class inheriting from BaseConfig
+''' 
+''' 
+''' 
+''' Things this class should do:
+''' 
+''' - Provide defaults for all values
+''' - Load the current config using the LoadConfig method of BaseConfig
+'''     - If no configfile was found, it should create a new datatable with only default values
+'''     - If a configfile was found, it should merge the values from this file with the defaults from this class
+'''         - For each propertyname defined in PropertyNames
+'''             - Check for existing value in datatable
+'''                 - If a value is present, use it
+'''                 - If no value is exists, use the default value
+''' - Assign the resulting values to class properties
+''' - Save the new config to disk
+''' </summary>
+Public Class SampleConfig
+    Inherits BaseConfig
+
+    Private _logger As Logger
+
+    Public ReadOnly ConnectionString As String
+    Public ReadOnly UniversalViewer As String
+
+    Public Overloads ReadOnly Property PropertyNames As Dictionary(Of String, String)
+        Get
+            Return New Dictionary(Of String, String) From {
+                {"ConnectionString", ""},
+                {"UniversalViewer", ""}
+            }
+        End Get
+    End Property
+
+    Public Sub New(LogFactory As LogFactory)
+        MyBase.New(LogFactory)
+
+        _logger = LogFactory.GetCurrentClassLogger()
+
+        ' Load the existing values from the config file into PropertyNames
+        ' overwriting the default values
+        Dim oDataTable = LoadConfig()
+
+        For Each oRow As DataRow In oDataTable.Rows
+            Dim oValue = oRow.Item(_configValue)
+            Dim oKey = oRow.Item(_configKey)
+
+            PropertyNames.Item(oKey) = oValue
+        Next
+
+        ' Assign the merged properties to class properties, optionally converting them beforehand
+        For Each oProperty As KeyValuePair(Of String, String) In PropertyNames
+            Select Case oProperty.Key
+                Case "ConnectionString"
+                    ConnectionString = oProperty.Value
+                Case "UniversalViewer"
+                    UniversalViewer = oProperty.Value
+                Case Else
+                    _logger.Warn("Property {0} was found in PropertyNames but was not assigned to a config property", oProperty.Key)
+            End Select
+        Next
+
+        ' Convert the dictionary back to a datatable and save it
+        SaveConfig(ConvertToDataTable(PropertyNames))
+    End Sub
+End Class
--- a/Config/packages.config
+++ b/Config/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
+  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
+</packages>
--- a/Database/Adapters/Firebird.vb
+++ b/Database/Adapters/Firebird.vb
@@ -2,7 +2,6 @@
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
 Imports System.ComponentModel
-Imports System.Data

 ''' <summary>
 ''' MODULE:         Firebird
--- a/Database/Adapters/MSSQLServer.vb
+++ b/Database/Adapters/MSSQLServer.vb
@@ -1,5 +1,4 @@
 Imports System.ComponentModel
-Imports System.Data
 Imports System.Data.SqlClient
 Imports DigitalData.Modules.Encryption
 Imports DigitalData.Modules.Logging
@@ -471,6 +470,7 @@ Public Class MSSQLServer
        Dim oTransaction As SqlTransaction = MaybeGetTransaction(pSqlConnection, pTransactionMode, pTransaction)

        Try
+
            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}] and Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))

            pSqlCommandObject.Connection = pSqlConnection
@@ -652,12 +652,10 @@ Public Class MSSQLServer
            Cast(Of SqlParameter).
            Select(Function(p) $"({p.ParameterName}={p.Value})").
            ToList()
-
        Dim oParamString = String.Join(",", oList)
        If oParamString.Length > 1000 Then
            oParamString = oParamString.Substring(1, 1000)
        End If
        Return oParamString
-
    End Function
 End Class
--- a/Database/Adapters/ODBC.vb
+++ b/Database/Adapters/ODBC.vb
@@ -1,18 +1,19 @@
 Imports System.Data.Odbc
-Imports System.Data
-Imports NLog
+Imports DigitalData.Modules.Logging

 Public Class ODBC
    Private _Logger As Logger
+    Private _LogConfig As LogConfig

    Private _connectionDatasource As String
    Private _connectionUsername As String
    Private _connectionPassword As String
    Private _connectionString As String

-    Public Sub New(Datasource As String, User As String, Password As String)
+    Public Sub New(LogConfig As LogConfig, Datasource As String, User As String, Password As String)
        Try
-            _Logger = LogManager.GetCurrentClassLogger()
+            _LogConfig = LogConfig
+            _Logger = _LogConfig.GetLogger()

            _connectionDatasource = Datasource
            _connectionPassword = Password
--- a/Database/Adapters/Oracle.vb
+++ b/Database/Adapters/Oracle.vb
@@ -1,6 +1,6 @@
 Imports DigitalData.Modules.Encryption
+Imports DigitalData.Modules.Logging
 Imports Oracle.ManagedDataAccess.Client
-Imports System.Data

 Public Class Oracle
    Implements IDatabase
--- a/Database/Database.vbproj
+++ b/Database/Database.vbproj
@@ -1,56 +1,166 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Database</RootNamespace>
    <AssemblyName>DigitalData.Modules.Database</AssemblyName>
-    <MyType>Empty</MyType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.Database</AssemblyTitle>
-    <Description>Stellt Funktionen für den Datenbankzugriff zur Verfügung</Description>
-    <Company>Digital Data</Company>
-    <Product>Modules.Database</Product>
-    <Copyright>Copyright © 2025</Copyright>
-    <AssemblyVersion>2.3.6.0</AssemblyVersion>
-    <FileVersion>2.3.6.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Database.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Database.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.5.1" />
-    <PackageReference Include="EntityFramework.Firebird" Version="10.1.0" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="System.Data.Odbc" Version="8.0.1" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <PackageReference Include="Oracle.ManagedDataAccess" Version="23.4.0" />
+    <Reference Include="DigitalData.Modules.Encryption">
+      <HintPath>..\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="Oracle.ManagedDataAccess">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Import Include="DigitalData.Modules.Logging" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Remove="My Project\Settings.Designer.vb" />
-    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <None Remove="My Project\Application.myapp" />
-    <None Remove="My Project\Settings.settings" />
+    <Compile Include="ConnectionString.vb" />
+    <Compile Include="Constants.vb" />
+    <Compile Include="Dispatcher.vb" />
+    <Compile Include="Exceptions.vb" />
+    <Compile Include="Adapters\Firebird.vb" />
+    <Compile Include="IDatabase.vb" />
+    <Compile Include="Adapters\ODBC.vb" />
+    <Compile Include="Adapters\Oracle.vb" />
+    <Compile Include="Adapters\MSSQLServer.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="Queries.vb" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
-    <ProjectReference Include="..\Encryption\Encryption.vbproj" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/Database/Dispatcher.vb
+++ b/Database/Dispatcher.vb
@@ -1,6 +1,5 @@
 Imports DigitalData.Modules.Logging
 Imports Oracle.ManagedDataAccess.Client
-Imports System.Data

 Public Class Dispatcher
    Public ReadOnly Property Connections As New List(Of DispatcherConnection)
--- a/Database/IDatabase.vb
+++ b/Database/IDatabase.vb
@@ -1,5 +1,4 @@
 Imports System.Data.Common
-Imports System.Data
 Imports System.Data.SqlClient

 Public Interface IDatabase
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-<Assembly: AssemblyTrademark("2.3.6.0")>
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Database")>
+<Assembly: AssemblyDescription("Stellt Funktionen für den Datenbankzugriff zur Verfügung")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("Modules.Database")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
+<Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("b5cdfd4f-609f-41e1-adf0-663de9636ff5")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("2.3.6.0")>
+<Assembly: AssemblyFileVersion("2.3.6.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Database.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Database.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.Database.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
--- a/Database/packages.config
+++ b/Database/packages.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
+  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
+  <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="5.0.5" targetFramework="net461" />
+  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net461" />
+</packages>
--- a/EDMIAPI/Client.vb
+++ b/EDMIAPI/Client.vb
@@ -1,5 +1,4 @@
-Imports System.Data
-Imports System.IO
+Imports System.IO
 Imports System.ServiceModel
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.EDMI.API.Constants
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@@ -3109,6 +3109,18 @@ Namespace EDMIServiceReference
            MyBase.New
        End Sub
        
+        Public Sub New(ByVal endpointConfigurationName As String)
+            MyBase.New(endpointConfigurationName)
+        End Sub
+        
+        Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As String)
+            MyBase.New(endpointConfigurationName, remoteAddress)
+        End Sub
+        
+        Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As System.ServiceModel.EndpointAddress)
+            MyBase.New(endpointConfigurationName, remoteAddress)
+        End Sub
+        
        Public Sub New(ByVal binding As System.ServiceModel.Channels.Binding, ByVal remoteAddress As System.ServiceModel.EndpointAddress)
            MyBase.New(binding, remoteAddress)
        End Sub
--- a/EDMIAPI/DatabaseWithFallback.vb
+++ b/EDMIAPI/DatabaseWithFallback.vb
@@ -1,5 +1,4 @@
-Imports System.Data
-Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.EDMI.API.Constants
 Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
--- a/EDMIAPI/EDMI.API.vbproj
+++ b/EDMIAPI/EDMI.API.vbproj
@@ -1,61 +1,131 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{25017513-0D97-49D3-98D7-BA76D9B251B0}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.EDMI.API</RootNamespace>
    <AssemblyName>DigitalData.Modules.EDMI.API</AssemblyName>
+    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <UseWindowsForms>true</UseWindowsForms>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>EDMIAPI</AssemblyTitle>
-    <Company>Digital Data</Company>
-    <Product>EDMIAPI</Product>
-    <Copyright>Copyright © 2023</Copyright>
-    <AssemblyVersion>1.6.1.1</AssemblyVersion>
-    <FileVersion>1.6.1.1</FileVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.EDMI.API.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.EDMI.API.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
-    <PackageReference Include="System.ServiceModel.Security" Version="6.0.0" />
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database">
+      <HintPath>..\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Update="Connected Services\EDMIServiceReference\Reference.vb">
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Client\Connection.vb" />
+    <Compile Include="Client\NewFile.vb" />
+    <Compile Include="Client\Options.vb" />
+    <Compile Include="Client\Rights.vb" />
+    <Compile Include="Client\Channel.vb" />
+    <Compile Include="Client\ServerAddressStruct.vb" />
+    <Compile Include="Modules\BaseMethod.vb" />
+    <Compile Include="Modules\Globix\ImportFile.vb" />
+    <Compile Include="Helpers.vb" />
+    <Compile Include="Modules\IDB\CheckOutFile.vb" />
+    <Compile Include="Modules\IDB\CheckInFile.vb" />
+    <Compile Include="Modules\IDB\ImportFile.vb" />
+    <Compile Include="Modules\IDB\NewFile.vb" />
+    <Compile Include="Modules\IDB\SetAttributeValue.vb" />
+    <Compile Include="Modules\IDB\SetObjectState.vb" />
+    <Compile Include="Modules\IDB\UpdateFile.vb" />
+    <Compile Include="Modules\ZooFlow\GetFileObject.vb" />
+    <Compile Include="Connected Services\EDMIServiceReference\Reference.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Reference.svcmap</DependentUpon>
    </Compile>
-    <Compile Update="My Project\Application.Designer.vb">
+    <Compile Include="Client.vb" />
+    <Compile Include="Constants.vb" />
+    <Compile Include="DatabaseWithFallback.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
-    <Compile Update="My Project\Resources.Designer.vb">
+    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Update="My Project\Settings.Designer.vb">
+    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Update="My Project\Resources.resx">
+    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
@@ -63,153 +133,158 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
-    <None Update="Connected Services\EDMIServiceReference\Arrays.xsd">
+    <None Include="app.config" />
+    <None Include="Connected Services\EDMIServiceReference\Arrays.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.CheckInOutFileResponse.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.CheckInOutFileResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.Globix_ImportFileResponse.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.Globix_ImportFileResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse1.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse1.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.ZooFlow.State.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.ZooFlow.State.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Exceptions.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Exceptions.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Messages.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Messages.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Base.GetClientConfig.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Base.GetClientConfig.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.ExecuteNonQuery.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.ExecuteNonQuery.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetDatatable.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetDatatable.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetScalarValue.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetScalarValue.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.GlobalIndexer.ImportFile.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.GlobalIndexer.ImportFile.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.CheckInOutFile.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.CheckInOutFile.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetAttributeValue.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetAttributeValue.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetFileObject.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetFileObject.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.ImportFile.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.ImportFile.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.NewFile.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.NewFile.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.UpdateFile.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.UpdateFile.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.wsdl" />
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService1.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService1.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\Message.xsd">
+    <None Include="Connected Services\EDMIServiceReference\Message.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\service.xsd">
+    <None Include="Connected Services\EDMIServiceReference\service.wsdl" />
+    <None Include="Connected Services\EDMIServiceReference\service.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\System.Data.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.Data.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\System.IO.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.IO.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="Connected Services\EDMIServiceReference\System.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="My Project\Application.myapp">
+    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
-    <None Update="My Project\Settings.settings">
+    <None Include="My Project\DataSources\System.Data.DataTable.datasource" />
+    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <WCFMetadata Include="Connected Services\" />
@@ -218,15 +293,19 @@
    <WCFMetadataStorage Include="Connected Services\EDMIServiceReference\" />
  </ItemGroup>
  <ItemGroup>
-    <None Update="Connected Services\EDMIServiceReference\Reference.svcmap">
+    <None Include="Connected Services\EDMIServiceReference\configuration91.svcinfo" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Connected Services\EDMIServiceReference\configuration.svcinfo" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Connected Services\EDMIServiceReference\Reference.svcmap">
      <Generator>WCF Proxy Generator</Generator>
      <LastGenOutput>Reference.vb</LastGenOutput>
    </None>
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Base\Base.vbproj" />
-    <ProjectReference Include="..\Config\Config.vbproj" />
-    <ProjectReference Include="..\Database\Database.vbproj" />
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
-  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("EDMIAPI")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("EDMIAPI")>
+<Assembly: AssemblyCopyright("Copyright © 2023")>
 <Assembly: AssemblyTrademark("1.6.1.1")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("a4ecd56e-dc85-471e-b190-f3f2e3f4b7b0")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.6.1.1")>
+<Assembly: AssemblyFileVersion("1.6.1.1")>
--- a/EDMIAPI/packages.config
+++ b/EDMIAPI/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+</packages>
--- a/Encryption/Compression.vb
+++ b/Encryption/Compression.vb
@@ -1,10 +1,9 @@
 Imports System.IO
 Imports System.IO.Compression
 Imports DigitalData.Modules.Logging
-Imports NLog

 Public Class Compression
-    Private ReadOnly _logger As NLog.Logger
+    Private ReadOnly _logger As Logger

    Public Sub New(LogConfig As LogConfig)
        _logger = LogConfig.GetLogger()
--- a/Encryption/Encryption.vb
+++ b/Encryption/Encryption.vb
@@ -1,7 +1,7 @@
 Imports System.IO
 Imports System.Security.Cryptography
 Imports System.Text.Encoding
-Imports NLog
+Imports DigitalData.Modules.Logging

 ''' <summary>
 ''' https://stackoverflow.com/questions/10168240/encrypting-decrypting-a-string-in-c-sharp
--- a/Encryption/Encryption.vbproj
+++ b/Encryption/Encryption.vbproj
@@ -1,49 +1,122 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8A8F20FC-C46E-41AC-BEE7-218366CFFF99}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Encryption</RootNamespace>
    <AssemblyName>DigitalData.Modules.Encryption</AssemblyName>
-    <MyType>Empty</MyType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyTitle>DDModules.DDEncryption</AssemblyTitle>
-    <Description>Stellt Funktionen zur Entschlüsselung bereit</Description>
-    <Company>Digital Data Gmbh, Heuchelheim</Company>
-    <Product>DDModules.Encryption</Product>
-    <Copyright>Copyright ©  2021</Copyright>
-    <AssemblyVersion>1.3.1.0</AssemblyVersion>
-    <FileVersion>1.3.1.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Encryption.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Encryption.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Import Include="DigitalData.Modules.Logging" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Remove="My Project\Settings.Designer.vb" />
-    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <None Remove="My Project\Application.myapp" />
-    <None Remove="My Project\Settings.settings" />
+    <Compile Include="Compression.vb" />
+    <Compile Include="Encryption.vb" />
+    <Compile Include="EncryptionLegacy.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("DDModules.DDEncryption")>
+<Assembly: AssemblyDescription("Stellt Funktionen zur Entschlüsselung bereit")>
+<Assembly: AssemblyCompany("Digital Data Gmbh, Heuchelheim")>
+<Assembly: AssemblyProduct("DDModules.Encryption")>
+<Assembly: AssemblyCopyright("Copyright ©  2021")>
 <Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("e92901a1-8e87-482d-b63f-f20292d38f1e")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' indem Sie "*" wie unten gezeigt eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.3.1.0")>
+<Assembly: AssemblyFileVersion("1.3.1.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Encryption.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Encryption.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.Encryption.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
--- a/Encryption/packages.config
+++ b/Encryption/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+</packages>
--- a/Filesystem/Filesystem.vbproj
+++ b/Filesystem/Filesystem.vbproj
@@ -1,49 +1,133 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{991D0231-4623-496D-8BD0-9CA906029CBC}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Filesystem</RootNamespace>
    <AssemblyName>DigitalData.Modules.Filesystem</AssemblyName>
-    <MyType>Empty</MyType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyTitle>Modules.Filesystem</AssemblyTitle>
-    <Description>Stellt Funktionen für das Filesystem und Container zur Verfügung</Description>
-    <Company>Digital Data</Company>
-    <Product>Modules.Filesystem</Product>
-    <Copyright>Copyright © 2022</Copyright>
-    <AssemblyVersion>1.3.3.0</AssemblyVersion>
-    <FileVersion>1.3.3.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Filesystem.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Filesystem.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="NuGet.CommandLine" Version="6.13.2" />
-    <PackageReference Include="protobuf-net" Version="2.4.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="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>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Remove="My Project\Settings.Designer.vb" />
-    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <None Remove="My Project\Application.myapp" />
-    <None Remove="My Project\Settings.settings" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Encryption\Encryption.vbproj" />
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
+    <Compile Include="FileContainer\DocumentObject.vb" />
+    <Compile Include="FileContainer\FileContainer.vb" />
+    <Compile Include="File.vb" />
+    <Compile Include="FileContainer\FileContainerInner.vb" />
+    <Compile Include="FileWatcher\FileWatcher.vb" />
+    <Compile Include="FileWatcher\FileWatcherFilters.vb" />
+    <Compile Include="FileWatcher\FileWatcherProperties.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Encryption\Encryption.vbproj">
+      <Project>{8a8f20fc-c46e-41ac-bee7-218366cfff99}</Project>
+      <Name>Encryption</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Filesystem")>
+<Assembly: AssemblyDescription("Stellt Funktionen für das Filesystem und Container zur Verfügung")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("Modules.Filesystem")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
 <Assembly: AssemblyTrademark("1.3.1.0")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("2787495c-e65f-4730-be0c-af87bede4b11")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.3.3.0")>
+<Assembly: AssemblyFileVersion("1.3.3.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Filesystem.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Filesystem.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.Filesystem.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
--- a/Filesystem/packages.config
+++ b/Filesystem/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net48" />
+  <package id="NLog" version="5.0.5" targetFramework="net48" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net48" developmentDependency="true" />
+  <package id="protobuf-net" version="2.4.0" targetFramework="net461" />
+</packages>
--- a/Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb
+++ b/Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb
@@ -198,10 +198,10 @@ Namespace SyncUsers
                _logger.Debug("UserId of User [{0}] is [{1}]", User, oUserId)

                If oUserId = 0 Then
-                    Dim oPrename = User.GivenName
-                    Dim oSurname = User.Surname
-                    Dim oUsername = User.samAccountName
-                    Dim oEmail = User.Email
+                    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)
@@ -237,9 +237,9 @@ Namespace SyncUsers
                Dim oUserId As Integer = GetUserId(User.samAccountName)
                If Not IsNothing(oUserId) Then
                    If oUserId > 0 Then
-                        Dim oPrename = User.GivenName
-                        Dim oSurname = User.Surname
-                        Dim oEmail = User.Email
+                        Dim oPrename = User.GivenName.EscapeForSQL()
+                        Dim oSurname = User.Surname.EscapeForSQL()
+                        Dim oEmail = User.Email.EscapeForSQL()

                        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)
--- a/Interfaces/ActiveDirectoryInterface/UserPrincipalEx.vb
+++ b/Interfaces/ActiveDirectoryInterface/UserPrincipalEx.vb
@@ -1,5 +1,4 @@
 Imports System.DirectoryServices.AccountManagement
-Imports System.DirectoryServices.AccountManagement.UserPrincipal

 <DirectoryRdnPrefix("CN")>
 <DirectoryObjectClass("Person")>
--- a/Interfaces/Interfaces.vbproj
+++ b/Interfaces/Interfaces.vbproj
@@ -1,88 +1,308 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Interfaces</RootNamespace>
    <AssemblyName>DigitalData.Modules.Interfaces</AssemblyName>
+    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UseWindowsForms>true</UseWindowsForms>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.Interfaces</AssemblyTitle>
-    <Company>Digital Data</Company>
-    <Product>Modules.Interfaces</Product>
-    <Copyright>Copyright © 2025</Copyright>
-    <AssemblyVersion>2.4.0.0</AssemblyVersion>
-    <FileVersion>2.4.0.0</FileVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Interfaces.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Interfaces.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
-    <PackageReference Include="DocumentFormat.OpenXml.Framework" Version="3.2.0" />
-    <PackageReference Include="GdPicture" Version="14.3.22" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="OpenMcdf" Version="2.4.1" />
-    <PackageReference Include="protobuf-net" Version="3.2.46" />
-    <PackageReference Include="protobuf-net.Core" Version="3.2.46" />
-    <PackageReference Include="RtfPipe" Version="2.0.7677.4303" />
-    <PackageReference Include="System.CodeDom" Version="8.0.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageReference Include="System.IO.Packaging" Version="8.0.1" />
-    <PackageReference Include="System.Management" Version="8.0.0" />
-    <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.6" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.DirectoryServices.AccountManagement" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Update="My Project\Application.Designer.vb">
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActiveDirectoryInterface.vb" />
+    <Compile Include="ActiveDirectoryInterface\ActiveDirectoryGroup.vb" />
+    <Compile Include="ActiveDirectoryInterface\ActiveDirectoryUser.vb" />
+    <Compile Include="ActiveDirectoryInterface\AttributeMap.vb" />
+    <Compile Include="ActiveDirectoryInterface\ISyncUsers.vb" />
+    <Compile Include="ActiveDirectoryInterface\SyncUsers.MSSQL.vb" />
+    <Compile Include="ActiveDirectoryInterface\UserEqualityComparer.vb" />
+    <Compile Include="ActiveDirectoryInterface\UserPrincipalEx.vb" />
+    <Compile Include="GraphQLInterface.vb" />
+    <Compile Include="GrapQLInterface\LoginData.vb" />
+    <Compile Include="GrapQLInterface\LogoutData.vb" />
+    <Compile Include="GrapQLInterface\QueryData.vb" />
+    <Compile Include="ZUGFeRDInterface\Enums\Item_Types.vb" />
+    <Compile Include="ZUGFeRDInterface\Exceptions.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
-    <Compile Update="My Project\Resources.Designer.vb">
+    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Update="My Project\Settings.Designer.vb">
+    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
+    <Compile Include="ZUGFeRDInterface\PDFConverter.vb" />
+    <Compile Include="ZUGFeRDInterface\Peppol_UBL2.1\CreditNoteType.vb" />
+    <Compile Include="ZUGFeRDInterface\Peppol_UBL2.1\InvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Validator.vb" />
+    <Compile Include="ZUGFeRDInterface\Version1.0\CrossIndustryDocumentType.vb" />
+    <Compile Include="ZUGFeRDInterface.vb" />
+    <Compile Include="ZUGFeRDInterface\FileGroups.vb" />
+    <Compile Include="ZUGFeRDInterface\PDFEmbeds.vb" />
+    <Compile Include="ZUGFeRDInterface\PropertyValues.vb" />
+    <Compile Include="ZUGFeRDInterface\Version2.0\CrossIndustryInvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Version2.1.1\CrossIndustryInvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Version2.2_FacturX\CrossIndustryInvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Version2.3_3_FacturX\CrossIndustryInvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\Version2.3_FacturX\CrossIndustryInvoiceType.vb" />
+    <Compile Include="ZUGFeRDInterface\XmlItemProperty.vb" />
  </ItemGroup>
  <ItemGroup>
-    <None Update="My Project\Application.myapp">
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Base\Base.vbproj" />
-    <ProjectReference Include="..\Database\Database.vbproj" />
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
-  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
 </Project>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-<Assembly: AssemblyTrademark("2.3.7.0")>
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Interfaces")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("Modules.Interfaces")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
+<Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("f0de0536-a336-40cb-bb8b-957942174eed")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("2.3.0.0")>
+<Assembly: AssemblyFileVersion("2.3.0.0")>
--- a/Interfaces/ZUGFeRDInterface.vb
+++ b/Interfaces/ZUGFeRDInterface.vb
@@ -19,7 +19,6 @@ Public Class ZUGFeRDInterface
    Public Const ZUGFERD_SPEC_DEFAULT = "DEFAULT"
    Public Const ZUGFERD_SPEC_10 = "ZUGFERD_10"
    Public Const ZUGFERD_SPEC_2x = "ZUGFERD_2x"
-    Public Const ZUGFERD_SPEC_2_3x = "ZUGFERD_2_3x"

    Public Const UBL_SPEC_21 = "UBL_21"

@@ -51,7 +50,6 @@ Public Class ZUGFeRDInterface
        UnsupportedFormat
        FileTooBig
        UnknownError
-        NotInUse
    End Enum

    Public ReadOnly Property FileGroup As FileGroups
@@ -62,7 +60,6 @@ Public Class ZUGFeRDInterface
        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
-        Public Property AllowZugferd_2_3_x_Schema As Boolean = True
        Public Property AllowPeppol_3_x_Schema As Boolean = False
    End Class

@@ -133,46 +130,24 @@ Public Class ZUGFeRDInterface
        AllowedFilenames = oAllowedFilenames
    End Sub

-    Public Function FilterPropertyMap(pPropertyMapList As List(Of XmlItemProperty), pSpecification As String) As Dictionary(Of String, XmlItemProperty)
-        _logger.Debug("Filtering Property map list for Specification [{0}]", pSpecification)
+    Public Function FilterPropertyMap(pPropertyMap As Dictionary(Of String, XmlItemProperty), pSpecification As String) As Dictionary(Of String, XmlItemProperty)
+        _logger.Debug("Filtering Property map for Specification [{0}]", pSpecification)

        If pSpecification = ZUGFERD_SPEC_10 Then
-            Try
-
-                _logger.Debug("Special Case [{0}], including [{1}]", ZUGFERD_SPEC_10, ZUGFERD_SPEC_DEFAULT)
-
-                Dim countElements As Integer = pPropertyMapList.Where(Function(x) x.Specification = pSpecification Or x.Specification = ZUGFERD_SPEC_DEFAULT).Count
-                _logger.Debug("Property map list contains [{0}] elements for specification [{1}]", countElements, pSpecification)
-
-                Return pPropertyMapList.
-                        Where(Function(kv) kv.Specification = pSpecification Or kv.Specification = ZUGFERD_SPEC_DEFAULT).
-                        ToDictionary(Function(kv) kv.XMLPath, Function(kv) kv)
-
-            Catch ex As Exception
-                _logger.Error(ex)
-            End Try
+            _logger.Debug("Special Case [{0}], including [{1}]", ZUGFERD_SPEC_10, ZUGFERD_SPEC_DEFAULT)
+            Return pPropertyMap.
+                Where(Function(kv) kv.Value.Specification = pSpecification Or kv.Value.Specification = ZUGFERD_SPEC_DEFAULT).
+                ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
        Else
-
-            Try
-
-                Dim countElements As Integer = pPropertyMapList.Where(Function(x) x.Specification = pSpecification).Count
-                _logger.Debug("Property map list contains [{0}] elements for specification [{1}]", countElements, pSpecification)
-
-                Return pPropertyMapList.
-                        Where(Function(kv) kv.Specification = pSpecification).
-                        ToDictionary(Function(kv) kv.XMLPath, Function(kv) kv)
-
-            Catch ex As Exception
-                _logger.Error(ex)
-            End Try
+            _logger.Debug("Using Specification [{0}]", pSpecification)
+            Return pPropertyMap.
+                Where(Function(kv) kv.Value.Specification = pSpecification).
+                ToDictionary(Function(kv) kv.Key, Function(kv) kv.Value)
        End If
-
-        Return Nothing
    End Function

    Public Function GetSerializedXMLContentFromFile(oFileInfo As FileInfo) As ZugferdResult
        Dim oResult = New ZugferdResult()
-        Dim oMessage As String = String.Empty

        Try
            Dim oFileSize As Integer = oFileInfo.Length
@@ -197,7 +172,7 @@ Public Class ZUGFeRDInterface

        Catch ex As Exception
            _logger.Error(ex)
-            Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, "Datei ist eine ungültige XML Datei.")
+            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, "Datei ist eine ungültige XML Datei.")
        End Try

        If oResult.ValidationErrors.Any() Then
@@ -213,6 +188,7 @@ Public Class ZUGFeRDInterface
    ''' Validates a ZUGFeRD File and extracts the XML Document from it
    ''' </summary>
    ''' <param name="Path"></param>
+    ''' <exception cref="ZUGFeRDExecption"></exception>
    Public Function ExtractZUGFeRDFileWithGDPicture(Path As String) As ZugferdResult
        Dim oResult = ValidateZUGFeRDFileWithGDPicture(Path)
        oResult = ValidateZUGFeRDDocument(oResult)
@@ -230,6 +206,7 @@ Public Class ZUGFeRDInterface
    ''' Validates a ZUGFeRD File and extracts the XML Document from it
    ''' </summary>
    ''' <param name="Stream"></param>
+    ''' <exception cref="ZUGFeRDExecption"></exception>
    Public Function ExtractZUGFeRDFileWithGDPicture(Stream As Stream) As ZugferdResult
        Dim oResult = ValidateZUGFeRDFileWithGDPicture(Stream)
        oResult = ValidateZUGFeRDDocument(oResult)
@@ -252,6 +229,7 @@ Public Class ZUGFeRDInterface
    ''' Validates a ZUGFeRD File and extracts the XML Document from it
    ''' </summary>
    ''' <param name="pStream"></param>
+    ''' <exception cref="ZUGFeRDExecption"></exception>
    ''' <returns>The embedded xml data as an XPath document</returns>
    Public Function ValidateZUGFeRDFileWithGDPicture(pStream As Stream) As ZugferdResult
        Dim oEmbedExtractor = New PDFEmbeds(_logConfig)
@@ -270,7 +248,7 @@ Public Class ZUGFeRDInterface
            Throw ex

        Catch ex As Exception
-            _logger.Warn("Error while validating eInvoice file with GDPicture")
+            _logger.Warn("Error while validating ZUGFeRD file with GDPicture")
            _logger.Error(ex)
            Throw ex
        End Try
@@ -280,23 +258,18 @@ Public Class ZUGFeRDInterface
    ''' 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, Optional Validate As Boolean = False) As ZugferdResult
+    Public Function ValidateZUGFeRDFileWithGDPicture(pPath As String) As ZugferdResult
        Dim oEmbedExtractor = New PDFEmbeds(_logConfig)

        Try
            ' Extract XML attachments only!
            Dim oFiles = oEmbedExtractor.Extract(pPath, New List(Of String) From {"xml"})
-            If Validate Then
-                Dim oZugferdResult = HandleEmbeddedFiles(oFiles)
-                Return _Validator.ValidateZUGFeRDDocument(oZugferdResult)
-            Else
-                ' Attachments are in this case the files that are embedded into a pdf file,
-                ' like for example the zugferd-invoice.xml file
-                Return HandleEmbeddedFiles(oFiles)
-            End If
-

+            ' Attachments are in this case the files that are embedded into a pdf file,
+            ' like for example the zugferd-invoice.xml file
+            Return HandleEmbeddedFiles(oFiles)

        Catch ex As ZUGFeRDExecption
            ' Don't log ZUGFeRD Exceptions here, they should be handled by the calling code.
@@ -304,15 +277,19 @@ Public Class ZUGFeRDInterface
            Throw ex

        Catch ex As Exception
-            _logger.Warn("Error while validating eInvoice file with GDPicture")
+            _logger.Warn("Error while validating ZUGFeRD file with GDPicture")
            _logger.Error(ex)
            Throw ex
        End Try
    End Function

    Private Function HandleEmbeddedFiles(pResults As List(Of PDFEmbeds.EmbeddedFile)) As ZugferdResult
-        If pResults Is Nothing OrElse pResults.Count = 0 Then
-            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdNoXMLAttachmentFound, "Die Datei ist keine gültige ZUGFeRD-Datei, es wurde kein passender XML-Anhang gefunden.")
+        If pResults Is Nothing Then
+            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil die Attachments nicht gelesen werden konnten.")
+        End If
+
+        If pResults.Count = 0 Then
+            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei, weil sie keine Attachments enthält.")
        End If

        ' Find the first file which filename matches the valid filenames for embedded invoice files
@@ -321,7 +298,7 @@ Public Class ZUGFeRDInterface
            FirstOrDefault()

        If oValidResult Is Nothing Then
-            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdNoXMLAttachmentFound, "Die Datei ist keine ZUGFeRD Datei, weil keine passende XML-Datei 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.
@@ -331,7 +308,7 @@ Public Class ZUGFeRDInterface
            FirstOrDefault()

        If oAllowedResult Is Nothing Then
-            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdNoXMLAttachmentFound, "Datei enthält einen XML-Anhang mit einem ungültigen Dateinamen.", oAllowedResult.FileName)
+            Throw New ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Datei ist eine ZUGFeRD Datei, aber das Format wird nicht unterstützt.", oAllowedResult.FileName)
        End If

        Try
@@ -349,7 +326,7 @@ Public Class ZUGFeRDInterface

        Catch ex As Exception
            _logger.Error(ex)
-            Throw New ZUGFeRDExecption(ErrorCodes.InvalidFerdException, "XML-Datei konnte nicht gelesen werden.")
+            Throw New ZUGFeRDExecption(ErrorType.NoValidZugferd, "Datei ist eine ungültige ZUGFeRD Datei.")
        End Try
    End Function

@@ -381,7 +358,6 @@ Public Class ZUGFeRDInterface
                })
            End If

-            '' Reihenfolge 2.0 muss unverändert bleiben. Älteste Version immer zuerst!
            If _Options.AllowZugferd_2_x_Schema Then
                oAllowedTypes.AddRange(New List(Of AllowedType) From {
                    New AllowedType With {
@@ -398,22 +374,16 @@ Public Class ZUGFeRDInterface
                        .SchemaType = GetType(Version2_2_FacturX.CrossIndustryInvoiceType),
                        .Specification = ZUGFERD_SPEC_2x,
                        .XMLSchema = XMLSCHEMA_ZUGFERD_22
-                    }
-                })
-            End If
-
-            '' Reihenfolge ab 2.3 geändert. Neuste Version immer zuerst
-            If _Options.AllowZugferd_2_3_x_Schema Then
-                oAllowedTypes.AddRange(New List(Of AllowedType) From {
-                    New AllowedType With {
-                        .SchemaType = GetType(Version2_3_3_FacturX.CrossIndustryInvoiceType),
-                        .Specification = ZUGFERD_SPEC_2_3x,
-                        .XMLSchema = XMLSCHEMA_ZUGFERD_233
                    },
                    New AllowedType With {
                        .SchemaType = GetType(Version2_3_FacturX.CrossIndustryInvoiceType),
-                        .Specification = ZUGFERD_SPEC_2_3x,
+                        .Specification = ZUGFERD_SPEC_2x,
                        .XMLSchema = XMLSCHEMA_ZUGFERD_23
+                    },
+                    New AllowedType With {
+                        .SchemaType = GetType(Version2_3_3_FacturX.CrossIndustryInvoiceType),
+                        .Specification = ZUGFERD_SPEC_2x,
+                        .XMLSchema = XMLSCHEMA_ZUGFERD_233
                    }
                })
            End If
@@ -456,7 +426,8 @@ Public Class ZUGFeRDInterface
            Next

            If oObject Is Nothing Then
-                Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, "Unsupported Format")
+                'Throw New ApplicationException("No Types matched the given document. Document could not be serialized.")
+                Throw New ZUGFeRDExecption(ErrorType.UnsupportedFormat, "Unsupported Format")
            End If

            pResult.Specification = oSpecification
@@ -471,8 +442,8 @@ Public Class ZUGFeRDInterface

        Catch ex As Exception
            _logger.Error(ex)
-            Dim oMessage = "Datei ist eine ungültige Datei oder das Format wird nicht unterstüzt, oder das Format ist deaktiviert."
-            Throw New ZUGFeRDExecption(ErrorCodes.UnsupportedFerdException, oMessage)
+            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
 End Class
--- a/Interfaces/ZUGFeRDInterface/Enums/ErrorCodes.vb
+++ b/Interfaces/ZUGFeRDInterface/Enums/ErrorCodes.vb
@@ -1,14 +0,0 @@
-Public Enum ErrorCodes
-    NotInUse = 0
-    ValidationException = 20001
-    MD5HashException = 20002
-    UnsupportedFerdException = 20003
-    InvalidFerdException = 20004
-    TooMuchFerdsException = 20005
-    InvalidFerdNoXMLAttachmentFound = 20006
-    MissingValueException = 20007
-    FileSizeLimitReachedException = 20008
-    OutOfMemoryException = 20009
-    UnhandledException = 20010
-    FileMoveException = 200011
-End Enum
--- a/Interfaces/ZUGFeRDInterface/Enums/Item_Types.vb
+++ b/Interfaces/ZUGFeRDInterface/Enums/Item_Types.vb
@@ -3,6 +3,5 @@
    DateType    '1
    MoneyType   '2
    FileType    '3
-    ListType    '4  - vgl. Währung

 End Enum
--- a/Interfaces/ZUGFeRDInterface/Exceptions.vb
+++ b/Interfaces/ZUGFeRDInterface/Exceptions.vb
@@ -4,11 +4,7 @@ Public Class Exceptions
    Public Class ZUGFeRDExecption
        Inherits ApplicationException

-        Public ReadOnly Property ErrorCode() As ErrorCodes
-
-        Public ReadOnly Property Param1 As String = String.Empty
-
-        Public ReadOnly Property Param2 As String = String.Empty
+        Public ReadOnly Property ErrorType() As ZUGFeRDInterface.ErrorType

        ''' <summary>
        ''' Contains the name of the extracted xml file if already extracted.
@@ -16,37 +12,18 @@ Public Class Exceptions
        ''' <returns>A filename like zugferd-invoice.xml</returns>
        Public ReadOnly Property XmlFile As String = String.Empty

-        Public Sub New(pErrorCode As ErrorCodes, Message As String)
+        Public Sub New(ErrorType As ZUGFeRDInterface.ErrorType, Message As String)
            MyBase.New(Message)

-            _ErrorCode = pErrorCode
+            _ErrorType = ErrorType
        End Sub

-        Public Sub New(pErrorCode As ErrorCodes, Message As String, pXmlFileName As String)
+        Public Sub New(ErrorType As ZUGFeRDInterface.ErrorType, Message As String, pXmlFileName As String)
            MyBase.New(Message)

-            _ErrorCode = pErrorCode
+            _ErrorType = ErrorType
            _XmlFile = pXmlFileName
        End Sub
-
-        Public Sub New(pErrorCode As ErrorCodes, Param1 As String, Param2 As String, Message As String)
-            MyBase.New(Message)
-
-            _ErrorCode = pErrorCode
-            _Param1 = Param1
-            _Param2 = Param2
-
-        End Sub
-
-        Public Sub New(pErrorCode As ErrorCodes, Param1 As String, Param2 As String, Message As String, pXmlFileName As String)
-            MyBase.New(Message)
-
-            _ErrorCode = pErrorCode
-            _Param1 = Param1
-            _Param2 = Param2
-            _XmlFile = pXmlFileName
-
-        End Sub
    End Class

    Public Class ValidationException
@@ -54,13 +31,8 @@ Public Class Exceptions

        Public ValidationErrors As List(Of ZugferdValidationError)

-        Public ReadOnly Property ErrorCode() As ErrorCodes
-
        Public Sub New()
            MyBase.New("ZUGFeRD document found but validation failed!")
-
-            _ErrorCode = ErrorCodes.ValidationException
        End Sub
-
    End Class
 End Class
--- a/Interfaces/ZUGFeRDInterface/PropertyValues.vb
+++ b/Interfaces/ZUGFeRDInterface/PropertyValues.vb
@@ -1,5 +1,4 @@
-Imports System.Globalization
-Imports System.Reflection
+Imports System.Reflection
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging

@@ -28,7 +27,6 @@ Public Class PropertyValues
        Public IsRequired As Boolean
        Public GroupCounter As Integer = -1

-        Public EN16931_ID As String
        Public Description As String
        Public Value As String
        Public XMLPath As String
@@ -37,7 +35,6 @@ Public Class PropertyValues
    End Class

    Public Class MissingProperty
-        Public EN16931_ID As String
        Public Description As String
        Public XMLPath As String

@@ -57,7 +54,7 @@ Public Class PropertyValues
            ToDictionary(Function(Item) Item.Key,
                         Function(Item) Item.Value)

-        _logger.Debug("Found {0} ungrouped properties.", oDefaultProperties.Count)
+        _logger.Debug("Found {0} default properties.", oDefaultProperties.Count)

        ' PropertyMap items with `IsGrouped = True` are grouped by group scope
        Dim oGroupedProperties = PropertyMap.
@@ -71,7 +68,7 @@ Public Class PropertyValues
            Dim oGroupScope As String = oGroup.Key

            Dim oPropertyList As New Dictionary(Of XmlItemProperty, List(Of Object))
-            Dim oRowCount = 0       ' TODO - Es wird anhand der Anzahl XML-Knoten ermittelt wieviele Rows gelesen werden???????
+            Dim oRowCount = 0

            _logger.Debug($"Fetching Property values for group [{oGroupScope}].")

@@ -115,14 +112,13 @@ Public Class PropertyValues
                    Dim oPropertyDescription As String = oColumn.Key.Description
                    Dim oPropertyPath As String = oColumn.Key.XMLPath
                    Dim oItemType As Integer = oColumn.Key.ItemType
-                    Dim oEN16931Value As String = oColumn.Key.EN16931_ID

                    Dim oRowCounter = oRowIndex + oGlobalGroupCounter + 1

                    ' Returns nothing if oColumn.Value contains an empty list
                    Dim oPropertyValue = oColumn.Value.ElementAtOrDefault(oRowIndex)

-                    _logger.Debug("Processing itemColumn *TableColumn* [{0}].", oTableColumn)
+                    _logger.Debug("Processing itemSpecification *TableColumn* [{0}].", oTableColumn)
                    If oTableColumn = "INVOICE_SELLER_EMAIL" Then
                        Console.WriteLine("INVOICE_SELLER_EMAIL")
                    ElseIf oTableColumn = "INVOICE_POSITION_ARTICLE" Then
@@ -130,40 +126,20 @@ Public Class PropertyValues
                    End If
                    If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
                        If oColumn.Key.IsRequired Then
-                            _logger.Warn($"{MessageId} - oPropertyValue for column [{oTableColumn}] is empty or not found but is required. Continuing with Empty String.")
+                            _logger.Warn($"{MessageId} # oPropertyValue for specification [{oTableColumn}] is empty or not found but is required. Continuing with Empty String.")
                            Dim oMissingProperty = New MissingProperty() With {
-                                .EN16931_ID = oEN16931Value,
                                .Description = oPropertyDescription,
                                .XMLPath = oPropertyPath
                            }
                            oResult.MissingProperties.Add(oMissingProperty)
                        Else
-                            _logger.Debug($"{MessageId} - oPropertyValue for column [{oTableColumn}] is empty or not found. Continuing with Empty String.")
+                            _logger.Debug($"{MessageId} # oPropertyValue for specification [{oTableColumn}] is empty or not found. Continuing with Empty String.")
                        End If

                        oPropertyValue = String.Empty
                    End If

-                    If (oPropertyValue IsNot Nothing) Then
-                        Dim logValue As String = oPropertyValue.ToString()
-                        If logValue.Length > 50 Then
-                            _logger.Debug("Item [{0}] has value '{1}...'", oTableColumn, logValue.Substring(1, 50))
-                        Else
-                            _logger.Debug("Item [{0}] has value '{1}'", oTableColumn, oPropertyValue)
-                        End If
-
-                    End If
-
-                    If oTableColumn = "INVOICE_CURRENCY" Or oItemType = 4 Then
-                        Dim oValuestring = oPropertyValue.ToString()
-
-                        ' Bei Listenelementen entfernen wir den String Item, um den Wert zu erhalten
-                        If oValuestring.Contains("Item") Then
-                            oValuestring = oValuestring.Replace("Item", "")
-                        End If
-
-                        oPropertyValue = oValuestring
-                    End If
+                    _logger.Debug("ItemSpecification [{0}] has value '{1}'", oTableColumn, oPropertyValue)

                    oResult.ValidProperties.Add(New ValidProperty() With {
                        .MessageId = MessageId,
@@ -174,8 +150,7 @@ Public Class PropertyValues
                        .TableColumn = oTableColumn,
                        .IsRequired = oIsRequired,
                        .XMLPath = oPropertyPath,
-                        .ItemType = oItemType,
-                        .EN16931_ID = oEN16931Value
+                        .ItemType = oItemType
                    })
                Next
            Next
@@ -194,12 +169,11 @@ Public Class PropertyValues
            Dim oIsRequired = oItem.Value.IsRequired
            Dim oDescription = oItem.Value.Description
            Dim oItemType = oItem.Value.ItemType
-            Dim oEN16931_ID = oItem.Value.EN16931_ID

            Try
                oPropertyValueList = GetPropValue(pDocument, 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.Warn("ERROR-MESSAGE [{0}]", ex.Message)
                _logger.Error(ex)
                oPropertyValueList = New List(Of Object)
@@ -218,20 +192,20 @@ Public Class PropertyValues

                            ' This should hopefully show config errors
                            If TypeOf oPropertyValue Is List(Of Object) Then
-                                _logger.Warn("Item with specification [{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("Specification [{0}] is empty, but marked as required! Skipping.", oTableColumn)
+                    _logger.Warn("{0} # Specification [{1}] is empty, but marked as required! Skipping.", MessageId, oPropertyDescription)
                    Dim oMissingProperty = New MissingProperty With
                    {
                        .Description = oPropertyDescription,
@@ -240,22 +214,15 @@ Public Class PropertyValues
                    oResult.MissingProperties.Add(oMissingProperty)
                    Continue For
                Else
-                    _logger.Debug("oPropertyValue for specification [{0}] is empty or not found. Skipping.", oTableColumn)
+                    _logger.Debug("{0} # oPropertyValue for specification [{1}] is empty or not found. Skipping.", MessageId, oPropertyDescription)

                    Continue For
                End If
            End If

-            ' Statt dem Zahlenwert des Enums, wollen wir die Währungsbezeichnung
-            If oTableColumn = "INVOICE_CURRENCY" Or oItemType = 4 Then
-                Dim oValuestring = oPropertyValue.ToString()
-
-                ' Bei Listenelementen entfernen wir den String Item, um den Wert zu erhalten
-                If oValuestring.Contains("Item") Then
-                    oValuestring = oValuestring.Replace("Item", "")
-                End If
-
-                oPropertyValue = oValuestring
+            ' Statt dem Zahlenwert des Enums, wollen wir die Währunsgbezeichnung
+            If oTableColumn = "INVOICE_CURRENCY" Then
+                oPropertyValue = oPropertyValue.ToString()
            End If

            oResult.ValidProperties.Add(New ValidProperty() With {
@@ -266,8 +233,7 @@ Public Class PropertyValues
                .TableColumn = oTableColumn,
                .IsRequired = oIsRequired,
                .XMLPath = oPropertyPath,
-                .ItemType = oItemType,
-                .EN16931_ID = oEN16931_ID
+                .ItemType = oItemType
             })
        Next

@@ -314,11 +280,17 @@ Public Class PropertyValues

            Obj = oInfo.GetValue(Obj, Nothing)

+            ' TODO: This code should check for array properties by itself
+            ' and should not rely on the user to 
+            'If oInfo.PropertyType.IsArray Then
+            '    Obj = Obj(0)
+            'End If
+
            If oHasIndex Then
                Obj = Obj(0)
            End If

-            If IsArray(Obj) And Not oHasIndex And oPart <> "Value" Then
+            If IsArray(Obj) And Not oHasIndex Then
                Dim oCurrentPart As String = oPart
                Dim oSplitString As String() = New String() {oCurrentPart & "."}
                Dim oPathFragments = PropertyName.Split(oSplitString, StringSplitOptions.None)
@@ -338,56 +310,8 @@ Public Class PropertyValues
                Next

                Return oResults
-            Else
-                If oPart = "Value" AndAlso Obj IsNot Nothing Then
-                    ' Der Name des gefundenen Datentyps
-                    Dim oObjType = oInfo.PropertyType.FullName
-
-                    If oObjType.Equals("System.DateTime", StringComparison.OrdinalIgnoreCase) Then
-
-                        Dim d As Date
-                        Dim s As String
-                        Dim oResult As String
-
-                        s = Convert.ToString(Obj)
-
-                        If IsDate(s) = True Then
-                            ' Hier wird das DEFAULT-Format auf yyyyMMdd gesetzt
-                            Dim dtfi As DateTimeFormatInfo = CultureInfo.CreateSpecificCulture(CultureInfo.InvariantCulture.Name).DateTimeFormat
-                            dtfi.DateSeparator = ""
-                            dtfi.ShortDatePattern = "yyyyMMdd"
-
-                            d = CDate(s)
-                            oResult = d.ToString("d", dtfi)
-
-                            'Return New List(Of Object) From {oResult}
-                            Dim oRetValue As List(Of Object) = New List(Of Object) From {
-                                oResult
-                            }
-
-                            Return oRetValue
-
-                        End If
-                    ElseIf oObjType.Equals("System.Decimal", StringComparison.OrdinalIgnoreCase) Then
-
-                        Dim oResult As String
-
-                        If IsNumeric(Obj) = True Then
-                            Dim decValue As Decimal = CDec(Obj)
-                            ' Es wird immer ein . als Dezimaltrenner verwendet, falls nötig
-                            oResult = decValue.ToString(CultureInfo.InvariantCulture)
-
-                            'Return New List(Of Object) From {oResult}
-                            Dim oRetValue As List(Of Object) = New List(Of Object) From {
-                                oResult
-                            }
-
-                            Return oRetValue
-
-                        End If
-                    End If
-                End If
            End If
+
        Next

        Return New List(Of Object) From {Obj}
@@ -415,20 +339,8 @@ Public Class PropertyValues
            Select Case oCount
                Case 0
                    Return Nothing
-                Case 1
-                    Dim firstElement As Object
-                    firstElement = oList.FirstOrDefault()
-                    If firstElement IsNot Nothing AndAlso IsArray(firstElement) Then
-
-                        ' Attachments sind Byte-Arrays und müssen umgewandelt werden
-                        Return Convert.ToBase64String(firstElement)
-
-                    Else
-                        Return DoGetFinalPropValue(oList.First())
-                    End If
                Case Else
                    Return DoGetFinalPropValue(oList.First())
-
            End Select

            Return DoGetFinalPropValue(Value)
--- a/Interfaces/ZUGFeRDInterface/RejectionStringRow.vb
+++ b/Interfaces/ZUGFeRDInterface/RejectionStringRow.vb
@@ -1,8 +0,0 @@
-Public Class RejectionStringRow
-    Public ModuleName As String
-    Public Title As String
-    Public Caption As String
-    Public Language As String
-    Public String1 As String
-
-End Class
--- a/Interfaces/ZUGFeRDInterface/Validator.vb
+++ b/Interfaces/ZUGFeRDInterface/Validator.vb
@@ -14,7 +14,6 @@ Public Class Validator
        ValidateDecimalNodes(pResult)
        ValidateCurrencyNodes(pResult)

-        'TODO Validate Datumsfelder
        Return pResult
    End Function

@@ -30,7 +29,7 @@ Public Class Validator
                    .ElementName = oNode.Name.LocalName,
                    .ElementValue = oNode.Value,
                    .ErrorMessage = "Value could not be parsed as Decimal.",
-                    .ErrorMessageDE = "Der Wert ist keine Dezimalzahl."
+                    .ErrorMessageDE = "Der Wert konnte nicht in eine Dezimalzahl umgewandelt werden."
                })
                End If
            Next
--- a/Interfaces/ZUGFeRDInterface/Version2.3_3_FacturX/CrossIndustryInvoiceType.vb
+++ b/Interfaces/ZUGFeRDInterface/Version2.3_3_FacturX/CrossIndustryInvoiceType.vb
--- a/Interfaces/ZUGFeRDInterface/Version2.3_FacturX/CrossIndustryInvoiceType.vb
+++ b/Interfaces/ZUGFeRDInterface/Version2.3_FacturX/CrossIndustryInvoiceType.vb
--- a/Interfaces/ZUGFeRDInterface/XmlItemProperty.vb
+++ b/Interfaces/ZUGFeRDInterface/XmlItemProperty.vb
@@ -22,14 +22,7 @@
    ''' 0 = Default / Text
    ''' 1 = Datum
    ''' 2 = Gleitkomma
-    ''' 3 = Attachment-Felder
-    ''' 4 = Elemente einer Liste, vgl Currency
+    ''' 3 = Memo-Feld
    ''' </summary>
    Public ItemType As Integer
-
-    ''' <summary>
-    ''' BT-Feld-Bezeichnung
-    ''' </summary>
-    Public EN16931_ID As String
-
 End Class
--- a/Interfaces/app.config
+++ b/Interfaces/app.config
@@ -40,7 +40,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/Interfaces/packages.config
+++ b/Interfaces/packages.config
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
+  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.Management" version="8.0.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+</packages>
--- a/Jobs/App.config
+++ b/Jobs/App.config
@@ -5,8 +5,6 @@
    </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-	  <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.9.0" newVersion="14.3.9.0" />
      <dependentAssembly>
        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
@@ -45,11 +43,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.3.18.0" newVersion="14.3.18.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/Jobs/GraphQL/GraphQLJob.vb
+++ b/Jobs/GraphQL/GraphQLJob.vb
@@ -24,20 +24,12 @@ Public Class GraphQLJob
    Public Sub Start(Args As GraphQLArgs) Implements IJob(Of GraphQLArgs).Start
        Try
            Dim oConfigPath As String = Args.QueryConfigPath
-            ' ConfigManager is missing, so we manually load the config
-            Dim oConfig As GraphQLConfig = Nothing
-            If File.Exists(oConfigPath) Then
-                ' Simple deserialization from JSON, assuming config is stored as JSON
-                Dim json As String = File.ReadAllText(oConfigPath)
-                oConfig = System.Text.Json.JsonSerializer.Deserialize(Of GraphQLConfig)(json)
-            Else
-                Throw New FileNotFoundException($"Config file not found: {oConfigPath}")
-            End If
+            Dim oConfigManager As New ConfigManager(Of GraphQLConfig)(_LogConfig, oConfigPath)

-            With oConfig
+            With oConfigManager.Config
                _GraphQL = New GraphQLInterface(_LogConfig, .BaseUrl, .Email, .Password, .CertificateFingerprint)
            End With
-            _Logger.Info($"baseUrl is: {oConfig.BaseUrl}")
+            _Logger.Info($"baseUrl is: {oConfigManager.Config.BaseUrl}")
            _Model = New GraphQLModel(_LogConfig, _MSSQL)
            _Writer = New GraphQLWriter(_LogConfig, _MSSQL)

--- a/Jobs/Jobs.vbproj
+++ b/Jobs/Jobs.vbproj
@@ -1,69 +1,292 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Jobs</RootNamespace>
    <AssemblyName>DigitalData.Modules.Jobs</AssemblyName>
+    <FileAlignment>512</FileAlignment>
    <MyType>Empty</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <StartupObject />
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.Jobs</AssemblyTitle>
-    <Company>Digital Data</Company>
-    <Product>Modules.Jobs</Product>
-    <Copyright>Copyright © 2025</Copyright>
-    <AssemblyVersion>3.5.0.0</AssemblyVersion>
-    <FileVersion>3.5.0.0</FileVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>
    </DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>
    </DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Interfaces\Interfaces.vbproj" />
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
-    <PackageReference Include="DocumentFormat.OpenXml.Framework" Version="3.2.0" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />
-    <PackageReference Include="GdPicture" Version="14.3.22" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="OpenMcdf" Version="2.4.1" />
-    <PackageReference Include="protobuf-net" Version="3.2.46" />
-    <PackageReference Include="protobuf-net.Core" Version="3.2.46" />
-    <PackageReference Include="RtfPipe" Version="2.0.7677.4303" />
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageReference Include="System.IO.Packaging" Version="8.0.1" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.6" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <PackageReference Include="System.Drawing.Common" Version="10.0.1" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Update="My Project\Settings.Designer.vb">
+    <None Include="App.config" />
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Interfaces\Interfaces.vbproj">
+      <Project>{ab6f09bf-e794-4f6a-94bb-c97c0ba84d64}</Project>
+      <Name>Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Logging\Logging.vbproj">
+      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ADSync\ADSyncArgs.vb" />
+    <Compile Include="ADSync\ADSyncJob.vb" />
+    <Compile Include="GraphQL\GraphQLArgs.vb" />
+    <Compile Include="GraphQL\GraphQLConfig.vb" />
+    <Compile Include="GraphQL\GraphQLJob.vb" />
+    <Compile Include="GraphQL\GraphQLModel.vb" />
+    <Compile Include="GraphQL\GraphQLQuery.vb" />
+    <Compile Include="GraphQL\GraphQLWriter.vb" />
+    <Compile Include="ZUGFeRD\ErrorCode.vb" />
+    <Compile Include="ZUGFeRD\EmailData.vb" />
+    <Compile Include="ZUGFeRD\EmailFunctions.vb" />
+    <Compile Include="ZUGFeRD\EmailStrings.vb" />
+    <Compile Include="ZUGFeRD\FileFunctions.vb" />
+    <Compile Include="ZUGFeRD\HashFunctions.vb" />
+    <Compile Include="ZUGFeRD\HistoryFunctions.vb" />
+    <Compile Include="ZUGFeRD\ImportZUGFeRDFiles.vb" />
+    <Compile Include="ZUGFeRD\WorkerArgs.vb" />
+    <Compile Include="Exceptions.vb" />
+    <Compile Include="JobInterface.vb" />
+    <Compile Include="JobBase.vb" />
+    <Compile Include="JobArgs.vb" />
+    <Compile Include="JobConfig.vb" />
+    <Compile Include="JobConfigParser.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
      <DependentUpon>Settings.settings</DependentUpon>
    </Compile>
+    <Compile Include="ZUGFeRD\XRechnungStrings.vb" />
+    <Compile Include="ZUGFeRD\XRechnungViewDocument.vb" />
  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.XML.Linq" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
 </Project>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,34 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-<Assembly: AssemblyTrademark("3.0.3.0")>
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden 
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Jobs")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("Modules.Jobs")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
+<Assembly: AssemblyTrademark("2.9.3.0")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("48b3071f-049c-4c84-b272-f197c1db2652")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion 
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
+' übernehmen, indem Sie "*" eingeben:
+
+<Assembly: AssemblyVersion("2.9.4.0")>
+<Assembly: AssemblyFileVersion("2.9.4.0")>
--- a/Jobs/ZUGFeRD/HashFunctions.vb
+++ b/Jobs/ZUGFeRD/HashFunctions.vb
@@ -33,6 +33,11 @@ Public Class HashFunctions
        End If

        ' Check if Checksum exists in History Table
+        'Dim oCheckCommand = $"SELECT * FROM TBEDM_ZUGFERD_HISTORY_IN WHERE GUID = (SELECT MAX(GUID) FROM TBEDM_ZUGFERD_HISTORY_IN WHERE UPPER(MD5HASH) = UPPER('{oMD5CheckSum}'))"
+        'Dim oTable As DataTable = _firebird.GetDatatable(oCheckCommand, Firebird.TransactionMode.NoTransaction)
+
+        ' Check if Checksum exists in History Table
+        ' TODO: WHAT THE FUCK IS THIS
        Dim oCheckCommand = $"SELECT * FROM TBEMLP_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBEMLP_HISTORY WHERE UPPER(MD5HASH) = UPPER('{oMD5CheckSum}'))"
        Dim oTable As DataTable = Database.GetDatatable(oCheckCommand, MSSQLServer.TransactionMode.NoTransaction)

--- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -11,7 +11,6 @@ Imports DigitalData.Modules.Interfaces.Exceptions
 Imports DigitalData.Modules.Interfaces.PropertyValues
 Imports DigitalData.Modules.Jobs.Exceptions
 Imports DigitalData.Modules.Logging
-Imports GdPicture14

 Public Class ImportZUGFeRDFiles
    Implements IJob
@@ -28,35 +27,10 @@ Public Class ImportZUGFeRDFiles

    Private Const DIRECTORY_DONT_MOVE = "DIRECTORY_DONT_MOVE"

-    Private Const MIME_TYPE_PDF = "application/pdf"
-    Private Const MIME_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-    Private Const MIME_TYPE_ODT = "application/vnd.oasis.opendocument.spreadsheet"
-
    ' 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 New List(Of String) From {"docx", "doc", "pdf", "xls", "xlsx", "ppt", "pptx", "txt"}

-    ' List of the Columns we need to store embedded files on disk and database
-    Private ReadOnly EmbeddedFilesColumnNames As List(Of String) = New List(Of String) From {
-            "ATTACHMENT_FILE_FILENAME", "ATTACHMENT_FILE_VALUE", "ATTACHMENT_FILE_MIMECODE"
-        }
-
-    ' List of the allowed MIME-Codes 
-    ' Allowed Values are:
-    '- application/pdf
-    '- application/vnd.openxmlformats-officedocument.spreadsheetml.sheet (xlsx)
-    '- application/vnd.oasis.opendocument.spreadsheet (odt)
-    '- image/jpeg
-    '- image/png  
-    '- image/tiff (UBL)
-    '- text/csv  
-    '- text/xml (UBL)
-    Private ReadOnly AllowedMimeTypesInEmbeddedFiles As List(Of String) = New List(Of String) From {
-            MIME_TYPE_PDF,
-            MIME_TYPE_XLSX,
-            MIME_TYPE_ODT
-        }
-
    Private ReadOnly _logger As Logger
    Private ReadOnly _logConfig As LogConfig
    Private ReadOnly _filesystem As FilesystemEx
@@ -104,8 +78,7 @@ Public Class ImportZUGFeRDFiles
        _xRechnungCreator = New XRechnungViewDocument(_logConfig, _mssql, _gdpictureLicenseKey)
        _logger.Debug("Registering GDPicture License")
        If _mssql IsNot Nothing Then
-            ' TODO: ConfigDbFunct is missing. Please implement or reference a method to retrieve the GDPicture license key as required by your business logic.
-            Throw New NotImplementedException("ConfigDbFunct.GetProductLicense is missing. Please provide an implementation to retrieve the GDPicture license key.")
+            _gdpictureLicenseKey = ConfigDbFunct.GetProductLicense("GDPICTURE", "11.2024", _logConfig, _mssql.CurrentConnectionString)
        Else
            _logger.Warn("GDPicture License could not be registered! MSSQL is not enabled!")
            Throw New ArgumentNullException("MSSQL")
@@ -167,6 +140,8 @@ Public Class ImportZUGFeRDFiles
                ' Start a new transaction for each file group.
                ' This way we can rollback database changes for the whole filegroup in case something goes wrong.
                Dim oSQLConnection As SqlConnection = _mssql.GetConnection()
+
+
                Dim oSQLTransaction As SqlTransaction = oSQLConnection?.BeginTransaction()

                Dim oConnections As New DatabaseConnections() With {
@@ -219,7 +194,7 @@ Public Class ImportZUGFeRDFiles
                        End If

                        If oResult.ZugferdFileFound = True Then
-                            _logger.Debug("eInvoice File found")
+                            _logger.Debug("Zugferd File found")
                            oMD5CheckSum = oResult.MD5Checksum
                            oZUGFeRDCount = oResult.ZugferdFileCount
                            oEmailAttachmentFiles.AddRange(oResult.EmailAttachmentFiles)
@@ -336,7 +311,7 @@ Public Class ImportZUGFeRDFiles
                    Dim oBody = String.Format(EmailStrings.EMAIL_TOO_MUCH_FERDS, oEmailData.Subject)

                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.TooMuchFerdsException, "", "")
-                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt mehr als ein eInvoice-Dokument", "", oSQLTransaction)
+                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt mehr als ein ZUGFeRD-Dokument", "", oSQLTransaction)

                Catch ex As NoFerdsException
                    _logger.Error(ex)
@@ -349,7 +324,7 @@ Public Class ImportZUGFeRDFiles
                    Dim oBody = String.Format(EmailStrings.EMAIL_NO_FERDS, oEmailData.Subject)

                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.NoFerdsException, "", "")
-                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt keine eInvoice-Dokumente", "", oSQLTransaction)
+                    AddRejectedState(oMessageId, oRejectionCodeString, "Email enthielt keine ZUGFeRD-Dokumente", "", oSQLTransaction)

                Catch ex As MissingValueException
                    _logger.Error(ex)
@@ -368,7 +343,7 @@ Public Class ImportZUGFeRDFiles
                    Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)

                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "MissingValueException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.MissingValueException, oOrgFilename, oMissingFieldList)
-                    AddRejectedState(oMessageId, oRejectionCodeString, "Es fehlten eInvoice-Spezifikationen", "", oSQLTransaction)
+                    AddRejectedState(oMessageId, oRejectionCodeString, "Es fehlten ZugferdSpezifikationen", "", oSQLTransaction)

                Catch ex As FileSizeLimitReachedException
                    _logger.Error(ex)
@@ -401,7 +376,7 @@ Public Class ImportZUGFeRDFiles
                    Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
                    Dim oEmailData As New EmailData With {
                        .From = oArgs.ExceptionEmailAddress,
-                        .Subject = $"OutOfMemoryException im eInvoice-Parser @ {oMessageId}"
+                        .Subject = $"OutOfMemoryException im ZUGFeRD-Parser @ {oMessageId}"
                    }
                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "OutOfMemoryException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)

@@ -424,7 +399,7 @@ Public Class ImportZUGFeRDFiles
                        Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
                        Dim oEmailData As New EmailData With {
                            .From = oArgs.ExceptionEmailAddress,
-                            .Subject = $"UnhandledException im eInvoice-Parser @ {oMessageId}"
+                            .Subject = $"UnhandledException im ZUGFeRD-Parser @ {oMessageId}"
                        }
                        _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "UnhandledException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)

@@ -440,8 +415,7 @@ Public Class ImportZUGFeRDFiles
                        If oMoveDirectory = DIRECTORY_DONT_MOVE Then
                            _logger.Info("Application Error occurred. Files for message Id {0} will not be moved.", oMessageId)

-                        ElseIf oArgs.AllowXRechnung And oIsSuccess And
-                            oEInvoiceFileGroup.Item(0).Extension.Equals(".xml", StringComparison.OrdinalIgnoreCase) = True Then
+                        ElseIf oArgs.AllowXRechnung And oIsSuccess And oEInvoiceFileGroup.Item(0).Extension = ".xml" Then
                            _logger.Debug("Before Creating the PDF-File from XML data / Before Commit")

                            oxRechnungHandle = True
@@ -481,7 +455,7 @@ Public Class ImportZUGFeRDFiles
                        Dim oBody = _email.CreateBodyForUnhandledException(oMessageId, ex)
                        Dim oEmailData As New EmailData With {
                            .From = oArgs.ExceptionEmailAddress,
-                            .Subject = $"FileMoveException im eInvoice-Parser @ {oMessageId}"
+                            .Subject = $"FileMoveException im ZUGFeRD-Parser @ {oMessageId}"
                        }
                        _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "FileMoveException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)

@@ -560,46 +534,36 @@ Public Class ImportZUGFeRDFiles

        Try
            oDocument = _zugferd.GetSerializedXMLContentFromFile(pFile)
-            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_XML

        Catch ex As ValidationException
            Throw ex

        Catch ex As ZUGFeRDExecption
+            Select Case ex.ErrorType
+                Case ZUGFeRDInterface.ErrorType.NoZugferd
+                    _logger.Info("File [{0}] is not a valid ZUGFeRD document. Skipping.", pFile.Name)

-            If ex.ErrorCode > 0 Then
-                _logger.Info("New Rejection Logik")
+                    oResult.EmailAttachmentFiles.Add(pFile)
+                    Return oResult

-                Select Case ex.ErrorCode
-                    Case ErrorCode.NoFerdsException
-                        _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)
+                Case ZUGFeRDInterface.ErrorType.UnsupportedFormat
+                    _logger.Info("File [{0}/{1}] is an unsupported ZUFeRD document format!", pFile.Name, ex.XmlFile)
+                    Throw New UnsupportedFerdException(ex.XmlFile)

-                        oResult.EmailAttachmentFiles.Add(pFile)
-                        Return oResult
+                Case ZUGFeRDInterface.ErrorType.NoValidZugferd
+                    _logger.Info("File [{0}] is an Incorrectly formatted ZUGFeRD document!", pFile.Name)
+                    Throw New InvalidFerdException()

-                    Case ErrorCode.UnsupportedFerdException
-                        _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
-                        Throw New UnsupportedFerdException(ex.XmlFile)
+                Case Else
+                    _logger.Warn("Unexpected Error occurred while extracting ZUGFeRD Information from file {0}", pFile.Name)
+                    Throw ex
+            End Select

-                    Case ErrorCode.InvalidFerdException
-                        _logger.Info("File [{0}] is an incorrectly formatted eInvoice document!", pFile.Name)
-                        Throw New InvalidFerdException()
-
-                    Case Else
-                        _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
-                        Throw ex
-
-                End Select
-            End If
        End Try

        Try
-            Dim sqlResult As Boolean = False
-
-            If oDocument IsNot Nothing Then
-                sqlResult = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs, oResult)
-            End If
-
+            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_XML
+            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs)
        Catch ex As Exception
            Throw ex
        End Try
@@ -642,37 +606,30 @@ Public Class ImportZUGFeRDFiles

        Try
            oDocument = _zugferd.ExtractZUGFeRDFileWithGDPicture(pFile.FullName)
-            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_PDF

        Catch ex As ValidationException
            Throw ex

        Catch ex As ZUGFeRDExecption
-            If ex.ErrorCode > 0 Then
-                _logger.Info("New Rejection Logik")
+            Select Case ex.ErrorType
+                Case ZUGFeRDInterface.ErrorType.NoZugferd
+                    _logger.Info("File [{0}] is not a valid ZUGFeRD document. Skipping.", pFile.Name)

-                Select Case ex.ErrorCode
-                    Case ErrorCode.NoFerdsException
-                        _logger.Info("File [{0}] is not a valid eInvoice document. Skipping.", pFile.Name)
+                    oResult.EmailAttachmentFiles.Add(pFile)
+                    Return oResult

-                        oResult.EmailAttachmentFiles.Add(pFile)
-                        Return oResult
+                Case ZUGFeRDInterface.ErrorType.UnsupportedFormat
+                    _logger.Info("File [{0}/{1}] is an unsupported ZUFeRD document format!", pFile.Name, ex.XmlFile)
+                    Throw New UnsupportedFerdException(ex.XmlFile)

-                    Case ErrorCode.UnsupportedFerdException
-                        _logger.Info("File [{0}/{1}] is an unsupported eInvoice document format!", pFile.Name, ex.XmlFile)
-                        Throw New UnsupportedFerdException(ex.XmlFile)
-
-                    Case ErrorCode.InvalidFerdException
-                        _logger.Info("File [{0}] is an incorrectly formatted eInvoice document!", pFile.Name)
-                        Throw New InvalidFerdException()
-
-                    Case Else
-                        _logger.Warn("Unexpected Error occurred while extracting eInvoice Information from file {0}", pFile.Name)
-                        Throw ex
-
-                End Select
-            End If
+                Case ZUGFeRDInterface.ErrorType.NoValidZugferd
+                    _logger.Info("File [{0}] is an Incorrectly formatted ZUGFeRD document!", pFile.Name)
+                    Throw New InvalidFerdException()

+                Case Else
+                    _logger.Warn("Unexpected Error occurred while extracting ZUGFeRD Information from file {0}", pFile.Name)
+                    Throw ex
+            End Select
        End Try

        ' Check if there are more than one ZUGFeRD files
@@ -695,7 +652,8 @@ Public Class ImportZUGFeRDFiles
        End If

        Try
-            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs, oResult)
+            oDocument.ReceiptFileType = ZUGFeRDInterface.RECEIPT_TYPE_PDF
+            Dim sqlResult As Boolean = StoreXMLItemsInDatabase(pMessageId, oDocument, pFile, pConnections, pArgs)
        Catch ex As Exception
            Throw ex
        End Try
@@ -712,12 +670,12 @@ Public Class ImportZUGFeRDFiles

    End Function

-    Private Function StoreXMLItemsInDatabase(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pFile As FileInfo, pConnections As DatabaseConnections, pArgs As WorkerArgs, pProcessFileResult As ProcessFileResult) As Boolean
+    Private Function StoreXMLItemsInDatabase(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pFile As FileInfo, pConnections As DatabaseConnections, pArgs As WorkerArgs) As Boolean
        ' Check the document against the configured property map and return:
        ' - a List of valid properties 
        ' - a List of missing properties

-        Dim oPropertyMap As Dictionary(Of String, XmlItemProperty) = _zugferd.FilterPropertyMap(pArgs.PropertyMapList, pDocument.Specification)
+        Dim oPropertyMap = _zugferd.FilterPropertyMap(pArgs.PropertyMap, pDocument.Specification)
        Dim oCheckResult = _zugferd.PropertyValues.CheckPropertyValues(pDocument.SchemaObject, oPropertyMap, pMessageId)

        _logger.Info("Properties checked: [{0}] missing properties / [{1}] valid properties found.", oCheckResult.MissingProperties.Count, oCheckResult.ValidProperties.Count)
@@ -735,359 +693,39 @@ Public Class ImportZUGFeRDFiles
            Throw New Exception("Bulk Insert failed! Exiting.")
        End If

+        ' TODO hier BAUSTELLE 
        ' Eingebettete Dateien speichern
-        If HandleEmbeddedAttachments(pMessageId, pDocument, pConnections, oCheckResult, pArgs, pProcessFileResult) = False Then
-            _logger.Debug("Files saving for MessageId [{0}] failed!", pMessageId)
-        End If
+        'If CreateEmbeddedFilesOnDisk(pMessageId, pDocument, pConnections, oCheckResult) = False Then
+        '    _logger.Debug("Files saving for MessageId [{0}] failed!", pMessageId)
+        'End If

        Return True
    End Function

-    ''' <summary>
-    ''' Hier werden die Dateianhänge behandelt, die im XML als base64 eingetragen wurden.
-    ''' Die zusammengehörigen Knoten müssen über "FILES" gruppiert werden!
-    ''' 
-    ''' Die erwarteten Knoten-Namen sind in der List EmbeddedFilesColumnNames enthalten!
-    ''' </summary>
-    Private Function HandleEmbeddedAttachments(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pConnections As DatabaseConnections,
-                                               pCheckResult As CheckPropertyValuesResult, pArgs As WorkerArgs, pProcessFileResult As ProcessFileResult) As Boolean
+    Private Function CreateEmbeddedFilesOnDisk(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pConnections As DatabaseConnections, pCheckResult As CheckPropertyValuesResult) As Boolean

-        If (pCheckResult Is Nothing) Then
-            _logger.Debug("pCheckResult is empty!")
-            Return True
-        End If
-
-        If (CheckEmbeddedAttachmentEntries(pCheckResult) = False) Then
-            _logger.Debug("No embedded Files in XML found!")
-            Return True
-        End If
-
-        Dim embAttachmentList As List(Of ValidProperty) = pCheckResult.ValidProperties.Where(
-            Function(z)
-                Return EmbeddedFilesColumnNames.Contains(z.TableColumn)
-            End Function
-            ).ToList()
-
-        If embAttachmentList Is Nothing OrElse embAttachmentList.Count <= 0 Then
-            _logger.Debug("No Fields for Embedded Files configured!")
-            Return True
-        End If
-
-        ' GroupCounter Werte in Hashset eintragen, um distinct Werte zu erhalten
-        Dim oIndexList As HashSet(Of Integer) = New HashSet(Of Integer)
-        For Each resultItem In embAttachmentList
-            oIndexList.Add(resultItem.GroupCounter)
-        Next
-
-        Dim oOutputPath As String = GetOutputPathForEmbeddedAttachments(pArgs)
-        Dim nextAttachmentIndex As Integer = 0
-        nextAttachmentIndex = GetNextAttachmentIndex(pMessageId)
-        If nextAttachmentIndex <= 0 Then
-            nextAttachmentIndex = 1
-        End If
-
-        For Each groupIndex In oIndexList
-
-            Dim oMimeCodeString As String = String.Empty
-            Dim oOrgFilename As String = String.Empty
-            Dim oBase64String As String = String.Empty
-
-            Dim oMimeTypeProperty As ValidProperty = GetIndexProperty(embAttachmentList, groupIndex, "ATTACHMENT_FILE_MIMECODE")
-
-            If oMimeTypeProperty IsNot Nothing AndAlso oMimeTypeProperty.Value.IsNotNullOrEmpty() Then
-                oMimeCodeString = oMimeTypeProperty.Value.ToLower()
-            Else
-                _logger.Debug("Empty MIME-Code! File can not be stored!")
-                Continue For
-            End If
-
-            Dim oFilenameProperty As ValidProperty = GetIndexProperty(embAttachmentList, groupIndex, "ATTACHMENT_FILE_FILENAME")
-            If oFilenameProperty IsNot Nothing AndAlso oFilenameProperty.Value.IsNotNullOrEmpty() Then
-                oOrgFilename = oFilenameProperty.Value
-            Else
-                _logger.Debug("Empty Filename! File can not be stored!")
-                Continue For
-            End If
-
-            Dim oBase64ValueProperty As ValidProperty = GetIndexProperty(embAttachmentList, groupIndex, "ATTACHMENT_FILE_VALUE")
-            If oBase64ValueProperty IsNot Nothing AndAlso oBase64ValueProperty.Value.IsNotNullOrEmpty() Then
-                oBase64String = oBase64ValueProperty.Value
-            Else
-                _logger.Error("Empty base64 String! File can not be stored!")
-                Continue For
-            End If
-
-            Dim newAttachmentFilename = pMessageId + "~attm" + nextAttachmentIndex.ToString
-
-            Dim oFileExtension = GetEmbeddedFileExtension(oMimeTypeProperty.Value)
-            If oFileExtension.IsNotNullOrEmpty() Then
-                newAttachmentFilename += "." + oFileExtension
-            Else
-                _logger.Warn("No extension found! File can not be stored!")
-                Continue For
-            End If
-
-            Dim embeddedFilePath = Path.Combine(oOutputPath, newAttachmentFilename)
-            _logger.Debug("Next Attachment File is [{0}]", embeddedFilePath)
-            If SaveBase64ToDisk(embeddedFilePath, oBase64String) = True Then
-                _logger.Debug("Saved file [{0}] to disk", embeddedFilePath)
-                pProcessFileResult.EmailAttachmentFiles.Add(New FileInfo(embeddedFilePath))
-            Else
-                _logger.Error("Could not save File to Disk!")
-                Dim oReasonString = "Could not save file " + newAttachmentFilename + " to disk."
-                AddRejectedState(pMessageId, oReasonString, "EMBEDDED FILE CONSISTENCY NOT OK", "Info GUI", pConnections.SQLServerTransaction)
-                Continue For
-            End If
-
-            If TestFileOnDisk(embeddedFilePath, oMimeCodeString) = False Then
-                _logger.Error("Could not save File to Disk!")
-                Dim oReasonString = "Validation of file " + newAttachmentFilename + " on disk was NOT succesfully."
-                AddRejectedState(pMessageId, oReasonString, "EMBEDDED FILE CONSISTENCY NOT OK", "Info GUI", pConnections.SQLServerTransaction)
-                Continue For
-            End If
-
-            If InsertAttachmentHistoryEntry(pMessageId, oOrgFilename, embeddedFilePath) = False Then
-                _logger.Error("Could not save attachment Data to DB!")
-                Return False
-            End If
-
-            If InsertEmbeddedFileDataToDB(pMessageId, oBase64String, oOrgFilename, oMimeCodeString, groupIndex) = False Then
-                _logger.Error("Could not save attachment Data to DB!")
-                Return False
-            End If
-
-            nextAttachmentIndex += 1
-        Next
+        ' Finde alle Eintraege in pCheckResult mit Item_Type=3
+        ' Finde Dateinamen (Index nach ~attm) und Dateityp. Wir speichern nur PDF.
+        ' TODO Funktion aufrufen
+        'SaveBase64ToDisk("", "") = False Then

        Return True
    End Function

-    Private Function TestFileOnDisk(pEmbeddedFilePath As String, pMimeCodeString As String) As Boolean
-        Try
-            If pMimeCodeString = MIME_TYPE_PDF Then
-                Dim oGdPicturePDF As New GdPicturePDF
-                Dim oStatus As GdPictureStatus = oGdPicturePDF.LoadFromFile(pEmbeddedFilePath, True)
-                If oStatus <> GdPictureStatus.OK Then
-                    _logger.Error("File [{0}] has no proper state!", pEmbeddedFilePath)
-                    Return False
-                End If
-
-            Else
-                ' Test other files
-                Dim fileInfo As FileInfo = New FileInfo(pEmbeddedFilePath)
-                If fileInfo.Exists = False Then
-                    _logger.Error("Could not find File [{0}] on Disk!", pEmbeddedFilePath)
-                    Return False
-                End If
-            End If
-
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function
-
-    Private Function GetEmbeddedFileExtension(pMimeTypeValue As String) As String
-
-        If pMimeTypeValue.IsNullOrEmpty() Then
-            _logger.Warn("Empty MimeCode is not allowed!")
-            Return String.Empty
-        End If
-
-        Select Case pMimeTypeValue.ToLower()
-            Case MIME_TYPE_PDF
-                Return "pdf"
-            Case MIME_TYPE_XLSX
-                Return "xlsx"
-            Case MIME_TYPE_ODT
-                Return "odt"
-            Case "image/jpeg"
-                Return "jpg"
-            Case "image/png"
-                Return "png"
-            Case "image/tiff"
-                Return "tif"
-            Case "text/csv"
-                Return "csv"
-            Case "text/xml"
-                Return "xml"
-            Case Else
-                Return String.Empty
-        End Select
-
-    End Function
-
-    Private Shared Function GetIndexProperty(pListResult As List(Of ValidProperty), pGroupIndex As Integer, pTableColumn As String) As ValidProperty
-        Return pListResult.Where(
-        Function(z)
-            Return z.GroupCounter = pGroupIndex AndAlso z.TableColumn = pTableColumn
-        End Function
-        ).FirstOrDefault
-    End Function
-
-    ''' <summary>
-    ''' Speichert die Daten inkl. base64-String in die Datenbank
-    ''' </summary>
-    Private Function InsertEmbeddedFileDataToDB(pMessageId As String, pItemValue As String, pOrgFilename As String, pMimeType As String, pGroupIndex As Integer) As Boolean
-        Try
-            Dim oCommand = New SqlCommand(
-                "INSERT INTO TBEDMI_ITEM_FILES (
-                    REFERENCE_GUID,
-                    ITEM_VALUE,
-                    ORG_FILENAME,
-                    MIME_TYPE,
-                    GROUP_INDEX,
-                    CREATED_WHO
-                ) VALUES (
-                    @MESSAGE_ID,
-                    @ITEM_VALUE,
-                    @ORG_FILENAME,
-                    @MIME_TYPE,
-                    @GROUP_INDEX,
-                    @CREATED_WHO
-                )")
-
-            Dim fileBytes As Byte() = Convert.FromBase64String(pItemValue)
-
-            oCommand.Parameters.Add("MESSAGE_ID", SqlDbType.VarChar, 250).Value = pMessageId
-            oCommand.Parameters.Add("ITEM_VALUE", SqlDbType.VarBinary).Value = fileBytes
-            oCommand.Parameters.Add("ORG_FILENAME", SqlDbType.VarChar, 256).Value = pOrgFilename
-            oCommand.Parameters.Add("MIME_TYPE", SqlDbType.VarChar, 256).Value = pMimeType
-            oCommand.Parameters.Add("GROUP_INDEX", SqlDbType.Int).Value = pGroupIndex
-            oCommand.Parameters.Add("CREATED_WHO", SqlDbType.VarChar, 100).Value = "eInvoice Parser"
-
-            _mssql.ExecuteNonQuery(oCommand)
-
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-
-    End Function
-
-    ''' <summary>
-    ''' Ermittelt den Ausgabepfad für die eingebetteten Anhänge
-    ''' </summary>
-    Private Function GetOutputPathForEmbeddedAttachments(pArgs As WorkerArgs) As String
-        Return pArgs.WatchDirectory
-    End Function
-
-    ''' <summary>
-    ''' Prüft, ob Embedded Attachments in den XML-Ergebnissen enthalten sind,
-    ''' in dem geprüft wird, ob bestimmte MIME-Codes vorhanden sind.
-    ''' </summary>
-    ''' <param name="pCheckResult"></param>
-    ''' <returns></returns>
-    Private Function CheckEmbeddedAttachmentEntries(pCheckResult As CheckPropertyValuesResult) As Boolean
-
-        Try
-            Dim resultList = pCheckResult.ValidProperties.Where(
-            Function(z)
-                Return (z.TableColumn = "ATTACHMENT_FILE_MIMECODE" AndAlso AllowedMimeTypesInEmbeddedFiles.Contains(z.Value.ToLower()))
-            End Function
-            ).ToList()
-
-            If resultList.Count > 0 Then
-                _logger.Info("Found [{0}] embedded XML-Attachments.", resultList.Count)
-                Return True
-            Else
-                _logger.Info("No embedded XML-Attachments found.")
-                Return False
-            End If
-        Catch ex As Exception
-            _logger.Error("Error searching pCheckResult! {0}", ex.Message)
-            Return False
-        End Try
-
-    End Function
-
-
-    ''' <summary>
-    ''' Speichere base64 als Datei auf der Platte ab.
-    ''' </summary>
    Private Function SaveBase64ToDisk(pExportFilePath As String, pBase64String As String) As Boolean
-
        Try
+            Dim base64BinaryDataString As String = pBase64String ' Hier Base64-String einfügen
+            Dim binaryDataString As Byte() = System.Convert.FromBase64String(base64BinaryDataString)
            Dim oFilename As String = pExportFilePath
-            Dim base64BinaryDataString As String = pBase64String
-            Dim binaryDataString As Byte() = Convert.FromBase64String(base64BinaryDataString)
-
-            ' Using verwenden, um blockieren der Datei zu verhindern
-            Using fs = New FileStream(oFilename, FileMode.Create, FileAccess.ReadWrite)
-                fs.Write(binaryDataString, 0, binaryDataString.Length)
-                fs.Flush()
-                fs.Close()
-            End Using
-
-            Return True
-
+            Dim Stream As System.IO.FileStream = New System.IO.FileStream(oFilename, System.IO.FileMode.Create)
+            Stream.Write(binaryDataString, 0, binaryDataString.Length)
+            Stream.Close()
        Catch ex As Exception
-            _logger.Error("Could NOT save File [{0}] to Disk! Exception: [{1}]", pExportFilePath, ex.Message)
-            Return False
+            _logger.Error("Could NOT save File to Disk for MessageId [{0}] !", pExportFilePath)
+
        End Try

-    End Function
-
-    ''' <summary>
-    ''' Die Methode lädt die bisherigen Dateinamen zu einer MessageID
-    ''' Die Datei mit dem höchsten Index gibt den folgenden Index vor.
-    ''' </summary>
-    ''' <returns>Nächster Attachment Index</returns>
-    Private Function GetNextAttachmentIndex(pMessageId As String) As Integer
-        Try
-            Dim oSQL = $"SELECT count(*) FROM TBEMLP_HISTORY_ATTACHMENT WHERE EMAIL_MSGID = '{pMessageId}'"
-
-            Dim sqlResult = _mssql.GetScalarValue(oSQL)
-            If sqlResult = 0 Then
-                sqlResult = 1 ' Kleinster Index = 1
-            End If
-
-            Return sqlResult
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    ''' <summary>
-    ''' Speichert die Infos zu einem embedded Dateianhang in die DB.
-    ''' Mangels EMail-Daten werden die EMail-Felder (FROM, BODY, usw.) nicht gefüllt
-    ''' </summary>
-    ''' <returns>true, wenn erfolgreich</returns>
-    Private Function InsertAttachmentHistoryEntry(pMessageId As String, pFileName As String, pNewFileName As String) As Boolean
-
-        Try
-            Dim oCommand = New SqlCommand(
-                "INSERT INTO TBEMLP_HISTORY_ATTACHMENT (
-                    WORK_PROCESS,
-                    EMAIL_MSGID,
-                    EMAIL_ATTMT,
-                    EMAIL_ATTMT_INDEX,
-                    EMAIL_FROM,
-                    EMAIL_BODY
-                ) VALUES (
-                    @WORK_PROCESS,
-                    @MESSAGE_ID,
-                    @ATTACHMENT,
-                    @ATTACHMENT_INDEX,
-                    '-',
-                    '-'
-                )")
-
-            oCommand.Parameters.Add("WORK_PROCESS", SqlDbType.VarChar, 100).Value = "Attachment Sniffer (Embedded Files)"
-            oCommand.Parameters.Add("MESSAGE_ID", SqlDbType.VarChar, 500).Value = pMessageId
-            oCommand.Parameters.Add("ATTACHMENT", SqlDbType.VarChar, 500).Value = pFileName
-            oCommand.Parameters.Add("ATTACHMENT_INDEX", SqlDbType.VarChar, 500).Value = pNewFileName
-
-            _mssql.ExecuteNonQuery(oCommand)
-
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
+        Return True
    End Function

    Private Function BulkInsertDataToDatabase(pMessageId As String, pDocument As ZUGFeRDInterface.ZugferdResult, pConnections As DatabaseConnections, pCheckResults As CheckPropertyValuesResult) As Boolean
@@ -1133,7 +771,7 @@ Public Class ImportZUGFeRDFiles
        ' Erste Zeile enthält die Spezifikation
        Dim oFirstRow As DataRow = oDataTable.NewRow()
        oFirstRow("REFERENCE_GUID") = pMessageId
-        oFirstRow("ITEM_DESCRIPTION") = "Verwendete Spezifikation der E-Rechnung"
+        oFirstRow("ITEM_DESCRIPTION") = "ZUGFeRDSpezifikation"
        oFirstRow("ITEM_VALUE") = pDocument.Specification
        oFirstRow("GROUP_COUNTER") = 0
        oFirstRow("SPEC_NAME") = "ZUGFERD_SPECIFICATION"
@@ -1145,7 +783,7 @@ Public Class ImportZUGFeRDFiles
        ' Zweite Zeile enthält das verwendete XML Schema
        Dim oSecondRow As DataRow = oDataTable.NewRow()
        oSecondRow("REFERENCE_GUID") = pMessageId
-        oSecondRow("ITEM_DESCRIPTION") = "Verwendetes XML-Schema (XSD) der E-Rechnung"
+        oSecondRow("ITEM_DESCRIPTION") = "ZUGFeRDXMLSchema"
        oSecondRow("ITEM_VALUE") = pDocument.UsedXMLSchema
        oSecondRow("GROUP_COUNTER") = 0
        oSecondRow("SPEC_NAME") = "ZUGFERD_XML_SCHEMA"
@@ -1157,7 +795,7 @@ Public Class ImportZUGFeRDFiles
        ' Dritte Zeile enthält das verwendete Datei-Format des Belegs (PDF/XML)
        Dim oThirdRow As DataRow = oDataTable.NewRow()
        oThirdRow("REFERENCE_GUID") = pMessageId
-        oThirdRow("ITEM_DESCRIPTION") = "Dateityp der E-Rechnung"
+        oThirdRow("ITEM_DESCRIPTION") = "ReceiptFileType"
        oThirdRow("ITEM_VALUE") = pDocument.ReceiptFileType
        oThirdRow("GROUP_COUNTER") = 0
        oThirdRow("SPEC_NAME") = "RECEIPT_FILE_TYPE"
@@ -1173,12 +811,6 @@ Public Class ImportZUGFeRDFiles
                Continue For
            End If

-            ' ItemType = 0 (normale texte) dürfen nicht leer sein
-            If oProperty.ItemType = 0 And oProperty.Value.IsNullOrEmpty Then
-                _logger.Debug("No Mapping for Property [{0}] with empty value, because of ItemType = 0.", oProperty.TableColumn)
-                Continue For
-            End If
-
            ' If GroupCounter is -1, it means this is a default property that can only occur once.
            ' Set the actual inserted value to 0
            Dim oGroupCounterValue As Integer = oProperty.GroupCounter
@@ -1186,27 +818,19 @@ Public Class ImportZUGFeRDFiles
                oGroupCounterValue = 0
            End If

-            If oProperty.Value.Length > 4000 Then
-                _logger.Warn("Value for field [{0}] is longer than 4000 characters, will be truncated!", oProperty.TableColumn)
-                oProperty.Value = oProperty.Value.Truncate(4000)
-            End If
-
-            Dim oDescription As String
-            If oProperty.EN16931_ID IsNot Nothing AndAlso oProperty.EN16931_ID.Length > 1 Then
-                oDescription = oProperty.EN16931_ID + " (" + oProperty.Description + ")"
-            Else
-                oDescription = oProperty.Description
+            If oProperty.Value.Length > 900 Then
+                _logger.Warn("Value for field [{0}] is longer than 900 characters, will be truncated!", oProperty.TableColumn)
            End If

            Dim oNewRow As DataRow = oDataTable.NewRow()
            oNewRow("REFERENCE_GUID") = pMessageId
-            oNewRow("ITEM_DESCRIPTION") = oDescription
-            oNewRow("ITEM_VALUE") = oProperty.Value
+            oNewRow("ITEM_DESCRIPTION") = oProperty.Description
+            oNewRow("ITEM_VALUE") = oProperty.Value.Truncate(900).Replace("'", "''")
            oNewRow("GROUP_COUNTER") = oGroupCounterValue
            oNewRow("SPEC_NAME") = oProperty.TableColumn
            oNewRow("IS_REQUIRED") = oProperty.IsRequired

-            _logger.Debug("Mapping Property [{0}] with value [{1}]", oProperty.TableColumn, oProperty.Value)
+            _logger.Debug("Mapping Property [{0}] with value [{1}]", oProperty.TableColumn, oProperty.Value.Replace("'", "''"))
            oDataTable.Rows.Add(oNewRow)
        Next

@@ -1224,15 +848,6 @@ Public Class ImportZUGFeRDFiles
            _logger.Warn("Step [{0}] with SQL [{1}] was not successful.", oStep, oDelSQL)
        End Try

-        Try
-            oDelSQL = $"DELETE FROM TBEDMI_ITEM_FILES where REFERENCE_GUID = '{pMessageId}'"
-            oStep = "TBEDMI_ITEM_FILES Delete MessageID Items"
-            Dim retValue As Boolean = _mssql.ExecuteNonQueryWithConnectionObject(oDelSQL, pConnections.SQLServerConnection, MSSQLServer.TransactionMode.ExternalTransaction, pConnections.SQLServerTransaction)
-            Return retValue
-        Catch ex As Exception
-            _logger.Warn("Step [{0}] with SQL [{1}] was not successful.", oStep, oDelSQL)
-        End Try
-
        Return False
    End Function

@@ -1256,10 +871,6 @@ Public Class ImportZUGFeRDFiles
        Return True
    End Function

-    ''' <summary>
-    ''' Fügt neue Datensätze in Tabelle TBEMLP_HISTORY_STATE ein,
-    ''' per Prozedur DD_ECM.[dbo].[PRCUST_ADD_HISTORY_STATE]
-    ''' </summary>
    Private Sub AddRejectedState(pMessageID As String, pTitle As String, pTitle1 As String, pComment As String, pTransaction As SqlTransaction)
        Try
            'PRCUST_ADD_HISTORY_STATE: @MessageID VARCHAR(250), @TITLE1 VARCHAR(250), @TITLE2 VARCHAR(250)
@@ -1269,5 +880,4 @@ Public Class ImportZUGFeRDFiles
            _logger.Error(ex)
        End Try
    End Sub
-
 End Class
--- a/Jobs/ZUGFeRD/WorkerArgs.vb
+++ b/Jobs/ZUGFeRD/WorkerArgs.vb
@@ -12,7 +12,7 @@ Public Class WorkerArgs
    Public NonZugferdDirectory As String = Nothing

    ' Property Parameter
-    Public PropertyMapList As New List(Of XmlItemProperty)
+    Public PropertyMap As New Dictionary(Of String, XmlItemProperty)

    ' Email Parameter
    Public EmailOutProfileId As Integer = 0
@@ -31,7 +31,6 @@ Public Class WorkerArgs
    Public AllowXRechnung As Boolean = True
    Public AllowZugferd10 As Boolean = True
    Public AllowZugferd2x As Boolean = True
-    Public AllowZugferd23x As Boolean = True
    Public AllowPeppolBISBill3x As Boolean = False

 End Class
--- a/Jobs/ZUGFeRD/XRechnungViewDocument.vb
+++ b/Jobs/ZUGFeRD/XRechnungViewDocument.vb
@@ -7,9 +7,6 @@ Imports DigitalData.Modules.Logging
 Imports GdPicture14
 Imports System.Drawing
 Imports System.Linq
-Imports System.Text.RegularExpressions
-'11.11.2025
-
 Public Class XRechnungViewDocument
    Private ReadOnly _logger As Logger
    Private ReadOnly _logConfig As LogConfig
@@ -19,6 +16,8 @@ Public Class XRechnungViewDocument
    Private fontResName As String
    Private fontResNameBold As String
    Private fontResNameItalic As String
+    Private MyGDPicturePDF As GdPicturePDF
+
    Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer, GDPictureLicenseKey As String)
        _logConfig = LogConfig
        _logger = LogConfig.GetLogger()
@@ -26,54 +25,39 @@ Public Class XRechnungViewDocument
        _file = New ZUGFeRD.FileFunctions(LogConfig, MSSQL)
        _gdpictureLicenseKey = GDPictureLicenseKey
    End Sub
-    Public Function Create_PDFfromXML(pXmlFile As FileInfo, pDTItemValues As DataTable) As FileInfo
+    Public Function Create_PDFfromXML(oxmlFile As FileInfo, pDTItemValues As DataTable) As FileInfo

        _logger.Debug("Create_PDFfromXML() Start")

        Try
-            Dim LicenseManager = New LicenseManager()
-            LicenseManager.RegisterKEY(_gdpictureLicenseKey)
-            Dim oXRechnungFile = pXmlFile.FullName
+            Dim oXRechnungFile = oxmlFile.FullName
            Dim oNewFileinfo As FileInfo
-            Dim oXmlFilePath = pXmlFile.FullName
-            Dim oViewRecieptFilename = pXmlFile.Name
-            Dim oTempFilePath = Path.Combine(Path.GetDirectoryName(oXmlFilePath), "temp")
+            Dim oxmlFilePath = oxmlFile.FullName
+            Dim oViewRecieptFilename = oxmlFile.Name
+            Dim oTempFilePath = Path.GetDirectoryName(oxmlFilePath) + "\Temp"
            If Not Directory.Exists(oTempFilePath) Then
                Directory.CreateDirectory(oTempFilePath)
            End If

-            oTempFilePath = Path.Combine(oTempFilePath, "xrechnung.xml")
+            oTempFilePath = oTempFilePath + "\xrechnung.xml"
            If File.Exists(oTempFilePath) Then
                File.Delete(oTempFilePath)
            End If
-
-
-
-
-            pXmlFile = New FileInfo(oTempFilePath)
-
-            'oViewRecieptFilename = oViewRecieptFilename.Replace(".xml", ".pdf")
-            oViewRecieptFilename = Regex.Replace(oViewRecieptFilename, ".xml", ".pdf", RegexOptions.IgnoreCase)
-            Dim MyGDPicturePDF = New GdPicturePDF
-
-            Dim oPDFStatus As GdPictureStatus = MyGDPicturePDF.NewPDF(PdfConformance.PDF_A_3a)
-
-            If oPDFStatus <> GdPictureStatus.OK Then
-                _logger.Warn($"Error initializing PDF: {oPDFStatus}")
-                Return Nothing
-            End If
-
-            Dim oOutputPath = Path.Combine(Path.GetDirectoryName(oXmlFilePath), oViewRecieptFilename)
-            _logger.Debug("Create_PDFfromXML() Resulting PDF Filepath: [{0}]", oOutputPath)
+            File.Move(oxmlFilePath, oTempFilePath)
+            oxmlFile = New FileInfo(oTempFilePath)
+            oViewRecieptFilename = oViewRecieptFilename.Replace("xml", "pdf")
+            Dim oOutputPath = Path.GetDirectoryName(oxmlFilePath) + "\" + oViewRecieptFilename
            If File.Exists(oOutputPath) Then
                File.Delete(oOutputPath)
            End If

-
-            Dim oCreatedString = $"Maschinell erstellt durch / Automatically created by Digital Data E-Rechnung Parser: {Now.ToString}"
-
-
-
+            MyGDPicturePDF = New GdPicturePDF()
+            MyGDPicturePDF.NewPDF(PdfConformance.PDF_A_2a)
+            Dim oPDFStatus As GdPictureStatus = MyGDPicturePDF.NewPDF()
+            If oPDFStatus <> GdPictureStatus.OK Then
+                _logger.Warn($"Error initializing PDF: {oPDFStatus}")
+                Return Nothing
+            End If
            MyGDPicturePDF.SetOrigin(PdfOrigin.PdfOriginTopLeft)
            MyGDPicturePDF.SetMeasurementUnit(PdfMeasurementUnit.PdfMeasurementUnitMillimeter)
            MyGDPicturePDF.SetLineWidth(1)
@@ -85,24 +69,9 @@ Public Class XRechnungViewDocument
            'Create a New page
            MyGDPicturePDF.NewPage(PdfPageSizes.PdfPageSizeA4)
            ' Dim oCurrent As Integer = MyGDPicturePDF.GetCurrentPage()
-            'Den HEader erzeugen
-            Dim yPosition As Integer = 15
-            MyGDPicturePDF.SetTextSize(18)
-            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "xRechnung Sichtbeleg - xInvoice Visual Receipt")
-            yPosition += 10
-            MyGDPicturePDF.SetTextSize(10)
-            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row1)
-            yPosition += 5
-            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row2)
-            yPosition += 5
-            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row1)
-            yPosition += 5
-            MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row2)
-            'Den Footer erzeugen
-            MyGDPicturePDF.DrawLine(10, 280, 200, 280)
-
-            MyGDPicturePDF.DrawText(fontResName, 10, 285, oCreatedString)

+            Dim yPosition As Single = Create_PageHeader(False)
+            Create_PageFooter()

            Dim oArea As String = ""
            Dim oIsPosition As Boolean = False
@@ -118,9 +87,7 @@ Public Class XRechnungViewDocument
            Dim oIndex As Integer = 0
            Dim oYPlus As Integer = 0
            Dim oCreateTextBox As Boolean = False
-            Dim oInvHasDiscount As Boolean = False
-            Dim oYDyn As Integer = 0
-            Dim Former_oItemSPECNAME As String = ""
+            Dim oPosRowY As Integer = 0
            For Each oRow As DataRow In pDTItemValues.Rows
                Dim Y_eq_lastrow As Boolean = CBool(oRow.Item("Y_eq_lastrow"))
                Dim oRowCaption As String = oRow.Item("Row_Caption")
@@ -128,10 +95,7 @@ Public Class XRechnungViewDocument
                Dim oItemValue As String = oRow.Item("ITEM_VALUE")
                Dim oDisplay As Boolean = oRow.Item("Display")
                Dim oAreaSwitch As Boolean = False
-                Dim oDescriptionFollowup As Boolean = False
-                If oItemSPECNAME = "RECEIPT_ALLOWANCE_REASON" Then
-                    Console.WriteLine("Uiuiu")
-                End If
+
                If oRow.Item("Area") = "INTERNAL" Then
                    If oItemSPECNAME = "STATIC_Y_SWITCH" Then
                        yPosition = oItemValue
@@ -143,23 +107,8 @@ Public Class XRechnungViewDocument
                        _logger.Warn($"Could not create a second page. The error was: {oPDFStatus}")
                        Exit For
                    Else
-                        'Wieder einen Header und Footer erzeugen
-                        yPosition = 15
-                        MyGDPicturePDF.SetTextSize(18)
-                        MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "xRechnung Sichtbeleg - xInvoice Visual Receipt")
-                        yPosition += 10
-                        MyGDPicturePDF.SetTextSize(10)
-                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row1)
-                        yPosition += 5
-                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row2)
-                        yPosition += 5
-                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row1)
-                        yPosition += 5
-                        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row2)
-
-                        MyGDPicturePDF.DrawLine(10, 280, 200, 280)
-                        'Footer erzeugen
-                        MyGDPicturePDF.DrawText(fontResName, 10, 285, oCreatedString)
+                        yPosition = Create_PageHeader(True)
+                        Create_PageFooter()
                    End If
                    'oCurrent = MyGDPicturePDF.GetCurrentPage()
                End If
@@ -181,39 +130,30 @@ Public Class XRechnungViewDocument
                    If oArea = "TYPE" Then
                        oAREACaption = $"{Return_InvType(oItemValue)} [{oItemValue}]"
                    ElseIf oArea = "SELLER" Then
-                        oAREACaption = "Verkäufer / Seller:"
+                        oAREACaption = "Verkäufer/Seller:"
                    ElseIf oArea = "BUYER" Then
-                        oAREACaption = "Käufer / Buyer:"
+                        oAREACaption = "Käufer/Buyer:"
                    ElseIf oArea = "POSITION" Then
-                        oAREACaption = "Positionen / Positions:"
-                        oIsPosition = True
-                    ElseIf oArea = "ALLOWANCE" Then
-                        If oItemSPECNAME = "RECEIPT_ALLOWANCE_CHARGE_INDICATOR" Then
-                            If oItemValue = "False" Then
-                                oAREACaption = "Rabatt/Discount:"
-                                oInvHasDiscount = True
-                            Else
-                                oAREACaption = "Zuschlag/Surcharge:"
-                            End If
-                        Else
-                            oAREACaption = "Zu- oder Abschlag/Surcharge or Discount:"
-                        End If
+                        oAREACaption = "Positionen/Positions:"
                        oIsPosition = True
                    ElseIf oArea = "AMOUNT" Then
-                        oAREACaption = "Beträge / Amounts:"
+                        oAREACaption = "Beträge/Amounts:"
                        oCreateTextBox = True
                    ElseIf oArea = "TAXPOS" Then
-                        oAREACaption = "Steuerbeträge / Tax amounts:"
+                        oAREACaption = "Steuerbeträge/Tax amounts:"
                        oIsPosition = True
                    ElseIf oArea = "PAYMENT" Then
-                        oAREACaption = "Zahlungsinformationen / Payment details:"
+                        oAREACaption = "Zahlungsinformationen/Payment details:"
                    ElseIf oArea = "EXEMPTION" Then
-                        oAREACaption = "UST.-Befreiungsgrund / Exemption reason:"
+                        oAREACaption = "USt.-Befreiungsgrund/Exemption reason:"
                    Else
                        oAREACaption = String.Empty
                    End If

                    If Not oAREACaption = String.Empty Then
+                        If oArea = "AMOUNT" Then
+                            Dim oY = yPosition
+                        End If
                        'erste Area-Linie 
                        yPosition += 5
                        MyGDPicturePDF.DrawLine(10, yPosition, oWidthLine, yPosition)
@@ -227,21 +167,15 @@ Public Class XRechnungViewDocument
                            ' gdpicturePDF.DrawText(fontResName, 10, yPosition, XRechnungStrings.Seperator_Line)
                            yPosition += 5
                        ElseIf oArea = "POSITION" Then
+                            'Tabellendarstellung
                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "Pos#")
                            MyGDPicturePDF.DrawText(fontResName, 19, yPosition, "Anz./am.")
-                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, "Einh/Unit")
+                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, "Einh/unt")
                            MyGDPicturePDF.DrawText(fontResName, 50, yPosition, "Pos.Text")
-                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, "Steuer/Tax")
-                            MyGDPicturePDF.DrawText(fontResName, 181, yPosition, "Betrag/Sum")
-                        ElseIf oArea = "ALLOWANCE" Then
-                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "Pos#")
-                            ' MyGDPicturePDF.DrawText(fontResName, 20, yPosition, "Betrag/Amount")
-                            MyGDPicturePDF.DrawText(fontResName, 20, yPosition, "Grund/Reason")
-                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, "Steuer/Tax")
-                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, "Steuer/Tax")
-                            MyGDPicturePDF.DrawText(fontResName, 181, yPosition, "Betrag/Sum")
+                            MyGDPicturePDF.DrawText(fontResName, 164, yPosition, "Steuer/tax")
+                            MyGDPicturePDF.DrawText(fontResName, 181, yPosition, "Betrag/sum")
                            yPosition += 5
-                            oPosCount = 0
+                            'Tabellendarstellung Ende
                        ElseIf oArea = "EXEMPTION" Then

                        End If
@@ -256,30 +190,11 @@ Public Class XRechnungViewDocument
                        oIsPosition = True
                        If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
                            oPosCount += 1
-                            oYDyn = 0
-                            yPosition += 5
                            oPosTerm = ""
+                            oPosRowY = yPosition
                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
-                            ' 
-                            'Dim otextBoxYPos As Integer = yPosition - 3.5
-                            'MyGDPicturePDF.DrawTextBox(fontResName, 10, otextBoxYPos, 16, YCoo_TextBoxPlus5(otextBoxYPos),
-                            '                           TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
-                            '                          oPosCount)
+
                            MyGDPicturePDF.DrawText(fontResName, 19, yPosition, oItemValue)
-                            'Tabellendarstellung Ende
-                            oDisplay = False
-                            ' yPosition -= 5
-                        End If
-                    ElseIf oArea = "ALLOWANCE" Then
-                        oIsPosition = True
-                        Dim validNames As String() = {"POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_RECEIPT_ALLOWANCE_CHARGE_INDICATOR"}
-                        If validNames.Contains(oItemSPECNAME) Then
-                            oPosCount += 1
-                            oPosTerm = ""
-                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
-                            ' 
-                            Dim oCurrTerm = FormatCurrency(oItemValue, oCurrencySymbol)
-                            MyGDPicturePDF.DrawText(fontResName, 20, yPosition, oCurrTerm)
                            oDisplay = False
                        End If
                    ElseIf oArea = "TAXPOS" Then
@@ -297,115 +212,81 @@ Public Class XRechnungViewDocument
                    'INDIVIDUELLES VERHALTEN BEI Folge-ITEMS
                    _logger.Debug($"FollowItem - Area: [{oArea}] - ItemSpecname: [{oItemSPECNAME}] - ItemValue: [{oItemValue}]")
                    'Dim otextBoxYPos As Integer
-                    If oArea = "POSITION" Or oArea = "ALLOWANCE" Then
-                        If oItemSPECNAME <> Former_oItemSPECNAME And Former_oItemSPECNAME <> "" Then
-                            If oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" And Former_oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then
-                                oDescriptionFollowup = True
-                            Else
-                                Former_oItemSPECNAME = oItemSPECNAME
-                            End If
-                        Else
-                            Former_oItemSPECNAME = oItemSPECNAME
-                        End If
-                        If {"INVOICE_POSITION_AMOUNT", "POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT"}.Contains(oItemSPECNAME) Then
+                    If oArea = "POSITION" Then
+                        If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
                            oPosCount += 1
-                            If Not oDescriptionFollowup Then
-                                oYPlus = 0
-                                oYDyn = 0
-                            End If
+                            yPosition += 5
+                            oYPlus = 0
+
                            oPosTerm = ""
                            MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oPosCount)
-                            If oItemSPECNAME = "INVOICE_POSITION_AMOUNT" Then
-                                MyGDPicturePDF.DrawText(fontResName, 19, yPosition, oItemValue)
-                            ElseIf {"POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT"}.Contains(oItemSPECNAME) Then
-                                Dim oTerm = FormatCurrency(oItemValue, oCurrencySymbol)
-                                If oInvHasDiscount And oItemSPECNAME = "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT" And Not oTerm.StartsWith("-") Then
-                                    oTerm = "-" + oTerm
-                                End If
-                                MyGDPicturePDF.DrawText(fontResName, 181, yPosition, oTerm)
-                            Else
-                                If oYDyn = 0 Then
-                                    oYDyn = yPosition
-                                End If
-                                Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
-                                For Each olinepart As String In oPartsNL
-                                    Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 64)
-                                    ' Durchlaufen der einzelnen Teile in einer Schleife
-                                    For Each part As String In oParts
-                                        MyGDPicturePDF.DrawText(fontResName, 19, oYDyn, part)
-                                        oYDyn += 5
-                                        oYPlus += 5
-                                    Next
-                                Next
-                            End If
-
+                            oPosRowY = yPosition
+                            MyGDPicturePDF.DrawText(fontResName, 19, yPosition, oItemValue)
                            oDisplay = False
                        ElseIf oItemSPECNAME = "INVOICE_POSITION_UNIT_TYPE" Then
                            oYPlus = 0
                            Dim oUnit = Return_UnitType(oItemValue)
                            MyGDPicturePDF.DrawText(fontResName, 35, yPosition, oUnit)
                            oDisplay = False
-                        ElseIf {"POSITION_ALLOWANCE_REASON", "RECEIPT_ALLOWANCE_REASON", "INVOICE_POSITION_ARTICLE", "INVOICE_POSITION_ARTICLE_DESCRIPTION"}.Contains(oItemSPECNAME) Then
-                            'Tabellendarstellung
-                            If Not oDescriptionFollowup Then
-                                oYPlus = 0
-                            End If
-                            If oYDyn = 0 Then
-                                oYDyn = yPosition
-                            End If
-                            Dim oX = 50
-                            If oItemSPECNAME.Contains("ALLOWANCE") Then
-                                oX = 20
-                            End If
+                        ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE" Then
+                            oYPlus = 0
                            oPosDesc = ""
                            oPosDesc = oItemValue
-                            Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
+                            Dim oYDyn As Integer = yPosition - 5

+                            Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
                            For Each olinepart As String In oPartsNL
-                                Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 64)
+                                Dim oParts As List(Of String) = StringFunctions.SplitText_Length(olinepart, 67)
                                ' Durchlaufen der einzelnen Teile in einer Schleife
                                For Each part As String In oParts
-                                    MyGDPicturePDF.DrawText(fontResName, oX, oYDyn, part)
                                    oYDyn += 5
                                    oYPlus += 5
+                                    MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
                                Next
                            Next
+                            yPosition = oYDyn
                            oDisplay = False
-                        ElseIf oItemSPECNAME = "INVOICE_POSITION_NOTE" Then
-                            'Tabellendarstellung
-                            Dim cleanedText As String = RemoveNewlinesAndTabs(oItemValue)
-                            Dim oParts As List(Of String) = StringFunctions.SplitText_Length(cleanedText, 70)
-                            ' Durchlaufen der einzelnen Teile in einer Schleife
-                            If oYDyn = 0 Then
-                                oYDyn = yPosition
-                            End If
+                        ElseIf oItemSPECNAME = "INVOICE_POSITION_ARTICLE_DESCRIPTION" Or
+                               oItemSPECNAME = "INVOICE_POSITION_NOTE" Then
+                            _logger.Debug($"oItemSPECNAME: {oItemSPECNAME}")
+
+                            'Dim cleanedText As String = RemoveNewlinesAndTabs(oItemValue)
+                            'Dim oParts As List(Of String) = StringFunctions.SplitText_Length(cleanedText, 70)
+                            '' Durchlaufen der einzelnen Teile in einer Schleife
+                            Dim oYDyn As Integer = yPosition
                            Dim oPartsNL As List(Of String) = StringFunctions.SplitTextByNewLine(oItemValue)
                            For Each olinepart As String In oPartsNL
                                Dim oPartsPN As List(Of String) = StringFunctions.SplitText_Length(olinepart, 70)
                                ' Durchlaufen der einzelnen Teile in einer Schleife
                                For Each part As String In oPartsPN
-                                    MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
                                    oYDyn += 5
                                    oYPlus += 5
+                                    MyGDPicturePDF.DrawText(fontResName, 50, oYDyn, part)
                                Next
                            Next
+                            yPosition = oYDyn

-                            'oPosTerm += $" {oItemValue}"
                            oDisplay = False
-                        ElseIf {"INVOICE_TAXPOS_TAX_RATE", "INVOICE_TAXPOS_RATE", "POSITION_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_VAT_RATE"}.Contains(oItemSPECNAME) Then
-                            MyGDPicturePDF.DrawText(fontResName, 163, yPosition, $"{oItemValue} %")
-                            oDisplay = False
-                        ElseIf {"INVOICE_POSITION_TAX_AMOUNT"}.Contains(oItemSPECNAME) Then

-                            Dim oYPos = yPosition - 3.5
-                            Dim TAXTERM = FormatCurrency(oItemValue, oCurrencySymbol)
+                        ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TAX_RATE" Or oItemSPECNAME = "INVOICE_TAXPOS_RATE" Then
+
+                            MyGDPicturePDF.DrawText(fontResName, 164, oPosRowY, $"{oItemValue} %")
+                            oDisplay = False
+                        ElseIf oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" Then
+
+                            Dim oYPos = oPosRowY - 3.5
+                            Dim oBetrag As Decimal = oItemValue
+                            Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
+
+                            Dim TAXTERM = $"{oFormatiert} {oCurrencySymbol}"
                            MyGDPicturePDF.DrawTextBox(fontResName, 177, oYPos, 198, YCoo_TextBoxPlus5(oYPos),
                                                       TextAlignment.TextAlignmentFar, TextAlignment.TextAlignmentNear,
                                                      TAXTERM)
+                            oDisplay = False
                        End If
                        oItemValue = oPosTerm
                    ElseIf oArea = "HEAD" Then
-                        If {"INVOICE_DATE", "INVOICE_SERVICE_DATE"}.Contains(oItemSPECNAME) Then
+                        If oItemSPECNAME = "INVOICE_DATE" Or oItemSPECNAME = "INVOICE_SERVICE_DATE" Then
                            oItemValue = StringFunctions.DatetimeStringToGermanStringConverter(oItemValue, _logger)
                        End If
                    ElseIf oArea = "TAXPOS" Then
@@ -414,7 +295,10 @@ Public Class XRechnungViewDocument
                            oPosTerm = $"{oItemValue} %:"
                            oDisplay = False
                        ElseIf oItemSPECNAME = "INVOICE_TAXPOS_AMOUNT" Then
-                            oPosTerm += FormatCurrency(oItemValue, oCurrencySymbol)
+                            Dim oBetrag As Decimal = oItemValue
+                            Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
+                            oFormatiert += $" {oCurrencySymbol}"
+                            oPosTerm += $" {oFormatiert}"
                            oDisplay = False
                        ElseIf oItemSPECNAME = "INVOICE_TAXPOS_TYPE" Then
                            oPosTerm += $" {oItemValue}"
@@ -429,14 +313,16 @@ Public Class XRechnungViewDocument
                    If Y_eq_lastrow = False And oAreaSwitch = False Then
                        yPosition += 5
                    End If
-                    If oArea = "AMOUNT" Or oArea = "ALLOWANCE" Then
-
-                        Dim oCURRENCYFORMAT = {"INVOICE_TOTAL_TAX", "INVOICE_TOTAL_NET", "INVOICE_TOTAL_GROSS", "POSITION_ALLOWANCE_ACTUAL_AMOUNT", "RECEIPT_ALLOWANCE_ACTUAL_AMOUNT",
-                            "POSITION_ALLOWANCE_CALCULATION_PERCENT", "RECEIPT_ALLOWANCE_CALCULATION_PERCENT"}
-                        If oCURRENCYFORMAT.Contains(oItemSPECNAME) Then
-                            oItemValue = FormatCurrency(oItemValue, oCurrencySymbol)
+                    If oArea = "AMOUNT" Then
+                        If oItemSPECNAME = "INVOICE_TOTAL_TAX" Or oItemSPECNAME = "INVOICE_TOTAL_NET" Or oItemSPECNAME = "INVOICE_TOTAL_GROSS" Then
+                            Dim oBetrag As Decimal = oItemValue
+                            Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
+                            oFormatiert += $" {oCurrencySymbol}"
+                            oItemValue = oFormatiert
                        End If
                    End If
+
+
                    If oRowCaption <> String.Empty Then
                        'Zuerst die RowCaption
                        MyGDPicturePDF.DrawText(fontResName, 10, yPosition, oRowCaption)
@@ -449,6 +335,7 @@ Public Class XRechnungViewDocument
                        Else
                            MyGDPicturePDF.DrawText(fontResName, 70, yPosition, oItemValue)
                        End If
+
                    Else
                        If Y_eq_lastrow = True Then
                            MyGDPicturePDF.DrawText(fontResName, oRow.Item("xPosition"), yPosition, oItemValue)
@@ -475,45 +362,36 @@ Public Class XRechnungViewDocument

                        End If
                    End If
-                Else
-                    If oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" And oYPlus > 0 Then
-                        yPosition += oYPlus
-                    Else
-
-
-                    End If
+                    'Else
+                    '    'Tabellendarstellung 
+                    '    If oItemSPECNAME = "INVOICE_POSITION_TAX_AMOUNT" And oYPlus > 0 Then
+                    '        yPosition += oYPlus - 5
+                    '    End If
+                    '    'Tabellendarstellung Ende
                End If
                oIndex += 1
            Next
-            ' Dim oeinv_Format As PdfInvoiceDataFormat = PdfInvoiceDataFormat.ZUGFeRD_2_0
-            Dim oAttString = "E-invoice XML attachment"
-            If File.Exists(oXmlFilePath) Then
-                MyGDPicturePDF.EmbedFile(oXmlFilePath, oAttString)
-            Else
-                _logger.Info("XML File is not existing and could not be embedded!")
-                Return Nothing
-            End If
-
-            MyGDPicturePDF.EnableCompression(True)

+            Dim oeinv_Format As PdfInvoiceDataFormat = PdfInvoiceDataFormat.ZUGFeRD_2_0
+            MyGDPicturePDF.EmbedFile(oTempFilePath, "Rechnungsdaten im ZUGFeRD-XML-Format")
            'Finalize And save the PDF
            oPDFStatus = MyGDPicturePDF.SaveToFile(oOutputPath)
            If oPDFStatus = GdPictureStatus.OK Then
                _logger.Info("PDF VisualReceipt generated successfully!")
-                _logger.Debug("Vor MOVE... oxmlFilePath: [{0}] / oTempFilePath: [{1}]", oXmlFilePath, oTempFilePath)
-                File.Move(oXmlFilePath, oTempFilePath)
            Else
                _logger.Warn($"Error generating PDF VisualReceipt: {oPDFStatus}")
            End If
+
            'Release resources
            MyGDPicturePDF.CloseDocument()
            If oPDFStatus = GdPictureStatus.OK Then
-                ' File.Delete(oXRechnungFile)
+                File.Delete(oXRechnungFile)
                oNewFileinfo = New FileInfo(oOutputPath)
-                _logger.Info("Create_PDFfromXML() End successfully. File [{0}] written.", oNewFileinfo.FullName)
+
+                _logger.Debug("Create_PDFfromXML() End successfully")
                Return oNewFileinfo
            Else
-                _logger.Warn("Create_PDFfromXML() Ends with nothing")
+                _logger.Debug("Create_PDFfromXML() Ends with nothing")
                Return Nothing
            End If

@@ -522,43 +400,6 @@ Public Class XRechnungViewDocument
            Return Nothing
        End Try
    End Function
-    'Private Function FormatCurrency(ByVal pValue As String, pCurrencySymbol As String) As String
-    '    pValue = pValue.Replace(".", ",")
-    '    Dim oBetrag As Decimal = pValue
-    '    Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
-    '    oFormatiert = $"{oFormatiert} {pCurrencySymbol}"
-    '    Return oFormatiert
-    'End Function
-    Private Function FormatCurrency(ByVal pValue As String, pCurrencySymbol As String) As String
-        pValue = pValue.Trim()
-
-        Dim oBetrag As Decimal
-        Dim culture As Globalization.CultureInfo
-
-        ' Erkennung des Dezimaltrennzeichens
-        If pValue.Contains(",") AndAlso Not pValue.Contains(".") Then
-            culture = New Globalization.CultureInfo("de-DE") ' Komma → deutsches Format
-        ElseIf pValue.Contains(".") AndAlso Not pValue.Contains(",") Then
-            culture = New Globalization.CultureInfo("en-US") ' Punkt → englisches Format
-        Else
-            ' Mischformat oder Tausendertrennzeichen → Fallback auf aktuelle Culture
-            culture = Globalization.CultureInfo.CurrentCulture
-        End If
-
-        ' Parsen mit gewählter Culture
-        If Not Decimal.TryParse(pValue, Globalization.NumberStyles.Any, culture, oBetrag) Then
-            Throw New FormatException($"Ungültiger Zahlenwert: {pValue}")
-        End If
-
-        ' Formatieren mit deutscher Culture
-        Dim oFormatiert As String = oBetrag.ToString("N2", New Globalization.CultureInfo("de-DE"))
-        Return $"{oFormatiert} {pCurrencySymbol}"
-    End Function
-
-
-    Private Function FormatStringT(ByVal text As String) As String
-        Return text.Replace(vbCr, " - ").Replace(vbLf, "").Replace(vbTab, " ")
-    End Function
    Private Function RemoveNewlinesAndTabs(ByVal text As String) As String
        Return text.Replace(vbCr, " - ").Replace(vbLf, "").Replace(vbTab, " ")
    End Function
@@ -579,28 +420,28 @@ Public Class XRechnungViewDocument
        Dim lines As List(Of String) = text.Split({vbCrLf, vbLf, vbCr}, StringSplitOptions.None).ToList()
        Return lines
    End Function
+    Public Function Create_PageHeader(pFollowPage As Boolean) As Integer
+        'Draw content on the PDF
+        Dim yPosition As Integer = 15
+        MyGDPicturePDF.SetTextSize(18)
+        MyGDPicturePDF.DrawText(fontResName, 10, yPosition, "xRechnung Sichtbeleg - xInvoice Visual Receipt")
+        yPosition += 10
+        MyGDPicturePDF.SetTextSize(10)
+        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row1)
+        yPosition += 5
+        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_DE_Row2)
+        yPosition += 5
+        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row1)
+        yPosition += 5
+        MyGDPicturePDF.DrawText(fontResNameItalic, 10, yPosition, XRechnungStrings.CommentSichtbeleg_EN_Row2)
+        Return yPosition
+    End Function

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    Public Sub Create_PageFooter()
+        MyGDPicturePDF.DrawLine(10, 280, 200, 280)
+        Dim oCreatedString = $"Maschinell erstellt durch / Automatically created by Digital Data E-Rechnung Parser: {Now.ToString}"
+        MyGDPicturePDF.DrawText(fontResName, 10, 285, oCreatedString)
+    End Sub

    Private Function Return_InvType(pType As String) As String
        Dim oReturn As String = "Rechnung/invoice"
--- a/Jobs/packages.config
+++ b/Jobs/packages.config
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
+  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
+  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.Management" version="8.0.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+</packages>
--- a/License/License.vbproj
+++ b/License/License.vbproj
@@ -1,59 +1,109 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.License</RootNamespace>
    <AssemblyName>DigitalData.Modules.License</AssemblyName>
+    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.License</AssemblyTitle>
-    <Product>Modules.License</Product>
-    <Copyright>Copyright © 2022</Copyright>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.License.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.License.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Update="LicenseSchema.vb">
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LicenseCreator.vb" />
+    <Compile Include="LicenseFile.vb" />
+    <Compile Include="LicenseLegacy.vb" />
+    <Compile Include="LicenseManagerLegacy.vb" />
+    <Compile Include="LicenseSchema.vb">
      <DependentUpon>LicenseSchema.xsd</DependentUpon>
    </Compile>
-    <Compile Update="My Project\Application.Designer.vb">
+    <Compile Include="LicensesLegacy.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
-    <Compile Update="My Project\Resources.Designer.vb">
+    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Update="My Project\Settings.Designer.vb">
+    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Update="My Project\Resources.resx">
+    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
@@ -61,20 +111,22 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
-    <None Update="LicenseSchema.xsd">
+    <None Include="LicenseSchema.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Update="My Project\Application.myapp">
+    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
-    <None Update="My Project\Settings.settings">
+    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
+    <None Include="packages.config" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
-  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.License")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyProduct("Modules.License")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
 <Assembly: AssemblyTrademark("1.1.0.0")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("4ae0298e-6136-4486-ad83-a5287a474d2b")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.1.0.0")>
+<Assembly: AssemblyFileVersion("1.1.0.0")>
--- a/Logging/Logging.vbproj
+++ b/Logging/Logging.vbproj
@@ -1,50 +1,122 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Logging</RootNamespace>
    <AssemblyName>DigitalData.Modules.Logging</AssemblyName>
-    <MyType>Empty</MyType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.Logging</AssemblyTitle>
-    <Description>Logging Modul from DigitalData.Modules for logging Application-Events. Supports Error, Information and Debug</Description>
-    <Company>Digital Data GmbH, Heuchelheim</Company>
-    <Product>Modules.Logging</Product>
-    <Copyright>Copyright © 2025</Copyright>
-    <AssemblyVersion>2.6.5.0</AssemblyVersion>
-    <FileVersion>2.6.5.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Logging.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Logging.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Remove="My Project\Settings.Designer.vb" />
-    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <None Remove="My Project\Application.myapp" />
-    <None Remove="My Project\Settings.settings" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <None Update="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
+    <Compile Include="LogConfig.vb" />
+    <Compile Include="LogEntry.vb" />
+    <Compile Include="Logger.vb" />
+    <Compile Include="LogOptions.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="TraceListener.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>false</MySubMain>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>1</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,9 +1,35 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("Modules.Logging")>
+<Assembly: AssemblyDescription("Logging Modul from DigitalData.Modules for logging Application-Events. Supports Error, Information and Debug")>
+<Assembly: AssemblyCompany("Digital Data GmbH, Heuchelheim")>
+<Assembly: AssemblyProduct("Modules.Logging")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("2.6.4.0")>

 <Assembly: ComVisible(False)>

 'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
 <Assembly: Guid("fd9ac226-1f78-499e-909c-f0b4d74bbfaf")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' übernehmen, indem Sie "*" eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("2.6.5.0")>
+<Assembly: AssemblyFileVersion("2.6.5.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    '''<summary>
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Logging.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "Automatische My.Settings-Speicherfunktion"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Logging.My.MySettings
+            Get
+                Return Global.DigitalData.Modules.Logging.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
--- a/Logging/packages.config
+++ b/Logging/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+</packages>
--- a/Messaging/Email2.vb
+++ b/Messaging/Email2.vb
@@ -1,10 +1,10 @@
 Imports System.IO
-Imports Limilabs.Client.IMAP
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Base
 Imports Limilabs.Mail
 Imports Limilabs.Mail.MIME
 Imports Limilabs.Mail.MSG
+Imports Limilabs.Client.IMAP
 Imports Limilabs.Client

 Public Class Email2
@@ -84,7 +84,7 @@ Public Class Email2
        End Try
    End Function

-    Public Function New_IMAPConnection(pServer As String, pUsername As String, pPassword As String, pSecurity As EmailSecurity, Optional pPort As Integer = 0) As Limilabs.Client.IMAP.Imap
+    Public Function New_IMAPConnection(pServer As String, pUsername As String, pPassword As String, pSecurity As EmailSecurity, Optional pPort As Integer = 0) As Imap
        Try
            Logger.Info("Connecting to IMAP server [{0}:{1}] with user [{2}]", pServer, pPort, pUsername)

--- a/Messaging/Mail/MailSession.vb
+++ b/Messaging/Mail/MailSession.vb
@@ -1,25 +1,29 @@
-Imports System.IdentityModel.Tokens
-Imports System.Net.Security
+Imports System.Net.Security
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports Limilabs.Client
 Imports Limilabs.Client.IMAP
 Imports Limilabs.Client.SMTP
 Imports Microsoft.Identity.Client
+Imports NLog

 Namespace Mail
    Public Class MailSession
        Inherits BaseClass

        Public ReadOnly Client As ClientBase
+        Public ReadOnly OAuth2 As OAuth2

        Public Const AUTH_SSL = "SSL"
        Public Const AUTH_STARTTLS = "STARTTLS"
        Public Const AUTH_SSLTLS = "SSL/TLS"
        Public Const AUTH_NONE = "NONE"
        Public Const AUTH_OAUTH2 = "OAUTH2"
+        Public Const SSLProtocol_TLS12 = "TLS12"

-        Private Const SMTP_IGNORED_ERRORS As SslPolicyErrors = SslPolicyErrors.RemoteCertificateChainErrors Or SslPolicyErrors.RemoteCertificateNameMismatch
+        Private Const SMTP_IGNORED_ERRORS As SslPolicyErrors =
+            SslPolicyErrors.RemoteCertificateChainErrors Or ' self-signed
+            SslPolicyErrors.RemoteCertificateNameMismatch   ' name mismatch

        Private _Session As SessionInfo

@@ -54,7 +58,7 @@ Namespace Mail
            Public Property EnableTls1_1 As Boolean = False
            Public Property EnableTls1_2 As Boolean = False

-            ' Not available in .NET4.6.2
+            ' Not available in .NET 4.6.2
            'Public Property EnableTls1_3 As Boolean = False
        End Class

@@ -69,19 +73,21 @@ Namespace Mail
        ''' <returns></returns>
        Public Function ConnectToServerWithBasicAuth(pServer As String, pPort As Integer, pUser As String, pPassword As String, pAuthType As String, pOptions As MailSessionOptions) As SessionInfo
            Dim oSession = New SessionInfo With {
- .Server = pServer,
- .Port = pPort,
- .User = pUser,
- .Password = pPassword,
- .AuthType = pAuthType
- }
+                .Server = pServer,
+                .Port = pPort,
+                .User = pUser,
+                .Password = pPassword,
+                .AuthType = pAuthType
+            }

-            Logger.Debug("Connecting to Server..")
+            Logger.Debug("ConnectToServerWithBasicAuth..")
            Logger.Debug("Server: [{0}]", oSession.Server)
            Logger.Debug("Port: [{0}]", oSession.Port)
            Logger.Debug("User: [{0}]", oSession.User)
            Logger.Debug("AuthType: [{0}]", oSession.AuthType)
-
+            Logger.Debug($"_Config.TlsVersion.EnableTls1_1 = [{pOptions.EnableTls1_1}]")
+            Logger.Debug($"_Config.TlsVersion.EnableTls1_2 = [{pOptions.EnableTls1_2}]")
+            Logger.Debug($"_Config.TlsVersion.EnableDefault = [{pOptions.EnableDefault}]")
            _Session = oSession

            Logger.Debug("Initializing Connection with Auth type [{0}].", oSession.AuthType)
@@ -90,23 +96,17 @@ Namespace Mail
        End Function

        Public Function ConnectToServerWithO365OAuth(pUser As String, pClientId As String, pTenantId As String, pClientSecret As String, pOptions As MailSessionOptions) As SessionInfo
-            ' Choose server/port based on the client type
-            Dim server As String = If(TypeOf Client Is Smtp, "smtp.office365.com", OAuth2.O365_SERVER)
-            Dim port As Integer = If(TypeOf Client Is Imap, 993, If(TypeOf Client Is Smtp, 587, 993))
-
            Dim oSession = New SessionInfo With {
- .Server = server,
- .Port = port,
- .ClientId = pClientId,
- .ClientSecret = pClientSecret,
- .TenantId = pTenantId,
- .User = pUser,
- .AuthType = AUTH_OAUTH2
- }
+                .Server = OAuth2.O365_SERVER,
+                .ClientId = pClientId,
+                .ClientSecret = pClientSecret,
+                .TenantId = pTenantId,
+                .User = pUser,
+                .AuthType = AUTH_OAUTH2
+            }

            Logger.Debug("Connecting to Server..")
            Logger.Debug("Server: [{0}]", oSession.Server)
-            Logger.Debug("Port: [{0}]", oSession.Port)
            Logger.Debug("User: [{0}]", oSession.User)
            Logger.Debug("ClientId: [{0}]", oSession.ClientId)
            Logger.Debug("TenantId: [{0}]", oSession.TenantId)
@@ -124,52 +124,59 @@ Namespace Mail

            If pOptions.EnableDefault Then
                Logger.Debug("Enabling Default TLS Version")
-                Client.SSLConfiguration.EnabledSslProtocols = System.Security.Authentication.SslProtocols.Default
+                Client.SSLConfiguration.EnabledSslProtocols = Security.Authentication.SslProtocols.Default
            Else
                Logger.Debug("Disabling Default TLS Version")
-                Client.SSLConfiguration.EnabledSslProtocols = System.Security.Authentication.SslProtocols.None
+                Client.SSLConfiguration.EnabledSslProtocols = Security.Authentication.SslProtocols.None
            End If

            ' Set TLS Version manually if requested
            If pOptions.EnableTls1_1 Then
-                Logger.Debug("Enabling TLS Version1.1")
-                Client.SSLConfiguration.EnabledSslProtocols = Client.SSLConfiguration.EnabledSslProtocols Or System.Security.Authentication.SslProtocols.Tls11
+                Logger.Debug("Enabling TLS Version 1.1...")
+                Client.SSLConfiguration.EnabledSslProtocols = Client.SSLConfiguration.EnabledSslProtocols Or Security.Authentication.SslProtocols.Tls11
            End If

            If pOptions.EnableTls1_2 Then
-                Logger.Debug("Enabling TLS Version1.2")
-                Client.SSLConfiguration.EnabledSslProtocols = Client.SSLConfiguration.EnabledSslProtocols Or System.Security.Authentication.SslProtocols.Tls12
+                Logger.Debug("Enabling TLS Version 1.2...")
+                Client.SSLConfiguration.EnabledSslProtocols = Security.Authentication.SslProtocols.Tls12
            End If
+            'If pOptions.EnableTls1_3 Then
+            '    Logger.Debug("Enabling TLS Version 1.3")
+            '    oSession.SSLConfiguration.EnabledSslProtocols = oSession.SSLConfiguration.EnabledSslProtocols Or Security.Authentication.SslProtocols.Tls13
+            'End If

            Logger.Debug("Enabled Encryption Protocols: [{0}]", Client.SSLConfiguration.EnabledSslProtocols)

            If pSession.AuthType = AUTH_OAUTH2 Then
                Try
                    If TypeOf Client Is Imap Then
-                        Dim oClient As Imap = DirectCast(Client, Imap)
-                        Logger.Debug("Connecting with [OAuth2/IMAP/ConnectSSL] on [{0}/{1}]", pSession.Server, If(pSession.Port > 0, pSession.Port, 993))
-                        oClient.ConnectSSL(pSession.Server) ', If(pSession.Port > 0, pSession.Port, 993)
+                        Dim oClient As Imap = Client

-                    ElseIf TypeOf Client Is Smtp Then
-                        Dim s As Smtp = DirectCast(Client, Smtp)
-                        Logger.Debug("Connecting with [OAuth2/SMTP/STARTTLS] on [{0}/{1}]", pSession.Server, If(pSession.Port > 0, pSession.Port, 587))
-                        s.Connect(pSession.Server, If(pSession.Port > 0, pSession.Port, 587))
-                        s.StartTLS()
+                        Logger.Debug("Connecting with [OAuth2/ConnectSSL] on [{0}]", pSession.Server)
+                        oClient.ConnectSSL(pSession.Server)
+                    Else
+                        Throw New ApplicationException("Only OAuth2 for IMAP is not yet supported!")
                    End If

                Catch ex As Exception
                    Logger.Warn("Unexpected Error in ConnectToServer with Auth type OAuth2!")
                    Logger.Error(ex)

-                    pSession.Error = ex
-                    Return pSession
+                    Session.Error = ex
+                    Return Session
                End Try

            ElseIf pSession.AuthType = AUTH_SSL Then
                Try
-                    ' SSL: always connect with SSL immediately
-                    Logger.Debug("Connecting with [SSL/ConnectSSL] on [{0}/{1}]", pSession.Server, pSession.Port)
-                    Client.ConnectSSL(pSession.Server, pSession.Port)
+                    ' Port 465 ist der SMTP-SSL-Port, wird bei der WISAG verwendet, aber veraltet
+                    ' Port 993 ist der IMAP-SSL-Port, zum Abholen der Mails
+                    If pSession.Port = 465 Or pSession.Port = 993 Then
+                        Logger.Debug("Connecting with [SSL/ConnectSSL] on [{0}/{1}]", pSession.Server, pSession.Port)
+                        Client.ConnectSSL(pSession.Server, pSession.Port)
+                    Else
+                        Logger.Debug("Connecting with [SSL/Connect] on [{0}/{1}]", pSession.Server, pSession.Port)
+                        Client.Connect(pSession.Server, pSession.Port)
+                    End If
                    Logger.Debug("Connection (AUTH_SSL) Successful!")

                Catch ex As Exception
@@ -177,32 +184,23 @@ Namespace Mail
                    Logger.Warn($"Error-message: {ex.Message}")
                    Logger.Error(ex)

-                    pSession.Error = ex
-                    Return pSession
+                    Session.Error = ex
+                    Return Session
                End Try

-            ElseIf pSession.AuthType = AUTH_SSLTLS Then
+            ElseIf Session.AuthType = AUTH_SSLTLS Or Session.AuthType = AUTH_STARTTLS Then

                Try
-                    ' SSL/TLS: same as SSL, explicit branch for clarity
-                    Logger.Debug("Connecting with [SSL/TLS/ConnectSSL] on [{0}/{1}]", pSession.Server, pSession.Port)
-                    Client.ConnectSSL(pSession.Server, pSession.Port)
-                    Logger.Debug("Connection (AUTH_SSLTLS) Successful!")
-
-                Catch ex As Exception
-                    Logger.Warn("Unexpected Error in ConnectToServer with Auth type SSL/TLS!")
-                    Logger.Error(ex)
-
-                    pSession.Error = ex
-                    Return pSession
-                End Try
-
-            ElseIf pSession.AuthType = AUTH_STARTTLS Then
-
-                Try
-                    ' STARTTLS: connect plain and then upgrade
-                    Logger.Debug("Connecting with [STARTTLS/Connect] on [{0}/{1}]", pSession.Server, pSession.Port)
-                    Client.Connect(pSession.Server, pSession.Port)
+                    Logger.Debug("Client.SSLConfiguration.EnabledSslProtocols is [{0}]", Client.SSLConfiguration.EnabledSslProtocols.ToString)
+                    If pSession.Port = 993 Then
+                        Logger.Debug("Port is 993 - So  Client.ConnectSSL will be used!")
+                        Logger.Debug("Connecting with [STARTTLS/ConnectSSL] on [{0}/{1}]", pSession.Server, pSession.Port)
+                        Client.ConnectSSL(pSession.Server, pSession.Port)
+                    Else
+                        Logger.Debug("Connecting with [STARTTLS/Connect] on [{0}/{1}]", pSession.Server, pSession.Port)
+                        Client.Connect(pSession.Server, pSession.Port)
+                    End If
+                    Logger.Debug("Connection (AUTH_SSLTLS or AUTH_STARTTLS) Successful!")

                    Dim oSupportsSTARTTLS As Boolean = SupportsSTARTTLS(Client)
                    Logger.Debug("Server supports STARTTLS: [{0}]", oSupportsSTARTTLS)
@@ -211,7 +209,8 @@ Namespace Mail
                        DoSTARTTLS(Client)
                        Logger.Debug("STARTTLS Successful!")
                    Else
-                        Throw New ApplicationException("Server does not support STARTTLS on this endpoint.")
+                        Logger.Debug("Server does not support STARTTLS. Enabling TLS1.2 instead.")
+                        Client.SSLConfiguration.EnabledSslProtocols = Security.Authentication.SslProtocols.Tls12
                    End If

                Catch ex As Exception
@@ -224,11 +223,11 @@ Namespace Mail

            Else
                Try
-                    Logger.Debug("Auth type [{0}]. Using PLAINTEXT connection.", pSession.AuthType)
+                    Logger.Debug("Auth type [{0}]. Using PLAINTEXT connection.", Session.AuthType)
                    Client.Connect(pSession.Server, pSession.Port, useSSL:=False)

                Catch ex As Exception
-                    Logger.Warn("Unexpected Error in ConnectToServer with Auth type [{0}]!", pSession.AuthType)
+                    Logger.Warn("Unexpected Error in ConnectToServer with Auth type [{0}]!", Session.AuthType)
                    Logger.Error(ex)

                    pSession.Error = ex
@@ -242,7 +241,8 @@ Namespace Mail
                    Logger.Info("Logging in with user [{0}] and Auth Type [{1}]", pSession.User, pSession.AuthType)

                    If pSession.AuthType = AUTH_OAUTH2 Then
-                        ' Use OAuth2 token
+                        ' SessionInfo.Password will be the access token that was obtained 
+                        ' in the OAuth2 flow before
                        DoUseBestLogin_OAuth2(Client, pSession)
                    Else
                        DoUseBestLogin_BasicAuth(Client, pSession.User, pSession.Password)
@@ -297,7 +297,7 @@ Namespace Mail
            End If
        End Function

-        Private Function SupportsSTARTTLS(pClient As ClientBase) As Boolean
+        Private Function SupportsSTARTTLS(pClient As ClientBase)
            If TypeOf pClient Is Smtp Then
                Return DirectCast(pClient, Smtp).SupportedExtensions.Contains(SmtpExtension.StartTLS)
            ElseIf TypeOf pClient Is Imap Then
@@ -333,61 +333,16 @@ Namespace Mail
        Private Sub DoUseBestLogin_OAuth2(pClient As ClientBase, pSession As SessionInfo)
            Logger.Debug("Logging in with O365 OAuth2")

-            Dim oOAuth = New OAuth2(LogConfig, pSession.TenantId, pSession.ClientId, pSession.ClientSecret)
-            Dim oAccessToken = oOAuth.GetAccessToken()
-
-            ' Diagnose token shape (delegated vs app-only)
-            Try
-                Dim parts = oAccessToken.Split("."c)
-                If parts.Length = 3 Then
-                    Dim payloadJson = System.Text.Encoding.UTF8.GetString(Convert.FromBase64String(PadBase64(parts(1))))
-                    If payloadJson.Contains("""scp""") Then
-                        Logger.Debug("OAuth2 token contains 'scp' (delegated) – IMAP App-only erwartet 'roles'.")
-                    ElseIf payloadJson.Contains("""roles""") Then
-                        Logger.Debug("OAuth2 token contains 'roles' (application permissions).")
-                    Else
-                        Logger.Debug("OAuth2 token payload hat weder 'scp' noch 'roles'.")
-                    End If
-                End If
-            Catch ex As Exception
-                Logger.Debug("Token-Payload konnte nicht gelesen werden: {0}", ex.Message)
-            End Try
-
            If TypeOf pClient Is Imap Then
-                Dim i = DirectCast(pClient, Imap)
+                Dim oOAuth = New OAuth2(LogConfig, pSession.TenantId, pSession.ClientId, pSession.ClientSecret)
+                Dim oAccessToken = oOAuth.GetAccessToken()

-                ' Login mit Hilfsmethode; bei Abbruch explizit SASL XOAUTH2 probieren
-                Try
-                    ' Direkt versuchen, falls die verwendete Version LoginOAUTH2 unterstützt.
-                    i.LoginOAUTH2(pSession.User, oAccessToken)
-                Catch ex As Exception
-                    Logger.Warn("LoginOAUTH2 (IMAP) fehlgeschlagen: {0}", ex.Message)
-                    Throw
-                End Try
-            ElseIf TypeOf pClient Is Smtp Then
-                Dim s = DirectCast(pClient, Smtp)
-                Try
-                    s.LoginOAUTH2(pSession.User, oAccessToken)
-                Catch ex As Exception
-                    Logger.Warn("LoginOAUTH2 (SMTP) fehlgeschlagen: {0}", ex.Message)
-                    Throw
-                End Try
+                DirectCast(pClient, Imap).LoginOAUTH2(pSession.User, oAccessToken)
            Else
                Logger.Error("Unknown session type: [{0}]", pClient.GetType.ToString)
            End If
        End Sub

-        Private Shared Function PadBase64(input As String) As String
-            ' Normalize Base64 URL-safe and pad to multiple of 4
-            If input Is Nothing Then Return String.Empty
-            Dim normalized As String = input.Replace("-", "+").Replace("_", "/")
-            Dim remainder As Integer = normalized.Length Mod 4
-            If remainder > 0 Then
-                normalized &= New String("="c, 4 - remainder)
-            End If
-            Return normalized
-        End Function
-
        Private Sub DoSTARTTLS(pClient As ClientBase)
            If TypeOf pClient Is Smtp Then
                DirectCast(pClient, Smtp).StartTLS()
--- a/Messaging/Mail/OAuth2.vb
+++ b/Messaging/Mail/OAuth2.vb
@@ -1,96 +1,58 @@
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Messaging.Mail.MailSession
+Imports Limilabs.Client.IMAP
 Imports Microsoft.Identity.Client

-Namespace Mail
-    Public Class OAuth2
-        Inherits BaseClass
+Public Class OAuth2
+    Inherits BaseClass

-        Private ReadOnly _tenantId As String
-        Private ReadOnly _clientId As String
-        Private ReadOnly _clientSecret As String
+    Private ReadOnly TenantId As String
+    Private ReadOnly ClientId As String
+    Private ReadOnly ClientSecret As String

-        Public Const O365_SERVER As String = "outlook.office365.com"
-        Public Const O365_SCOPE As String = "https://outlook.office365.com/.default"
-        Public Const O365_AUTHORITY_PREFIX As String = "https://login.microsoftonline.com/"
+    Public Const O365_SCOPE = "https://outlook.office365.com/.default"
+    Public Const O365_SERVER = "outlook.office365.com"

-        Public Sub New(pLogConfig As LogConfig, tenantId As String, clientId As String, clientSecret As String)
-            MyBase.New(pLogConfig)
-            _tenantId = tenantId
-            _clientId = clientId
-            _clientSecret = clientSecret
-        End Sub
+    Private _AccessToken As String
+    Public ReadOnly Property AccessToken
+        Get
+            Return _AccessToken
+        End Get
+    End Property

-        Public Function GetAccessToken() As String
-            ' input hardening and better diagnostics
-            Dim tenantId = If(_tenantId, String.Empty).Trim()
-            Dim clientId = If(_clientId, String.Empty).Trim()
-            Dim clientSecret = If(_clientSecret, String.Empty).Trim()
+    Public Sub New(pLogConfig As LogConfig, pTenantId As String, pClientId As String, pClientSecret As String)
+        MyBase.New(pLogConfig)
+        TenantId = pTenantId
+        ClientId = pClientId
+        ClientSecret = pClientSecret
+    End Sub

-            If String.IsNullOrWhiteSpace(tenantId) Then
-                Logger.Error("OAuth2: tenantId is empty.")
-                Throw New ArgumentException("tenantId is empty")
-            End If
-            If String.IsNullOrWhiteSpace(clientId) Then
-                Logger.Error("OAuth2: clientId is empty.")
-                Throw New ArgumentException("clientId is empty")
-            End If
-            If String.IsNullOrWhiteSpace(clientSecret) Then
-                Logger.Error("OAuth2: clientSecret is empty.")
-                Throw New ArgumentException("clientSecret is empty")
-            End If
+    Public Function GetAccessToken() As String
+        Logger.Debug("Fetching Access Token..")

-            ' common misconfiguration: using the Secret ID (GUID) instead of the Secret VALUE
-            Dim tmpGuid As Guid
-            If Guid.TryParse(clientSecret, tmpGuid) Then
-                Logger.Error("OAuth2: clientSecret looks like a GUID (likely the secret ID). Use the secret VALUE instead.")
-                Throw New ApplicationException("Invalid client secret: looks like Secret ID (GUID), not the secret value.")
-            End If
+        Try
+            ' Create the application, which is defined in
+            ' Microsoft.Identity.Client
+            Dim oApp = ConfidentialClientApplicationBuilder.
+                Create(ClientId).
+                WithTenantId(TenantId).
+                WithClientSecret(ClientSecret).
+                Build()

-            Try
-                Dim authority = O365_AUTHORITY_PREFIX & tenantId
+            ' Request an access token
+            Dim oScopes = New List(Of String) From {O365_SCOPE}
+            Dim oResult = oApp.
+                    AcquireTokenForClient(oScopes).
+                    ExecuteAsync().Result

-                Dim app = ConfidentialClientApplicationBuilder.Create(clientId).
-                    WithClientSecret(clientSecret).
-                    WithAuthority(authority).
-                    Build()
+            Logger.Debug("Access Token fetched.")

-                Dim scopes = New String() {O365_SCOPE}
-                Dim result = app.AcquireTokenForClient(scopes).ExecuteAsync().GetAwaiter().GetResult()
-
-                Logger.Info("OAuth2 token acquired for tenant {0}. ExpiresOn={1:u}", tenantId, result.ExpiresOn.UtcDateTime)
-                Return result.AccessToken
-            Catch ex As MsalServiceException
-                ' richer diagnostics without depending on specific MSAL version members
-                Logger.Error("MSAL service error. Code={0}. Message={1}", ex.ErrorCode, ex.Message)
-
-                ' Try to log StatusCode, ResponseBody if available (via reflection to avoid version dependency)
-                Try
-                    Dim t = GetType(MsalServiceException)
-                    Dim scProp = t.GetProperty("StatusCode")
-                    If scProp IsNot Nothing Then
-                        Dim sc = scProp.GetValue(ex, Nothing)
-                        If sc IsNot Nothing Then Logger.Error("MSAL StatusCode={0}", sc)
-                    End If
-                    Dim rbProp = t.GetProperty("ResponseBody")
-                    If rbProp IsNot Nothing Then
-                        Dim rb = rbProp.GetValue(ex, Nothing)
-                        If rb IsNot Nothing Then Logger.Error("MSAL ResponseBody={0}", rb)
-                    End If
-                    Dim ciProp = t.GetProperty("Claims")
-                    If ciProp IsNot Nothing Then
-                        Dim claims = ciProp.GetValue(ex, Nothing)
-                        If claims IsNot Nothing AndAlso claims.ToString().Length > 0 Then Logger.Error("MSAL Claims={0}", claims)
-                    End If
-                Catch
-                    ' ignore reflection diagnostics failures
-                End Try
-
-                Throw
-            Catch ex As Exception
-                Logger.Error(ex)
-                Throw
-            End Try
-        End Function
-    End Class
-End Namespace
+            Return oResult.AccessToken
+        Catch ex As Exception
+            Logger.Warn("Could not request access token!")
+            Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+End Class
--- a/Messaging/Messaging.vbproj
+++ b/Messaging/Messaging.vbproj
@@ -1,59 +1,155 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{AF664D85-0A4B-4BAB-A2F8-83110C06553A}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.Messaging</RootNamespace>
    <AssemblyName>DigitalData.Modules.Messaging</AssemblyName>
-    <MyType>Empty</MyType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <AssemblyTitle>Modules.Messaging</AssemblyTitle>
-    <Description>Funktionen rund um das Versenden und Empfangen von Emails</Description>
-    <Company>Digital Data GmbH, Heuchelheim</Company>
-    <Product>Modules.Messaging</Product>
-    <Copyright>Copyright © 2025</Copyright>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
+    <FileAlignment>512</FileAlignment>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Messaging.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.Modules.Messaging.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.79.2" />
-    <PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="8.15.0" />
-    <PackageReference Include="Mail.dll" Version="3.0.21189.1553" />
-    <PackageReference Include="NLog" Version="5.0.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0" />
-    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Mail">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Remove="My Project\Settings.Designer.vb" />
-    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <None Remove="My Project\Application.myapp" />
-    <None Remove="My Project\Settings.settings" />
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Base\Base.vbproj" />
-    <ProjectReference Include="..\Logging\Logging.vbproj" />
+    <Compile Include="Email.vb" />
+    <Compile Include="EventBus.vb" />
+    <Compile Include="Email2.vb" />
+    <Compile Include="Limilab.vb" />
+    <Compile Include="Mail\MailFetcher.vb" />
+    <Compile Include="Mail\MailSession.vb" />
+    <Compile Include="Mail\OAuth2.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="Mail\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">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="MailLicense.xml">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -0,0 +1,13 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Developer01	8b36459e85	Überarbeitung nach Rückmeldung Marvin (windreamIndexe SQL Editor, Dynmisch verkleinern des pnlValidators, Regexprüfung editvalue, Bedienung Tastaturbefehle, ...)	2025-08-18 11:51:57 +02:00
Developer01	09673ffd70	Abhängigkeiten aktualisieren, build	2025-08-13 12:43:38 +02:00
Developer01	bff4ad10c9	Windream logging bei createWMobject, file or fodler exists	2025-07-02 09:14:13 +02:00
Developer01	a409e1fd44	Messaging TLS Protokoll	2025-06-26 17:14:08 +02:00
Developer01	c7bb645f94	Messaging 1.9.9 Logging to compare	2025-06-25 15:01:15 +02:00
Developer01	e7a7c45430	Sichtbeleg Logging	2025-06-24 14:51:40 +02:00
Developer01	c0054d41ae	V 2.3.6.0 Debug Param-Liste auf 1000 Zeichen begrenzt	2025-06-03 08:30:05 +02:00
Developer01	1d31298d8d	MS Sichtbeleg Jobs	2025-05-28 15:40:44 +02:00