Nuget Packages manuell hinzufügen

Added assembly metadata such as title, company, product, copyright, and version information to EDMI.API.vbproj. In AssemblyInfo.vb, redundant assembly attributes for title, company, product, copyright, and version were removed, leaving only the trademark, ComVisible, and GUID attributes. This centralizes version and metadata management in the project file.

.github/upgrades/dotnet-upgrade-plan.md

@@ -0,0 +1,183 @@
+# .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.

Base/Base.vbproj

@@ -1,130 +1,73 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0-windows</TargetFramework>
-    <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>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <UseWindowsForms>true</UseWindowsForms>
-    <Deterministic>true</Deterministic>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <TargetFrameworkProfile />
+    <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>
   </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>
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="NLog" Version="5.0.5" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <PackageReference Include="NuGet.CommandLine" Version="6.13.2" />
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+    <PackageReference Include="Microsoft.AspNetCore.SystemWebAdapters" Version="2.2.1" />
-    </Reference>
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <Reference Include="System" />
+    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <Reference Include="System.Configuration" />
+    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <Reference Include="System.Data" />
+    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <Reference Include="System.IO.Compression" />
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <Reference Include="System.Runtime.Serialization" />
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <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="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
     <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
+    <Import Include="DigitalData.Modules.Logging" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BaseClass.vb" />
+    <Compile Update="My Project\Application.Designer.vb">
-    <Compile Include="ECM\ECM.vb" />
-    <Compile Include="IDB\Attributes.vb" />
-    <Compile Include="IDB\Database.vb" />
-    <Compile Include="IDB\FileStore.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">
+    <Compile Update="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
+    <Compile Update="My Project\Settings.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="Performance.vb" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
+    <None Update="My Project\Application.myapp">
-      <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">
+    <ProjectReference Include="..\Logging\Logging.vbproj" />
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Base/Base/BaseUtils.vb

@@ -0,0 +1,7 @@
+Friend Class BaseUtils
+    Friend Shared Function FormatHash(pChecksum)
+        Return BitConverter.
+            ToString(pChecksum).
+            Replace("-", String.Empty)
+    End Function
+End Class

Base/DatabaseEx.vb

@@ -0,0 +1,17 @@
+Public Class DatabaseEx
+    ''' <summary>
+    ''' TODO: Deprecate
+    ''' Checks a Row value for three different `null` values,
+    ''' Nothing, Empty String, DBNull
+    ''' 
+    ''' Returns the original value if the value is not null, or `defaultValue`
+    ''' </summary>
+    ''' <typeparam name="T">The type of the value</typeparam>
+    ''' <param name="pRow">The DataRow that contains the value</param>
+    ''' <param name="pColumn">The column name</param>
+    ''' <param name="pDefaultValue">The default value</param>
+    ''' <returns>The original value or the default value</returns>
+    Public Shared Function NotNull(Of T)(ByVal pRow As DataRow, pColumn As String, pDefaultValue As T) As T
+        Return ObjectEx.NotNull(pRow.Item(pColumn), pDefaultValue)
+    End Function
+End Class

Base/ECM/ECM.vb

@@ -1,7 +1,8 @@
 Public Class ECM
     Public Enum Product
-        ProcessManager
+        taskFLOW
-        GlobalIndexer
+        easyFLOW
-        ClipboardWatcher
+        fileFLOW
+        signFLOW
     End Enum
 End Class

Base/Encryption/Compression.vb

@@ -0,0 +1,70 @@
+Imports System.IO
+Imports System.IO.Compression
+Imports DigitalData.Modules.Logging
+
+Public Class Compression
+    Private ReadOnly _logger As Logger
+
+    Public Sub New(LogConfig As LogConfig)
+        _logger = LogConfig.GetLogger()
+    End Sub
+
+    Public Async Function CompressAsync(data As Byte()) As Task(Of Byte())
+        Return Await Task.Run(Function() As Byte()
+                                  Return Compress(data)
+                              End Function)
+    End Function
+
+    Public Function Compress(data As Byte()) As Byte()
+        Try
+            ' ByteArray in Stream umwandeln
+            Using originalStream As New MemoryStream(data)
+                ' Ziel Stream erstellen
+                Using compressedStream As New MemoryStream()
+                    ' Gzip-Stream erstellen, der alle Daten komprimiert und zu compressedStream durchleitet
+                    '
+                    '  > MemoryStream      > GzipStream          > MemoryStream  
+                    '  originalStream  --> compressionStream --> compressedFileStream
+                    '
+                    Using compressionStream As New GZipStream(compressedStream, CompressionMode.Compress)
+                        originalStream.CopyTo(compressionStream)
+                        compressionStream.Close()
+                        Return compressedStream.ToArray()
+                    End Using
+                End Using
+            End Using
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Async Function DecompressAsync(data As Byte()) As Task(Of Byte())
+        Return Await Task.Run(Function() As Byte()
+                                  Return Decompress(data)
+                              End Function)
+    End Function
+
+    Public Function Decompress(data As Byte()) As Byte()
+        Try
+            ' ByteArray in Stream umwandeln
+            Using compressedStream As New MemoryStream(data)
+                ' Ziel Stream erstellen
+                Using decompressedStream As New MemoryStream()
+                    ' Gzip-Stream erstellen, der alle Daten komprimiert und zu compressedStream durchleitet
+                    '
+                    '  > MemoryStream        > GzipStream            > MemoryStream  
+                    '  compressedStream  --> decompressionStream --> decompressedStream
+                    '
+                    Using decompressionStream As New GZipStream(compressedStream, CompressionMode.Decompress)
+                        decompressionStream.CopyTo(decompressedStream)
+                        Return decompressedStream.ToArray()
+                    End Using
+                End Using
+            End Using
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+End Class

Base/Encryption/Encryption.vb

@@ -0,0 +1,148 @@
+Imports System.IO
+Imports System.Security.Cryptography
+Imports System.Text.Encoding
+Imports DigitalData.Modules.Logging
+
+''' <summary>
+''' https://stackoverflow.com/questions/10168240/encrypting-decrypting-a-string-in-c-sharp
+''' </summary>
+Public Class Encryption
+    ' This constant is used to determine the keysize of the encryption algorithm in bits.
+    ' We divide this by 8 within the code below to get the equivalent number of bytes.
+    Private Const KEY_SIZE As Integer = 256
+    ' This constant determines the number of iterations for the password bytes generation function.
+    Private Const DERIVATION_ITERATIONS As Integer = 1000
+    Private Const BLOCK_SIZE As Integer = 256
+
+    Private _paddingMode As PaddingMode = PaddingMode.Zeros
+    Private _cipherMode As CipherMode = CipherMode.CBC
+
+    Private ReadOnly _password As String
+    Private _logger As Logger
+
+    Public Sub New(LogConfig As LogConfig, Password As String)
+        _logger = LogConfig.GetLogger()
+
+        If IsNothing(Password) Then
+            Throw New ArgumentNullException("Password")
+        End If
+
+        _password = Password
+    End Sub
+
+    Public Async Function EncryptAsync(PlainTextBytes As Byte()) As Task(Of Byte())
+        Return Await Task.Run(Function() As Byte()
+                                  Return Encrypt(PlainTextBytes)
+                              End Function)
+    End Function
+
+    Public Function Encrypt(PlainText As String) As String
+        Try
+            Dim oBytes As Byte() = UTF8.GetBytes(PlainText)
+            Dim oEncrypted As Byte() = Encrypt(oBytes)
+            Return UTF8.GetString(oEncrypted)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Function Encrypt(PlainTextBytes As Byte()) As Byte()
+        Try
+            ' Salt and IV is randomly generated each time, but is preprended to encrypted cipher text
+            ' so that the same Salt and IV values can be used when decrypting.  
+            Dim oSaltStringBytes = Generate256BitsOfRandomEntropy()
+            Dim oIvStringBytes = Generate256BitsOfRandomEntropy()
+            Using oPassword = New Rfc2898DeriveBytes(_password, oSaltStringBytes, DERIVATION_ITERATIONS)
+                Dim oKeyBytes = oPassword.GetBytes(KEY_SIZE / 8)
+                Using oSymmetricKey = New RijndaelManaged()
+                    oSymmetricKey.BlockSize = BLOCK_SIZE
+                    oSymmetricKey.Mode = _cipherMode
+                    oSymmetricKey.Padding = _paddingMode
+
+                    Using oEncryptor = oSymmetricKey.CreateEncryptor(oKeyBytes, oIvStringBytes)
+                        Using oMemoryStream = New MemoryStream()
+                            Using oCryptoStream = New CryptoStream(oMemoryStream, oEncryptor, CryptoStreamMode.Write)
+                                oCryptoStream.Write(PlainTextBytes, 0, PlainTextBytes.Length)
+                                oCryptoStream.FlushFinalBlock()
+                                ' Create the final bytes as a concatenation of the random salt bytes, the random iv bytes and the cipher bytes.
+                                Dim oCipherTextBytes = oSaltStringBytes
+                                oCipherTextBytes = oCipherTextBytes.Concat(oIvStringBytes).ToArray()
+                                oCipherTextBytes = oCipherTextBytes.Concat(oMemoryStream.ToArray()).ToArray()
+                                oMemoryStream.Close()
+                                oCryptoStream.Close()
+                                Return oCipherTextBytes
+                            End Using
+                        End Using
+                    End Using
+                End Using
+            End Using
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Async Function DecryptAsync(CipherTextBytesWithSaltAndIv As Byte()) As Task(Of Byte())
+        Return Await Task.Run(Function() As Byte()
+                                  Return Decrypt(CipherTextBytesWithSaltAndIv)
+                              End Function)
+    End Function
+
+    Public Function Decrypt(CipherTextPlainWithSaltAndIv As String) As String
+        Try
+            Dim oBytes As Byte() = UTF8.GetBytes(CipherTextPlainWithSaltAndIv)
+            Dim oDecrypted As Byte() = Decrypt(oBytes)
+            Return UTF8.GetString(oDecrypted)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Function Decrypt(CipherTextBytesWithSaltAndIv As Byte()) As Byte()
+        Try
+            ' Get the complete stream of bytes that represent:
+            ' [32 bytes of Salt] + [32 bytes of IV] + [n bytes of CipherText]
+            ' Get the saltbytes by extracting the first 32 bytes from the supplied cipherText bytes.
+            Dim oSaltStringBytes = CipherTextBytesWithSaltAndIv.Take(KEY_SIZE / 8).ToArray()
+            ' Get the IV bytes by extracting the next 32 bytes from the supplied cipherText bytes.
+            Dim oIvStringBytes = CipherTextBytesWithSaltAndIv.Skip(KEY_SIZE / 8).Take(KEY_SIZE / 8).ToArray()
+            ' Get the actual cipher text bytes by removing the first 64 bytes from the cipherText string.
+            Dim oCipherTextBytes = CipherTextBytesWithSaltAndIv.Skip((KEY_SIZE / 8) * 2).Take(CipherTextBytesWithSaltAndIv.Length - ((KEY_SIZE / 8) * 2)).ToArray()
+
+            Using oPassword = New Rfc2898DeriveBytes(_password, oSaltStringBytes, DERIVATION_ITERATIONS)
+                Dim oKeyBytes = oPassword.GetBytes(KEY_SIZE / 8)
+                Using oSymmetricKey = New RijndaelManaged()
+                    oSymmetricKey.BlockSize = BLOCK_SIZE
+                    oSymmetricKey.Mode = _cipherMode
+                    oSymmetricKey.Padding = _paddingMode
+                    Using oDecryptor = oSymmetricKey.CreateDecryptor(oKeyBytes, oIvStringBytes)
+                        Using oMemoryStream = New MemoryStream(oCipherTextBytes)
+                            Using oCryptoStream = New CryptoStream(oMemoryStream, oDecryptor, CryptoStreamMode.Read)
+                                Dim oPlainTextBytes = New Byte(oCipherTextBytes.Length - 1) {}
+                                Dim oDecryptedByteCount = oCryptoStream.Read(oPlainTextBytes, 0, oPlainTextBytes.Length)
+                                oMemoryStream.Close()
+                                oCryptoStream.Close()
+                                Return oPlainTextBytes
+                            End Using
+                        End Using
+                    End Using
+                End Using
+            End Using
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Private Shared Function Generate256BitsOfRandomEntropy() As Byte()
+        Dim oRandomBytes = New Byte(31) {}
+        ' 32 Bytes will give us 256 bits.
+        Using oRNGCsp = New RNGCryptoServiceProvider()
+            ' Fill the array with cryptographically secure random bytes.
+            oRNGCsp.GetBytes(oRandomBytes)
+        End Using
+        Return oRandomBytes
+    End Function
+End Class

Base/Encryption/EncryptionLegacy.vb

@@ -0,0 +1,85 @@
+Imports System.Security.Cryptography
+Imports System.Data
+Imports System.Data.SqlClient
+
+Public Class EncryptionLegacy
+    Private TripleDes As New TripleDESCryptoServiceProvider
+    Private DEFAULT_KEY As String = "!35452didalog="
+    Private SALT_VALUE As String = "!Didalog35452Heuchelheim="
+
+    Sub New()
+        TripleDes.Key = TruncateHash(DEFAULT_KEY, TripleDes.KeySize \ 8)
+        TripleDes.IV = TruncateHash("", TripleDes.BlockSize \ 8)
+    End Sub
+
+    Sub New(key As String)
+        ' Initialize the crypto provider.
+        TripleDes.Key = TruncateHash(key, TripleDes.KeySize \ 8)
+        TripleDes.IV = TruncateHash("", TripleDes.BlockSize \ 8)
+    End Sub
+
+    Private Function TruncateHash(ByVal key As String, ByVal length As Integer) As Byte()
+        Dim sha1 As New SHA1CryptoServiceProvider
+
+        ' Hash the key.
+        Dim keyBytes() As Byte =
+            System.Text.Encoding.Unicode.GetBytes(key)
+        Dim hash() As Byte = sha1.ComputeHash(keyBytes)
+
+        ' Truncate or pad the hash.
+        ReDim Preserve hash(length - 1)
+        Return hash
+    End Function
+
+    <DebuggerStepThrough>
+    Public Function EncryptData(ByVal plaintext As String) As String
+        Try
+            ' Convert the plaintext string to a byte array.
+            Dim plaintextBytes() As Byte =
+                System.Text.Encoding.Unicode.GetBytes(SALT_VALUE & plaintext)
+
+            ' Create the stream.
+            Dim ms As New System.IO.MemoryStream
+            ' Create the encoder to write to the stream.
+            Dim encStream As New CryptoStream(ms,
+                TripleDes.CreateEncryptor(),
+                System.Security.Cryptography.CryptoStreamMode.Write)
+
+            ' Use the crypto stream to write the byte array to the stream.
+            encStream.Write(plaintextBytes, 0, plaintextBytes.Length)
+            encStream.FlushFinalBlock()
+
+            ' Convert the encrypted stream to a printable string.
+            Return Convert.ToBase64String(ms.ToArray)
+        Catch ex As Exception
+            Return plaintext
+        End Try
+    End Function
+
+    'Entschlüsselt die Zeichenfolge
+    <DebuggerStepThrough>
+    Public Function DecryptData(ByVal EncryptedText As String) As String
+        Try
+            ' Convert the encrypted text string to a byte array.
+            Dim oEncryptedBytes() As Byte = Convert.FromBase64String(EncryptedText)
+
+            ' Create the stream.
+            Dim oMemoryStream As New System.IO.MemoryStream
+            ' Create the decoder to write to the stream.
+            Dim oCryptoStream As New CryptoStream(oMemoryStream,
+                TripleDes.CreateDecryptor(),
+                System.Security.Cryptography.CryptoStreamMode.Write)
+
+            ' Use the crypto stream to write the byte array to the stream.
+            oCryptoStream.Write(oEncryptedBytes, 0, oEncryptedBytes.Length)
+            oCryptoStream.FlushFinalBlock()
+            Dim oResult = System.Text.Encoding.Unicode.GetString(oMemoryStream.ToArray)
+            oResult = oResult.Replace(SALT_VALUE, "")
+            ' Convert the plaintext stream to a string.
+            Return oResult
+        Catch ex As Exception
+            Return EncryptedText
+        End Try
+    End Function
+End Class
+

Base/FileEx.vb

@@ -0,0 +1,78 @@
+Imports System.IO
+Imports System.Security.Cryptography
+
+Public Class FileEx
+    ''' <summary>
+    ''' Reads the file at `FilePath` and computes a SHA256 Hash from its contents
+    ''' </summary>
+    ''' <param name="pFilePath"></param>
+    ''' <returns></returns>
+    Public Shared Function GetChecksumFromFileContents(pFilePath As String) As String
+        Try
+            Using oFileStream = IO.File.OpenRead(pFilePath)
+                Using oStream As New BufferedStream(oFileStream, 1200000)
+                    Dim oChecksum() As Byte = SHA256.Create.ComputeHash(oStream)
+                    Return BaseUtils.FormatHash(oChecksum)
+                End Using
+            End Using
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
+    Public Shared Function GetHashFromFileContents(pFilePath As String) As String
+        Return GetChecksumFromFileContents(pFilePath)
+    End Function
+
+    ''' <summary>
+    ''' Returns a Dictionary path in the form of [Base]\[Year]\[Month]\[Day]
+    ''' </summary>
+    ''' <param name="pBaseDirectory">The basedirectory</param>
+    ''' <param name="pDate">The date to be used</param>
+    ''' <returns>The final directory path</returns>
+    Public Shared Function GetDateDirectory(pBaseDirectory As String, pDate As Date) As String
+        Dim oDateDirectory = StringEx.GetDateString(pDate)
+        Dim oFinalDirectory As String = Path.Combine(pBaseDirectory, oDateDirectory)
+        Return oFinalDirectory
+    End Function
+
+    ''' <summary>
+    ''' Returns a Dictionary path in the form of [Base]\[Year]\[Month]\[Day] based on the current date
+    ''' </summary>
+    ''' <param name="pBaseDirectory">The basedirectory</param>
+    ''' <returns>The final directory path</returns>
+    Public Shared Function GetDateDirectory(pBaseDirectory As String) As String
+        Return GetDateDirectory(pBaseDirectory, Now)
+    End Function
+
+    ''' <summary>
+    ''' Creates a Dictionary in the form of [Base]\[Year]\[Month]\[Day]
+    ''' </summary>
+    ''' <param name="pBaseDirectory">The basedirectory</param>
+    ''' <param name="pDate">The date to be used</param>
+    ''' <returns>The created path. If the directory cannot be created, Nothing.</returns>
+    Public Shared Function CreateDateDirectory(pBaseDirectory As String, pDate As Date) As String
+        Dim oDateDirectory = StringEx.GetDateString(pDate)
+        Dim oFinalDirectory As String = Path.Combine(pBaseDirectory, oDateDirectory)
+
+        If Directory.Exists(oFinalDirectory) = False Then
+            Try
+                Directory.CreateDirectory(oFinalDirectory)
+            Catch ex As Exception
+                Return Nothing
+            End Try
+        End If
+
+        Return oFinalDirectory
+    End Function
+
+    ''' <summary>
+    ''' Creates a Dictionary in the form of [Base]\[Year]\[Month]\[Day] based on the current date
+    ''' </summary>
+    ''' <param name="pBaseDirectory">The basedirectory</param>
+    ''' <returns>The created path. If the directory cannot be created, Nothing.</returns>
+    Public Shared Function CreateDateDirectory(pBaseDirectory As String) As String
+        Return CreateDateDirectory(pBaseDirectory, Now)
+    End Function
+
+End Class

Base/FileWatcher/FileWatcher.vb

@@ -0,0 +1,131 @@
+Imports System.IO
+Imports DigitalData.Modules.Base.FileWatcherFilters
+Imports DigitalData.Modules.Logging
+
+
+Public Class FileWatcher
+    ' Internals
+    Private ReadOnly _Logger As Logger
+    Private ReadOnly _Watchers As List(Of FileSystemWatcher)
+    Private ReadOnly _Files As Dictionary(Of String, FileWatcherProperties)
+    Private ReadOnly _Filters As List(Of BaseFileFilter)
+
+    ' Options
+    Private _Path As String
+
+    ' Public Events
+    Public Event FileSaved(ByVal FullName As String, ByVal IsSpecial As Boolean)
+
+    Public Sub New(LogConfig As LogConfig, Path As String, Optional Filters As List(Of BaseFileFilter) = Nothing)
+        _Logger = LogConfig.GetLogger()
+        _Files = New Dictionary(Of String, FileWatcherProperties)
+        _Watchers = New List(Of FileSystemWatcher)
+        _Filters = IIf(IsNothing(Filters), GetDefaultFilters(), Filters)
+        _Path = Path
+
+        For Each oFilePath In Directory.EnumerateFiles(_Path)
+            Try
+                If IO.File.Exists(oFilePath) Then
+                    _Files.Add(oFilePath, New FileWatcherProperties With {
+                        .CreatedAt = DateTime.Now,
+                        .ChangedAt = Nothing
+                    })
+                End If
+            Catch ex As Exception
+                _Logger.Error(ex)
+                _Logger.Warn("File {0} cannot be watched!")
+            End Try
+        Next
+    End Sub
+
+    Public Sub Add(Filter As String)
+        _Watchers.Add(CreateWatcher(Filter))
+    End Sub
+
+    Public Sub Start()
+        For Each oWatcher In _Watchers
+            oWatcher.EnableRaisingEvents = True
+        Next
+    End Sub
+
+    Public Sub [Stop]()
+        For Each oWatcher In _Watchers
+            If Not IsNothing(oWatcher) Then
+                oWatcher.EnableRaisingEvents = False
+                oWatcher.Dispose()
+            End If
+        Next
+    End Sub
+
+    Private Function GetDefaultFilters()
+        Return New List(Of BaseFileFilter) From {
+              New TempFileFilter,
+              New OfficeFileFilter
+        }
+    End Function
+
+    Private Function CreateWatcher(Filter As String)
+        Dim oWatcher = New FileSystemWatcher() With {
+            .Path = _Path,
+            .Filter = Filter,
+            .NotifyFilter = NotifyFilters.LastAccess _
+                            Or NotifyFilters.LastWrite _
+                            Or NotifyFilters.FileName _
+                            Or NotifyFilters.Size _
+                            Or NotifyFilters.FileName _
+                            Or NotifyFilters.Attributes
+        }
+
+        AddHandler oWatcher.Created, AddressOf HandleFileCreated
+        AddHandler oWatcher.Changed, AddressOf HandleFileChanged
+        AddHandler oWatcher.Deleted, AddressOf HandleFileDeleted
+        AddHandler oWatcher.Renamed, AddressOf HandleFileRenamed
+
+        Return oWatcher
+    End Function
+
+    Private Sub HandleFileCreated(sender As Object, e As FileSystemEventArgs)
+        _Files.Add(e.FullPath, New FileWatcherProperties())
+        _Logger.Debug("[Created] " & e.FullPath)
+    End Sub
+
+    ''' <summary>
+    ''' This may fire twice for a single save operation, 
+    ''' see: https://blogs.msdn.microsoft.com/oldnewthing/20140507-00/?p=1053/
+    ''' </summary>
+    Private Sub HandleFileChanged(sender As Object, e As FileSystemEventArgs)
+        _Files.Item(e.FullPath).ChangedAt = DateTime.Now
+        _Logger.Debug("[Changed] " & e.FullPath)
+
+        Dim oShouldRaiseSave As Boolean = Not _Filters.Any(Function(oFilter)
+                                                               Return oFilter.ShouldFilter(e)
+                                                           End Function)
+
+        If oShouldRaiseSave Then
+            RaiseEvent FileSaved(e.FullPath, False)
+        End If
+    End Sub
+    Private Sub HandleFileDeleted(sender As Object, e As FileSystemEventArgs)
+        _Files.Remove(e.FullPath)
+        _Logger.Debug("[Removed] " & e.FullPath)
+    End Sub
+
+    Private Sub HandleFileRenamed(sender As Object, e As RenamedEventArgs)
+        Dim oProperties = _Files.Item(e.OldFullPath)
+        _Files.Remove(e.OldFullPath)
+        _Files.Add(e.FullPath, oProperties)
+        ' Soll eine umbenannte datei als NEU gelten?
+
+        Dim oShouldRaiseSave = _Filters.Any(Function(oFilter)
+                                                Return oFilter.ShouldRaiseSave(e)
+                                            End Function)
+
+        If oShouldRaiseSave Then
+            RaiseEvent FileSaved(e.OldFullPath, True)
+        End If
+
+        _Logger.Debug("[Renamed] {0} --> {1}", e.OldFullPath, e.FullPath)
+    End Sub
+
+
+End Class

Base/FileWatcher/FileWatcherFilters.vb

@@ -0,0 +1,61 @@
+Imports System.IO
+
+''' <summary>
+''' Built-in filters for FileWatcher that are useful for correctly detecting changes on Office documents (currently Office 2016)
+''' </summary>
+Public Class FileWatcherFilters
+    ''' <summary>
+    ''' Base Filter that all filters must inherit from
+    ''' Provides two functions that may be overridden and some useful file extension lists
+    ''' </summary>
+    Public MustInherit Class BaseFileFilter
+        Public TempFiles As New List(Of String) From {".tmp", ""}
+
+        Public Overridable Function ShouldFilter(e As FileSystemEventArgs) As Boolean
+            Return False
+        End Function
+        Public Overridable Function ShouldRaiseSave(e As RenamedEventArgs) As Boolean
+            Return False
+        End Function
+    End Class
+
+    ''' <summary>
+    ''' Simple Filter that filters changes made on temporary files
+    ''' </summary>
+    Public Class TempFileFilter
+        Inherits BaseFileFilter
+
+        Public Overrides Function ShouldFilter(e As FileSystemEventArgs) As Boolean
+            Dim oFileInfo As New FileInfo(e.FullPath)
+            Return TempFiles.Contains(oFileInfo.Extension)
+        End Function
+    End Class
+
+    ''' <summary>
+    ''' Filter to detect changes on Office files
+    ''' </summary>
+    Public Class OfficeFileFilter
+        Inherits BaseFileFilter
+
+        Public OfficeFiles As New List(Of String) From {".docx", ".pptx", ".xlsx"}
+
+        Public Overrides Function ShouldFilter(e As FileSystemEventArgs) As Boolean
+            Dim oFileInfo As New FileInfo(e.FullPath)
+            Return OfficeFiles.Contains(oFileInfo.Extension) And oFileInfo.Name.StartsWith("~")
+        End Function
+
+        Public Overrides Function ShouldRaiseSave(e As RenamedEventArgs) As Boolean
+            Dim oIsTransform = OfficeFiles.Any(Function(Extension As String)
+                                                   Return e.OldName.EndsWith(Extension)
+                                               End Function)
+
+            ' Check if it is renamed to a temp file
+            Dim oIsTempFile = TempFiles.Any(Function(Extension)
+                                                Return e.Name.EndsWith(Extension)
+                                            End Function)
+
+
+            Return oIsTransform And oIsTempFile
+        End Function
+    End Class
+End Class

Base/FileWatcher/FileWatcherProperties.vb

@@ -0,0 +1,10 @@
+Public Class FileWatcherProperties
+    Public Property CreatedAt As DateTime
+    Public Property ChangedAt As DateTime
+    Public ReadOnly Property HasChanged As Boolean
+    Public Sub New()
+        CreatedAt = DateTime.Now
+        ChangedAt = Nothing
+        HasChanged = False
+    End Sub
+End Class

Base/FilesystemEx.vb

@@ -0,0 +1,494 @@
+Imports DigitalData.Modules.Logging
+Imports System.IO
+Imports System.Security.Cryptography
+Imports System.Text
+Imports System.Text.RegularExpressions
+
+Public Class FilesystemEx
+    Private ReadOnly _Logger As Logger
+    Private ReadOnly _LogConfig As LogConfig
+
+    Private ReadOnly _invalidFilenameChars As String
+    Private ReadOnly _invalidPathChars As String
+
+    Private Const REGEX_CLEAN_FILENAME As String = "[\\/:""<>|\b\0\r\n\t]"
+    Private Const REGEX_CLEAN_PATH As String = "[""<>|\b\0\r\n\t]"
+
+    ' The limit enforced by windows for filenpaths is 260, 
+    ' so we use a slightly smaller number to have some Error margin.
+    ' 
+    ' Source: https://docs.microsoft.com/de-de/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN#maximum-path-length-limitation
+    Private Const MAX_FILE_PATH_LENGTH = 250
+
+    ' This prevents an infinite loop when no file can be created in a location
+    Private Const MAX_FILE_VERSION = 100
+    Private Const VERSION_SEPARATOR As Char = "~"c
+
+    Private Const FILE_NAME_ACCESS_TEST = "accessTest.txt"
+
+    Public Sub New(LogConfig As LogConfig)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+
+        _invalidFilenameChars = String.Join("", Path.GetInvalidFileNameChars())
+        _invalidPathChars = String.Join("", Path.GetInvalidPathChars())
+    End Sub
+
+    Public Function GetCleanFilename(FileName As String) As String
+        _Logger.Debug("Filename before cleaning: [{0}]", FileName)
+
+        Dim oCleanName As String = FileName
+        oCleanName = Regex.Replace(oCleanName, _invalidFilenameChars, String.Empty)
+        oCleanName = Regex.Replace(oCleanName, REGEX_CLEAN_FILENAME, String.Empty, RegexOptions.Singleline)
+        oCleanName = Regex.Replace(oCleanName, "\s{2,}", " ")
+        oCleanName = Regex.Replace(oCleanName, "\.{2,}", ".")
+
+        _Logger.Debug("Filename after cleaning: [{0}]", oCleanName)
+
+        Return oCleanName
+    End Function
+
+    Public Function GetCleanPath(FilePath As String) As String
+        _Logger.Debug("Path before cleaning: [{0}]", FilePath)
+
+        Dim oCleanName As String = FilePath
+        oCleanName = Regex.Replace(oCleanName, _invalidPathChars, String.Empty)
+        oCleanName = Regex.Replace(oCleanName, REGEX_CLEAN_PATH, String.Empty, RegexOptions.Singleline)
+
+        _Logger.Debug("Path after cleaning: [{0}]", oCleanName)
+
+        Return oCleanName
+    End Function
+
+    ''' <summary>
+    ''' Reads the file at `FilePath` and computes a SHA256 Hash from its contents
+    ''' </summary>
+    ''' <param name="FilePath"></param>
+    ''' <returns></returns>
+    Public Function GetChecksum(FilePath As String) As String
+        Try
+            Using oFileStream = IO.File.OpenRead(FilePath)
+                Using oStream As New BufferedStream(oFileStream, 1200000)
+                    Dim oChecksum() As Byte = SHA256.Create.ComputeHash(oStream)
+                    Return FormatHash(oChecksum)
+                End Using
+            End Using
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
+    Public Function GetChecksumFromString(pStringToCheck As String) As String
+        Dim oBytes() As Byte = Encoding.UTF8.GetBytes(pStringToCheck)
+        Dim oChecksum() As Byte = SHA256.Create.ComputeHash(oBytes)
+        Return FormatHash(oChecksum)
+    End Function
+
+    Public Function GetHash(FilePath As String) As String
+        Return GetChecksum(FilePath)
+    End Function
+
+    Public Function GetHashFromString(pStringToCheck As String) As String
+        Return GetChecksumFromString(pStringToCheck)
+    End Function
+
+    Private Function FormatHash(pChecksum)
+        Return BitConverter.
+            ToString(pChecksum).
+            Replace("-", String.Empty)
+    End Function
+
+    ''' <summary>
+    ''' Adds file version string to given filename `Destination` if that file already exists.
+    ''' </summary>
+    ''' <param name="pFilePath">Filepath to check</param>
+    ''' <returns>Versioned string</returns>
+    Public Function GetVersionedFilename(pFilePath As String) As String
+        Return GetVersionedFilenameWithFilecheck(pFilePath, Function(pPath As String) IO.File.Exists(pPath))
+    End Function
+
+    ''' <summary>
+    ''' Adds file version string to given filename `Destination` if that file already exists.
+    ''' </summary>
+    ''' <param name="pFilePath">Filepath to check</param>
+    ''' <param name="pFileExistsAction">Custom action to check for file existence</param>
+    ''' <returns>Versioned string</returns>
+    Public Function GetVersionedFilenameWithFilecheck(pFilePath As String, pFileExistsAction As Func(Of String, Boolean)) As String
+        Try
+            Dim oFileName As String = pFilePath
+            Dim oFinalFileName = oFileName
+
+            Dim oDestinationDir = Path.GetDirectoryName(oFileName)
+            Dim oExtension = Path.GetExtension(oFileName)
+
+            Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
+            Dim oSplitResult = GetVersionedString(oFileNameWithoutExtension)
+
+            oFileNameWithoutExtension = oSplitResult.Item1
+            Dim oFileVersion As Integer = oSplitResult.Item2
+
+            ' Shorten the filename (only filename, without extension or version)
+            ' by cutting the length in half. This should work no matter how long the path and/or filename are.
+            ' The initial check operates on the full path to catch all scenarios.
+            If pFilePath.Length > MAX_FILE_PATH_LENGTH Then
+                _Logger.Info("Filename is too long. Filename will be cut to prevent further errors.")
+                _Logger.Info("Original Filename is: {0}", oFileNameWithoutExtension)
+                Dim oNewLength As Integer = CInt(Math.Floor(oFileNameWithoutExtension.Length / 2.0))
+                Dim oNewFileNameWithoutExtension = oFileNameWithoutExtension.Substring(0, oNewLength)
+                _Logger.Info("New Filename will be: {0}", oNewFileNameWithoutExtension)
+
+                oFileNameWithoutExtension = oNewFileNameWithoutExtension
+            End If
+
+            ' while file exists, increment version.
+            ' version cannot go above MAX_FILE_VERSION, to prevent infinite loop
+            Do
+                oFinalFileName = Path.Combine(oDestinationDir, GetFilenameWithVersion(oFileNameWithoutExtension, oFileVersion, oExtension))
+                _Logger.Debug("Intermediate Filename is {0}", oFinalFileName)
+                _Logger.Debug("File version: {0}", oFileVersion)
+                oFileVersion += 1
+            Loop While pFileExistsAction(oFinalFileName) = True And oFileVersion < MAX_FILE_VERSION
+
+            If oFileVersion >= MAX_FILE_VERSION Then
+                Throw New OverflowException($"Tried '{MAX_FILE_VERSION}' times to version filename before giving up. Sorry.")
+            End If
+
+            _Logger.Debug("Final Filename is {0}", oFinalFileName)
+
+            Return oFinalFileName
+        Catch ex As Exception
+            _Logger.Warn("Filename {0} could not be versioned. Original filename will be returned!", pFilePath)
+            _Logger.Error(ex)
+            Return pFilePath
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Split String at version separator to:
+    ''' check if string is already versioned,
+    ''' get the string version of an already versioned string
+    ''' </summary>
+    ''' <example>
+    ''' Examples: 
+    ''' test1.pdf         --> test1           --> ['test1']               --> no fileversion
+    ''' test1~2.pdf       --> test1~2         --> ['test1', '2']          --> version 2
+    ''' test1~12345~2.pdf --> test1~12345~2   --> ['test1', '12345', '2'] --> still version 2
+    ''' somestring~3      --> somestring~3    --> ['somestring', '3']     --> version 3
+    ''' </example>
+    ''' <param name="pString">The string to versioned</param>
+    ''' <returns>Tuple of string and version</returns>
+    Public Function GetVersionedString(pString As String) As Tuple(Of String, Integer)
+        Dim oSplitString = pString.Split(VERSION_SEPARATOR).ToList()
+        Dim oStringVersion As Integer
+
+        ' if string is already versioned, extract string version
+        ' else just use the string and set version to 1
+        If oSplitString.Count > 1 Then
+            Dim oVersion As Integer = 1
+            Try
+                oVersion = Integer.Parse(oSplitString.Last())
+                pString = String.Join("", oSplitString.Take(oSplitString.Count - 1))
+            Catch ex As Exception
+                ' pString does NOT change
+                pString = pString
+            Finally
+                oStringVersion = oVersion
+            End Try
+        Else
+            oStringVersion = 1
+        End If
+
+        _Logger.Debug("Versioned: String [{0}], Version [{1}]", pString, oStringVersion)
+
+        Return New Tuple(Of String, Integer)(pString, oStringVersion)
+    End Function
+
+    Public Function GetAppDataPath(CompanyName As String, ProductName As String)
+        Dim oLocalAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
+        Return Path.Combine(oLocalAppData, CompanyName, ProductName)
+    End Function
+
+    Private Function GetFilenameWithVersion(FileNameWithoutExtension As String, FileVersion As Integer, Extension As String) As String
+        If FileVersion <= 1 Then
+            Return $"{FileNameWithoutExtension}{Extension}"
+        Else
+            Return $"{FileNameWithoutExtension}{VERSION_SEPARATOR}{FileVersion}{Extension}"
+        End If
+    End Function
+
+    ''' <summary>
+    ''' Removes files in a directory filtered by filename, extension and last write date
+    ''' </summary>
+    ''' <param name="Path">The directory in which files will be deleted</param>
+    ''' <param name="FileKeepTime">Only delete files which are older than x days. Must be between 0 and 1000 days.</param>
+    ''' <param name="FileBaseName">A filename filter which will be checked</param>
+    ''' <param name="FileExtension">A file extension which will be checked</param>
+    ''' <param name="ContinueOnError">Should the function continue with deleting when a file could not be deleted?</param>
+    ''' <returns>True if all files were deleted or if no files were deleted, otherwise false</returns>
+    Public Function RemoveFiles(Path As String, FileKeepTime As Integer, FileBaseName As String, Optional FileExtension As String = "log", Optional ContinueOnError As Boolean = True) As Boolean
+        If Not TestPathIsDirectory(Path) Then
+            Throw New ArgumentException($"Path {Path} is not a directory!")
+        End If
+
+        If Not Directory.Exists(Path) Then
+            Throw New DirectoryNotFoundException($"Path {Path} does not exist!")
+        End If
+
+        If FileKeepTime < 0 Or FileKeepTime > 1000 Then
+            Throw New ArgumentOutOfRangeException("FileKeepTime must be an integer between 0 and 1000!")
+        End If
+
+        Dim oUnableToDeleteCounter = 0
+        Dim oDirectory As New DirectoryInfo(Path)
+        Dim oDateLimit As DateTime = DateTime.Now.AddDays(FileKeepTime)
+        Dim oFiles As List(Of FileInfo) = oDirectory.
+            EnumerateFiles($"*{FileBaseName}*").
+            Where(Function(oFileInfo As FileInfo)
+                      Return oFileInfo.Extension = FileExtension And oFileInfo.LastWriteTime < oDateLimit
+                  End Function).
+                  ToList()
+
+        If oFiles.Count = 0 Then
+            _Logger.Debug("No files found that match the criterias.")
+            Return True
+        End If
+
+        _Logger.Debug("Deleting old files (Found {0}).", oFiles.Count)
+
+        For Each oFile As FileInfo In oFiles
+            Try
+                oFile.Delete()
+            Catch ex As Exception
+                If ContinueOnError = False Then
+                    _Logger.Warn("Deleting files was aborted at file {0}.", oFile.FullName)
+                    Return False
+                End If
+                oUnableToDeleteCounter += 1
+                _Logger.Warn("File {0} could not be deleted!")
+            End Try
+        Next
+
+        If oUnableToDeleteCounter > 0 Then
+            _Logger.Debug("Old files partially removed. {0} files could not be removed.", oUnableToDeleteCounter)
+        Else
+            _Logger.Debug("Old files removed.")
+        End If
+
+        Return True
+    End Function
+
+    <DebuggerStepThrough>
+    Public Sub MoveTo(FilePath As String, Directory As String)
+        Dim oFileInfo As New FileInfo(FilePath)
+        IO.File.Move(FilePath, Path.Combine(Directory, oFileInfo.Name))
+    End Sub
+
+    <DebuggerStepThrough>
+    Public Sub MoveTo(FilePath As String, NewFileName As String, Directory As String)
+        IO.File.Move(FilePath, Path.Combine(Directory, NewFileName))
+    End Sub
+
+    ''' <summary>
+    ''' Copied from https://docs.microsoft.com/en-us/dotnet/standard/io/how-to-copy-directories
+    ''' </summary>
+    ''' <param name="SourceDirName"></param>
+    ''' <param name="DestDirName"></param>
+    ''' <param name="CopySubDirs"></param>
+    Public Sub CopyDirectory(ByVal SourceDirName As String, ByVal DestDirName As String, ByVal CopySubDirs As Boolean)
+        Dim oDirectory As New DirectoryInfo(SourceDirName)
+
+        If Not oDirectory.Exists Then
+            Throw New DirectoryNotFoundException("Source directory does not exist or could not be found: " & SourceDirName)
+        End If
+
+        Dim oDirectories As DirectoryInfo() = oDirectory.GetDirectories()
+        Directory.CreateDirectory(DestDirName)
+        Dim oFiles As FileInfo() = oDirectory.GetFiles()
+
+        For Each oFile As FileInfo In oFiles
+            Dim tempPath As String = Path.Combine(DestDirName, oFile.Name)
+            oFile.CopyTo(tempPath, False)
+        Next
+
+        If CopySubDirs Then
+            For Each oSubDirectory As DirectoryInfo In oDirectories
+                Dim oTempPath As String = Path.Combine(DestDirName, oSubDirectory.Name)
+                CopyDirectory(oSubDirectory.FullName, oTempPath, CopySubDirs)
+            Next
+        End If
+    End Sub
+
+    ''' <summary>
+    ''' Tries to create a directory and returns its path.
+    ''' Returns a temp path if `DirectoryPath` can not be created or written to.
+    ''' </summary>
+    ''' <param name="DirectoryPath">The directory to create</param>
+    ''' <param name="TestWriteAccess">Should a write access test be performed?</param>
+    ''' <returns>The used path</returns>
+    Public Function CreateDirectory(DirectoryPath As String, Optional TestWriteAccess As Boolean = True) As String
+        Dim oFinalPath As String
+        If Directory.Exists(DirectoryPath) Then
+            _Logger.Debug("Directory {0} already exists. Skipping.", DirectoryPath)
+            oFinalPath = DirectoryPath
+        Else
+            Try
+                Directory.CreateDirectory(DirectoryPath)
+                oFinalPath = DirectoryPath
+            Catch ex As Exception
+                _Logger.Error(ex)
+                _Logger.Warn("Directory {0} could not be created. Temp path will be used instead.", DirectoryPath)
+                oFinalPath = Path.GetTempPath()
+            End Try
+        End If
+
+        If TestWriteAccess AndAlso Not TestPathIsWritable(DirectoryPath) Then
+            _Logger.Warn("Directory {0} is not writable. Temp path will be used instead.", DirectoryPath)
+            oFinalPath = Path.GetTempPath()
+        Else
+            oFinalPath = DirectoryPath
+        End If
+
+        _Logger.Debug("Using path {0}", oFinalPath)
+
+        Return oFinalPath
+    End Function
+
+    Public Function TestPathIsWritable(DirectoryPath As String) As Boolean
+        Try
+            Dim fileAccessPath = Path.Combine(DirectoryPath, FILE_NAME_ACCESS_TEST)
+            Using fs As FileStream = IO.File.Create(fileAccessPath)
+                fs.WriteByte(0)
+            End Using
+
+            IO.File.Delete(fileAccessPath)
+            Return True
+        Catch ex As Exception
+            Return False
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Checks if a file is locked, ie. in use by another process.
+    ''' </summary>
+    ''' <remarks>
+    ''' https://docs.microsoft.com/en-us/dotnet/standard/io/handling-io-errors
+    ''' https://stackoverflow.com/questions/876473/is-there-a-way-to-check-if-a-file-is-in-use
+    ''' </remarks>
+    Public Function TestFileIsLocked(pFilePath As String) As Boolean
+        Try
+            Using stream As FileStream = IO.File.Open(pFilePath, FileMode.Open, FileAccess.ReadWrite, FileShare.None)
+                stream.Close()
+            End Using
+        Catch ex As Exception When ((ex.HResult And &HFFFF) = 32)
+            Return True
+        Catch ex As Exception
+            Return True
+        End Try
+
+        Return False
+    End Function
+
+    Public Function TestPathIsDirectory(Path As String) As Boolean
+        If Not Directory.Exists(Path) Then
+            Return False
+        End If
+
+        Dim oIsDirectory As Boolean = (System.IO.File.GetAttributes(Path) And FileAttributes.Directory) = FileAttributes.Directory
+        Return oIsDirectory
+    End Function
+
+    ''' <summary>
+    ''' Checks the size of the supplied file.
+    ''' </summary>
+    ''' <param name="pFilePath"></param>
+    ''' <param name="pMaxFileSizeInMegaBytes"></param>
+    ''' <returns></returns>
+    Public Function TestFileSizeIsLessThanMaxFileSize(pFilePath As String, pMaxFileSizeInMegabytes As Integer) As Boolean
+        Dim oFileInfo As New FileInfo(pFilePath)
+
+        _Logger.Info("Checking Filesize of {0}", oFileInfo.Name)
+        _Logger.Debug("Filesize threshold is {0} MB.", pMaxFileSizeInMegabytes)
+
+        If pMaxFileSizeInMegabytes <= 0 Then
+            _Logger.Debug("Filesize is not configured. Skipping check.")
+            Return True
+        End If
+
+        Dim oMaxSize = pMaxFileSizeInMegabytes * 1024 * 1024
+
+        If oMaxSize > 0 And oFileInfo.Length > oMaxSize Then
+            _Logger.Debug("Filesize is bigger than threshold.")
+            Return False
+        Else
+            _Logger.Debug("Filesize is smaller than threshold. All fine.")
+            Return True
+        End If
+    End Function
+
+    Public Function GetDateDirectory(pBaseDirectory As String, pDate As Date) As String
+        Dim oDateDirectory = GetDateString(pDate)
+        Dim oFinalDirectory As String = IO.Path.Combine(pBaseDirectory, oDateDirectory)
+        Return oFinalDirectory
+    End Function
+
+    Public Function GetDateDirectory(pBaseDirectory As String) As String
+        Return GetDateDirectory(pBaseDirectory, Now)
+    End Function
+
+    Public Function CreateDateDirectory(pBaseDirectory As String, pDate As Date) As String
+        Dim oDateDirectory = GetDateString(pDate)
+        Dim oFinalDirectory As String = IO.Path.Combine(pBaseDirectory, oDateDirectory)
+
+        If IO.Directory.Exists(oFinalDirectory) = False Then
+            _Logger.Debug("Path does not exist, creating: [{0}]", oFinalDirectory)
+            Try
+                Directory.CreateDirectory(oFinalDirectory)
+                _Logger.Debug("Created folder [{0}]", oFinalDirectory)
+            Catch ex As Exception
+                _Logger.Warn("Final path [{0}] could not be created!", oFinalDirectory)
+                _Logger.Error(ex)
+            End Try
+        End If
+
+        Return oFinalDirectory
+    End Function
+
+    Public Function CreateDateDirectory(pBaseDirectory As String) As String
+        Return CreateDateDirectory(pBaseDirectory, Now)
+    End Function
+
+    Public Function GetDateString() As String
+        Return $"{Now:yyyy\\MM\\dd}"
+    End Function
+
+    Public Function GetDateString(pDate As Date) As String
+        Return $"{pDate:yyyy\\MM\\dd}"
+    End Function
+
+    Public Function GetDateTimeString() As String
+        Return $"{Now:yyyy-MM-dd_hh-mm-ffff}"
+    End Function
+
+    Public Function GetDateTimeString(pDate As Date) As String
+        Return $"{pDate:yyyy-MM-dd_hh-mm-ffff}"
+    End Function
+
+    Public Function GetFilenameWithSuffix(pFilePath As String, pSuffix As String)
+        Dim oFileInfo = New IO.FileInfo(pFilePath)
+        Return GetFilenameWithSuffix(IO.Path.GetFileNameWithoutExtension(pFilePath), pSuffix, oFileInfo.Extension.Substring(1))
+    End Function
+
+    Public Function GetFilenameWithSuffix(pBaseString As String, pSuffix As String, pExtension As String)
+        Return $"{pBaseString}-{pSuffix}.{pExtension}"
+    End Function
+
+    Public Function GetFilenameWithPrefix(pFilePath As String, pPrefix As String)
+        Dim oFileInfo = New IO.FileInfo(pFilePath)
+        Return GetFilenameWithSuffix(IO.Path.GetFileNameWithoutExtension(pFilePath), pPrefix, oFileInfo.Extension.Substring(1))
+    End Function
+
+    Public Function GetFilenameWithPrefix(pBaseString As String, pPrefix As String, pExtension As String)
+        Return $"{pPrefix}-{pBaseString}.{pExtension}"
+    End Function
+End Class

Base/GraphicsEx.vb

@@ -0,0 +1,43 @@
+Imports System.Drawing
+
+Public Class GraphicsEx
+
+    ''' <summary>
+    ''' Returns the brightness of a color as a number between 0 and 1
+    ''' </summary>
+    ''' <param name="pColor">The color to check</param>
+    ''' <returns>Low values for dark colors, high values for bright colors.</returns>
+    Public Shared Function GetBrightness(pColor As Color) As Single
+        Return (pColor.R * 0.299F + pColor.G * 0.587F + pColor.B * 0.114F) / 256.0F
+    End Function
+
+    ''' <summary>
+    ''' Returns a foreground/text color of either black or white, depending on the brightness of `pOtherColor`
+    ''' </summary>
+    ''' <param name="pOtherColor">The Background color whose brightness is determined</param>
+    ''' <returns>A text color which is either white or black</returns>
+    Public Shared Function GetContrastedColor(pOtherColor As Color) As Color
+        If GetBrightness(pOtherColor) < 0.55 Then
+            Return Color.White
+        Else
+            Return Color.Black
+        End If
+    End Function
+
+    Public Sub DrawRectangle(Bounds As Rectangle)
+        Dim oContext As IntPtr
+        oContext = NativeMethods.GetDC(IntPtr.Zero)
+
+        Try
+            Dim g As Graphics
+            g = Graphics.FromHdc(oContext)
+            Try
+                g.DrawRectangle(Pens.Red, Bounds)
+            Finally
+                g.Dispose()
+            End Try
+        Finally
+            NativeMethods.ReleaseDC(IntPtr.Zero, oContext)
+        End Try
+    End Sub
+End Class

Base/IDB/Attributes.vb

@@ -1,15 +0,0 @@
-Namespace IDB
-    Public Class Attributes
-        Public Const ATTRIBUTE_DOCTYPE = "Doctype"
-        Public Const ATTRIBUTE_DYNAMIC_FOLDER = "Dynamic Folder"
-
-        Public Const ATTRIBUTE_ORIGIN_FILENAME = "OriginFileName"
-        Public Const ATTRIBUTE_ORIGIN_CHANGED = "OriginChangedDatetime"
-        Public Const ATTRIBUTE_ORIGIN_CREATED = "OriginCreationDatetime"
-
-        Public Const ATTRIBUTE_DISPLAY_FILENAME = "DisplayFileName"
-        Public Const ATTRIBUTE_DISPLAY_FILENAME1 = "DisplayFileName1"
-
-    End Class
-
-End Namespace

Base/IDB/Constants.vb

@@ -0,0 +1,43 @@
+Namespace IDB
+
+    Public Class Constants
+        Public Class FileStore
+            Public Const FILE_STORE_INVALID_OBEJCT_ID = 0
+
+            Public Const FILE_CHANGED_QUESTION = "QUESTION VERSION"
+            Public Const FILE_CHANGED_OVERWRITE = "AUTO REPLACE"
+            Public Const FILE_CHANGED_VERSION = "AUTO VERSION"
+
+            Public Const OBJECT_STATE_FILE_ADDED = "File added"
+            Public Const OBJECT_STATE_FILE_VERSIONED = "File versioned"
+            Public Const OBJECT_STATE_FILE_CHANGED = "File changed"
+            Public Const OBJECT_STATE_FILE_OPENED = "File opened"
+            Public Const OBJECT_STATE_FILE_DELETED = "File deleted"
+            Public Const OBJECT_STATE_METADATA_CHANGED = "Metadata changed"
+            Public Const OBJECT_STATE_ATTRIBUTEVALUE_DELETED = "Attributevalue deleted"
+            Public Const OBJECT_STATE_FILE_CHECKED_OUT = "File Checked Out"
+            Public Const OBJECT_STATE_FILE_CHECKED_IN = "File Checked In"
+        End Class
+
+        Public Class Database
+            Public Enum NamedDatabase
+                ECM
+                IDB
+            End Enum
+        End Class
+
+        Public Class Attributes
+            Public Const ATTRIBUTE_DOCTYPE = "Doctype"
+            Public Const ATTRIBUTE_DYNAMIC_FOLDER = "Dynamic Folder"
+
+            Public Const ATTRIBUTE_ORIGIN_FILENAME = "OriginFileName"
+            Public Const ATTRIBUTE_ORIGIN_CHANGED = "OriginChangedDatetime"
+            Public Const ATTRIBUTE_ORIGIN_CREATED = "OriginCreationDatetime"
+
+            Public Const ATTRIBUTE_DISPLAY_FILENAME = "DisplayFileName"
+            Public Const ATTRIBUTE_DISPLAY_FILENAME1 = "DisplayFileName1"
+
+        End Class
+    End Class
+
+End Namespace

Base/IDB/Database.vb

@@ -1,11 +0,0 @@
-
-Namespace IDB
-    Public Class Database
-        Public Enum NamedDatabase
-            ECM
-            IDB
-        End Enum
-    End Class
-
-End Namespace
-

Base/IDB/FileStore.vb

@@ -1,20 +0,0 @@
-Namespace IDB
-    Public Class FileStore
-        Public Const FILE_STORE_INVALID_OBEJCT_ID = 0
-
-        Public Const FILE_CHANGED_QUESTION = "QUESTION VERSION"
-        Public Const FILE_CHANGED_OVERWRITE = "AUTO REPLACE"
-        Public Const FILE_CHANGED_VERSION = "AUTO VERSION"
-
-        Public Const OBJECT_STATE_FILE_ADDED = "File added"
-        Public Const OBJECT_STATE_FILE_VERSIONED = "File versioned"
-        Public Const OBJECT_STATE_FILE_CHANGED = "File changed"
-        Public Const OBJECT_STATE_FILE_OPENED = "File opened"
-        Public Const OBJECT_STATE_FILE_DELETED = "File deleted"
-        Public Const OBJECT_STATE_METADATA_CHANGED = "Metadata changed"
-        Public Const OBJECT_STATE_ATTRIBUTEVALUE_DELETED = "Attributevalue deleted"
-        Public Const OBJECT_STATE_FILE_CHECKED_OUT = "File Checked Out"
-        Public Const OBJECT_STATE_FILE_CHECKED_IN = "File Checked In"
-    End Class
-
-End Namespace

Base/LanguageEx.vb

@@ -0,0 +1,55 @@
+Imports System.Globalization
+Imports System.Threading
+Imports DigitalData.Modules.Logging
+
+''' <summary>
+''' Functions relating to i18n, Cultures, Translations
+''' </summary>
+Public Class LanguageEx
+    ''' <summary>
+    ''' Sets the Language of the current thread by setting CurrentCulture and CurrentUICulture
+    ''' </summary>
+    ''' <param name="pLogger">A Logger instance</param>
+    ''' <param name="pUserLanguage">A language code in the form of 'de-DE'</param>
+    ''' <param name="pUserDateFormat">A custom date pattern</param>
+    Public Shared Sub SetApplicationLanguage(pLogger As Logger, pUserLanguage As String, Optional pUserDateFormat As String = Nothing)
+        Try
+            pLogger.Debug("Setting application language..")
+
+            Dim Culture As New CultureInfo(pUserLanguage)
+            If String.IsNullOrEmpty(pUserDateFormat) = False Then
+                Culture.DateTimeFormat.ShortDatePattern = pUserDateFormat
+            End If
+
+            pLogger.Debug("Culture object for language [{0}] created", pUserLanguage)
+
+            ' The following line provides localization for data formats.
+            Thread.CurrentThread.CurrentCulture = Culture
+            ' The following line provides localization for the application's user interface.
+            Thread.CurrentThread.CurrentUICulture = Culture
+
+            ' Set this culture as the default culture for all threads in this application. 
+            ' Note: The following properties are supported in the .NET Framework 4.5+
+            CultureInfo.DefaultThreadCurrentCulture = Culture
+            CultureInfo.DefaultThreadCurrentUICulture = Culture
+
+            pLogger.Debug("Application language set to [{0}]", Culture.Name)
+        Catch ex As Exception
+            pLogger.Warn("Could not set application language!")
+            pLogger.Error(ex)
+        End Try
+    End Sub
+
+    ''' <summary>
+    ''' Logs the culture settings of the current thread
+    ''' </summary>
+    ''' <param name="pLogger">A Logger instance</param>
+    Public Shared Sub LogApplicationLanguage(pLogger As Logger)
+        pLogger.Debug("=== Application Language ===")
+        pLogger.Debug("Thread.CurrentThread.CurrentCulture: [{0}]", Thread.CurrentThread.CurrentCulture)
+        pLogger.Debug("Thread.CurrentThread.CurrentUICulture: [{0}]", Thread.CurrentThread.CurrentUICulture)
+        pLogger.Debug("CultureInfo.DefaultThreadCurrentCulture: [{0}]", CultureInfo.DefaultThreadCurrentCulture)
+        pLogger.Debug("CultureInfo.DefaultThreadCurrentUICulture: [{0}]", CultureInfo.DefaultThreadCurrentUICulture)
+
+    End Sub
+End Class

Base/MimeEx.vb

@@ -0,0 +1,685 @@
+Imports DigitalData.Modules.Logging
+
+Public Class MimeEx
+    Inherits BaseClass
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+    End Sub
+
+    Public Function GetMimeType(ByVal extension As String) As String
+        If extension Is Nothing Then
+            Throw New ArgumentNullException("extension")
+        End If
+
+        If Not extension.StartsWith(".") Then
+            extension = "." & extension
+        End If
+
+        Dim value = Nothing
+
+        If Not _mappings.Value.TryGetValue(extension, value) Then
+            Return "application/octet-stream"
+        End If
+
+        Return value
+    End Function
+
+    Public Function GetExtension(ByVal mimeType As String) As String
+        If mimeType Is Nothing Then
+            Throw New ArgumentNullException("mimeType")
+        End If
+
+        If mimeType.StartsWith(".") Then
+            Throw New ArgumentException("Requested mime type is not valid: " & mimeType)
+        End If
+
+        Dim value = Nothing
+
+        If _mappings.Value.TryGetValue(mimeType, value) Then
+            Return value
+        End If
+
+        Throw New ArgumentException("Requested mime type is not registered: " & mimeType)
+    End Function
+
+    Private ReadOnly _mappings As New Lazy(Of IDictionary(Of String, String))(AddressOf BuildMappings)
+
+    Private Function BuildMappings() As IDictionary(Of String, String)
+        Dim dictionary As New Dictionary(Of String, String)(StringComparer.InvariantCultureIgnoreCase) From {
+            {".323", "text/h323"},
+            {".3g2", "video/3gpp2"},
+            {".3gp", "video/3gpp"},
+            {".3gp2", "video/3gpp2"},
+            {".3gpp", "video/3gpp"},
+            {".7z", "application/x-7z-compressed"},
+            {".aa", "audio/audible"},
+            {".AAC", "audio/aac"},
+            {".aaf", "application/octet-stream"},
+            {".aax", "audio/vnd.audible.aax"},
+            {".ac3", "audio/ac3"},
+            {".aca", "application/octet-stream"},
+            {".accda", "application/msaccess.addin"},
+            {".accdb", "application/msaccess"},
+            {".accdc", "application/msaccess.cab"},
+            {".accde", "application/msaccess"},
+            {".accdr", "application/msaccess.runtime"},
+            {".accdt", "application/msaccess"},
+            {".accdw", "application/msaccess.webapplication"},
+            {".accft", "application/msaccess.ftemplate"},
+            {".acx", "application/internet-property-stream"},
+            {".AddIn", "text/xml"},
+            {".ade", "application/msaccess"},
+            {".adobebridge", "application/x-bridge-url"},
+            {".adp", "application/msaccess"},
+            {".ADT", "audio/vnd.dlna.adts"},
+            {".ADTS", "audio/aac"},
+            {".afm", "application/octet-stream"},
+            {".ai", "application/postscript"},
+            {".aif", "audio/x-aiff"},
+            {".aifc", "audio/aiff"},
+            {".aiff", "audio/aiff"},
+            {".air", "application/vnd.adobe.air-application-installer-package+zip"},
+            {".amc", "application/x-mpeg"},
+            {".application", "application/x-ms-application"},
+            {".art", "image/x-jg"},
+            {".asa", "application/xml"},
+            {".asax", "application/xml"},
+            {".ascx", "application/xml"},
+            {".asd", "application/octet-stream"},
+            {".asf", "video/x-ms-asf"},
+            {".ashx", "application/xml"},
+            {".asi", "application/octet-stream"},
+            {".asm", "text/plain"},
+            {".asmx", "application/xml"},
+            {".aspx", "application/xml"},
+            {".asr", "video/x-ms-asf"},
+            {".asx", "video/x-ms-asf"},
+            {".atom", "application/atom+xml"},
+            {".au", "audio/basic"},
+            {".avi", "video/x-msvideo"},
+            {".axs", "application/olescript"},
+            {".bas", "text/plain"},
+            {".bcpio", "application/x-bcpio"},
+            {".bin", "application/octet-stream"},
+            {".bmp", "image/bmp"},
+            {".c", "text/plain"},
+            {".cab", "application/octet-stream"},
+            {".caf", "audio/x-caf"},
+            {".calx", "application/vnd.ms-office.calx"},
+            {".cat", "application/vnd.ms-pki.seccat"},
+            {".cc", "text/plain"},
+            {".cd", "text/plain"},
+            {".cdda", "audio/aiff"},
+            {".cdf", "application/x-cdf"},
+            {".cer", "application/x-x509-ca-cert"},
+            {".chm", "application/octet-stream"},
+            {".class", "application/x-java-applet"},
+            {".clp", "application/x-msclip"},
+            {".cmx", "image/x-cmx"},
+            {".cnf", "text/plain"},
+            {".cod", "image/cis-cod"},
+            {".config", "application/xml"},
+            {".contact", "text/x-ms-contact"},
+            {".coverage", "application/xml"},
+            {".cpio", "application/x-cpio"},
+            {".cpp", "text/plain"},
+            {".crd", "application/x-mscardfile"},
+            {".crl", "application/pkix-crl"},
+            {".crt", "application/x-x509-ca-cert"},
+            {".cs", "text/plain"},
+            {".csdproj", "text/plain"},
+            {".csh", "application/x-csh"},
+            {".csproj", "text/plain"},
+            {".css", "text/css"},
+            {".csv", "text/csv"},
+            {".cur", "application/octet-stream"},
+            {".cxx", "text/plain"},
+            {".dat", "application/octet-stream"},
+            {".datasource", "application/xml"},
+            {".dbproj", "text/plain"},
+            {".dcr", "application/x-director"},
+            {".def", "text/plain"},
+            {".deploy", "application/octet-stream"},
+            {".der", "application/x-x509-ca-cert"},
+            {".dgml", "application/xml"},
+            {".dib", "image/bmp"},
+            {".dif", "video/x-dv"},
+            {".dir", "application/x-director"},
+            {".disco", "text/xml"},
+            {".divx", "video/divx"},
+            {".dll", "application/x-msdownload"},
+            {".dll.config", "text/xml"},
+            {".dlm", "text/dlm"},
+            {".doc", "application/msword"},
+            {".docm", "application/vnd.ms-word.document.macroEnabled.12"},
+            {".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
+            {".dot", "application/msword"},
+            {".dotm", "application/vnd.ms-word.template.macroEnabled.12"},
+            {".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"},
+            {".dsp", "application/octet-stream"},
+            {".dsw", "text/plain"},
+            {".dtd", "text/xml"},
+            {".dtsConfig", "text/xml"},
+            {".dv", "video/x-dv"},
+            {".dvi", "application/x-dvi"},
+            {".dwf", "drawing/x-dwf"},
+            {".dwp", "application/octet-stream"},
+            {".dxr", "application/x-director"},
+            {".eml", "message/rfc822"},
+            {".emz", "application/octet-stream"},
+            {".eot", "application/octet-stream"},
+            {".eps", "application/postscript"},
+            {".etl", "application/etl"},
+            {".etx", "text/x-setext"},
+            {".evy", "application/envoy"},
+            {".exe", "application/octet-stream"},
+            {".exe.config", "text/xml"},
+            {".fdf", "application/vnd.fdf"},
+            {".fif", "application/fractals"},
+            {".filters", "application/xml"},
+            {".fla", "application/octet-stream"},
+            {".flr", "x-world/x-vrml"},
+            {".flv", "video/x-flv"},
+            {".fsscript", "application/fsharp-script"},
+            {".fsx", "application/fsharp-script"},
+            {".generictest", "application/xml"},
+            {".gif", "image/gif"},
+            {".group", "text/x-ms-group"},
+            {".gsm", "audio/x-gsm"},
+            {".gtar", "application/x-gtar"},
+            {".gz", "application/x-gzip"},
+            {".h", "text/plain"},
+            {".hdf", "application/x-hdf"},
+            {".hdml", "text/x-hdml"},
+            {".hhc", "application/x-oleobject"},
+            {".hhk", "application/octet-stream"},
+            {".hhp", "application/octet-stream"},
+            {".hlp", "application/winhlp"},
+            {".hpp", "text/plain"},
+            {".hqx", "application/mac-binhex40"},
+            {".hta", "application/hta"},
+            {".htc", "text/x-component"},
+            {".htm", "text/html"},
+            {".html", "text/html"},
+            {".htt", "text/webviewhtml"},
+            {".hxa", "application/xml"},
+            {".hxc", "application/xml"},
+            {".hxd", "application/octet-stream"},
+            {".hxe", "application/xml"},
+            {".hxf", "application/xml"},
+            {".hxh", "application/octet-stream"},
+            {".hxi", "application/octet-stream"},
+            {".hxk", "application/xml"},
+            {".hxq", "application/octet-stream"},
+            {".hxr", "application/octet-stream"},
+            {".hxs", "application/octet-stream"},
+            {".hxt", "text/html"},
+            {".hxv", "application/xml"},
+            {".hxw", "application/octet-stream"},
+            {".hxx", "text/plain"},
+            {".i", "text/plain"},
+            {".ico", "image/x-icon"},
+            {".ics", "application/octet-stream"},
+            {".idl", "text/plain"},
+            {".ief", "image/ief"},
+            {".iii", "application/x-iphone"},
+            {".inc", "text/plain"},
+            {".inf", "application/octet-stream"},
+            {".inl", "text/plain"},
+            {".ins", "application/x-internet-signup"},
+            {".ipa", "application/x-itunes-ipa"},
+            {".ipg", "application/x-itunes-ipg"},
+            {".ipproj", "text/plain"},
+            {".ipsw", "application/x-itunes-ipsw"},
+            {".iqy", "text/x-ms-iqy"},
+            {".isp", "application/x-internet-signup"},
+            {".ite", "application/x-itunes-ite"},
+            {".itlp", "application/x-itunes-itlp"},
+            {".itms", "application/x-itunes-itms"},
+            {".itpc", "application/x-itunes-itpc"},
+            {".IVF", "video/x-ivf"},
+            {".jar", "application/java-archive"},
+            {".java", "application/octet-stream"},
+            {".jck", "application/liquidmotion"},
+            {".jcz", "application/liquidmotion"},
+            {".jfif", "image/pjpeg"},
+            {".jnlp", "application/x-java-jnlp-file"},
+            {".jpb", "application/octet-stream"},
+            {".jpe", "image/jpeg"},
+            {".jpeg", "image/jpeg"},
+            {".jpg", "image/jpeg"},
+            {".js", "application/x-javascript"},
+            {".json", "application/json"},
+            {".jsx", "text/jscript"},
+            {".jsxbin", "text/plain"},
+            {".latex", "application/x-latex"},
+            {".library-ms", "application/windows-library+xml"},
+            {".lit", "application/x-ms-reader"},
+            {".loadtest", "application/xml"},
+            {".lpk", "application/octet-stream"},
+            {".lsf", "video/x-la-asf"},
+            {".lst", "text/plain"},
+            {".lsx", "video/x-la-asf"},
+            {".lzh", "application/octet-stream"},
+            {".m13", "application/x-msmediaview"},
+            {".m14", "application/x-msmediaview"},
+            {".m1v", "video/mpeg"},
+            {".m2t", "video/vnd.dlna.mpeg-tts"},
+            {".m2ts", "video/vnd.dlna.mpeg-tts"},
+            {".m2v", "video/mpeg"},
+            {".m3u", "audio/x-mpegurl"},
+            {".m3u8", "audio/x-mpegurl"},
+            {".m4a", "audio/m4a"},
+            {".m4b", "audio/m4b"},
+            {".m4p", "audio/m4p"},
+            {".m4r", "audio/x-m4r"},
+            {".m4v", "video/x-m4v"},
+            {".mac", "image/x-macpaint"},
+            {".mak", "text/plain"},
+            {".man", "application/x-troff-man"},
+            {".manifest", "application/x-ms-manifest"},
+            {".map", "text/plain"},
+            {".master", "application/xml"},
+            {".mda", "application/msaccess"},
+            {".mdb", "application/x-msaccess"},
+            {".mde", "application/msaccess"},
+            {".mdp", "application/octet-stream"},
+            {".me", "application/x-troff-me"},
+            {".mfp", "application/x-shockwave-flash"},
+            {".mht", "message/rfc822"},
+            {".mhtml", "message/rfc822"},
+            {".mid", "audio/mid"},
+            {".midi", "audio/mid"},
+            {".mix", "application/octet-stream"},
+            {".mk", "text/plain"},
+            {".mmf", "application/x-smaf"},
+            {".mno", "text/xml"},
+            {".mny", "application/x-msmoney"},
+            {".mod", "video/mpeg"},
+            {".mov", "video/quicktime"},
+            {".movie", "video/x-sgi-movie"},
+            {".mp2", "video/mpeg"},
+            {".mp2v", "video/mpeg"},
+            {".mp3", "audio/mpeg"},
+            {".mp4", "video/mp4"},
+            {".mp4v", "video/mp4"},
+            {".mpa", "video/mpeg"},
+            {".mpe", "video/mpeg"},
+            {".mpeg", "video/mpeg"},
+            {".mpf", "application/vnd.ms-mediapackage"},
+            {".mpg", "video/mpeg"},
+            {".mpp", "application/vnd.ms-project"},
+            {".mpv2", "video/mpeg"},
+            {".mqv", "video/quicktime"},
+            {".ms", "application/x-troff-ms"},
+            {".msg", "application/vnd.ms-outlook"},
+            {".msi", "application/octet-stream"},
+            {".mso", "application/octet-stream"},
+            {".mts", "video/vnd.dlna.mpeg-tts"},
+            {".mtx", "application/xml"},
+            {".mvb", "application/x-msmediaview"},
+            {".mvc", "application/x-miva-compiled"},
+            {".mxp", "application/x-mmxp"},
+            {".nc", "application/x-netcdf"},
+            {".nsc", "video/x-ms-asf"},
+            {".nws", "message/rfc822"},
+            {".ocx", "application/octet-stream"},
+            {".oda", "application/oda"},
+            {".odb", "application/vnd.oasis.opendocument.database"},
+            {".odc", "application/vnd.oasis.opendocument.chart"},
+            {".odf", "application/vnd.oasis.opendocument.formula"},
+            {".odg", "application/vnd.oasis.opendocument.graphics"},
+            {".odh", "text/plain"},
+            {".odi", "application/vnd.oasis.opendocument.image"},
+            {".odl", "text/plain"},
+            {".odm", "application/vnd.oasis.opendocument.text-master"},
+            {".odp", "application/vnd.oasis.opendocument.presentation"},
+            {".ods", "application/vnd.oasis.opendocument.spreadsheet"},
+            {".odt", "application/vnd.oasis.opendocument.text"},
+            {".ogv", "video/ogg"},
+            {".one", "application/onenote"},
+            {".onea", "application/onenote"},
+            {".onepkg", "application/onenote"},
+            {".onetmp", "application/onenote"},
+            {".onetoc", "application/onenote"},
+            {".onetoc2", "application/onenote"},
+            {".orderedtest", "application/xml"},
+            {".osdx", "application/opensearchdescription+xml"},
+            {".otg", "application/vnd.oasis.opendocument.graphics-template"},
+            {".oth", "application/vnd.oasis.opendocument.text-web"},
+            {".otp", "application/vnd.oasis.opendocument.presentation-template"},
+            {".ots", "application/vnd.oasis.opendocument.spreadsheet-template"},
+            {".ott", "application/vnd.oasis.opendocument.text-template"},
+            {".oxt", "application/vnd.openofficeorg.extension"},
+            {".p10", "application/pkcs10"},
+            {".p12", "application/x-pkcs12"},
+            {".p7b", "application/x-pkcs7-certificates"},
+            {".p7c", "application/pkcs7-mime"},
+            {".p7m", "application/pkcs7-mime"},
+            {".p7r", "application/x-pkcs7-certreqresp"},
+            {".p7s", "application/pkcs7-signature"},
+            {".pbm", "image/x-portable-bitmap"},
+            {".pcast", "application/x-podcast"},
+            {".pct", "image/pict"},
+            {".pcx", "application/octet-stream"},
+            {".pcz", "application/octet-stream"},
+            {".pdf", "application/pdf"},
+            {".pfb", "application/octet-stream"},
+            {".pfm", "application/octet-stream"},
+            {".pfx", "application/x-pkcs12"},
+            {".pgm", "image/x-portable-graymap"},
+            {".pic", "image/pict"},
+            {".pict", "image/pict"},
+            {".pkgdef", "text/plain"},
+            {".pkgundef", "text/plain"},
+            {".pko", "application/vnd.ms-pki.pko"},
+            {".pls", "audio/scpls"},
+            {".pma", "application/x-perfmon"},
+            {".pmc", "application/x-perfmon"},
+            {".pml", "application/x-perfmon"},
+            {".pmr", "application/x-perfmon"},
+            {".pmw", "application/x-perfmon"},
+            {".png", "image/png"},
+            {".pnm", "image/x-portable-anymap"},
+            {".pnt", "image/x-macpaint"},
+            {".pntg", "image/x-macpaint"},
+            {".pnz", "image/png"},
+            {".pot", "application/vnd.ms-powerpoint"},
+            {".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12"},
+            {".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"},
+            {".ppa", "application/vnd.ms-powerpoint"},
+            {".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12"},
+            {".ppm", "image/x-portable-pixmap"},
+            {".pps", "application/vnd.ms-powerpoint"},
+            {".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12"},
+            {".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"},
+            {".ppt", "application/vnd.ms-powerpoint"},
+            {".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12"},
+            {".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
+            {".prf", "application/pics-rules"},
+            {".prm", "application/octet-stream"},
+            {".prx", "application/octet-stream"},
+            {".ps", "application/postscript"},
+            {".psc1", "application/PowerShell"},
+            {".psd", "application/octet-stream"},
+            {".psess", "application/xml"},
+            {".psm", "application/octet-stream"},
+            {".psp", "application/octet-stream"},
+            {".pub", "application/x-mspublisher"},
+            {".pwz", "application/vnd.ms-powerpoint"},
+            {".qht", "text/x-html-insertion"},
+            {".qhtm", "text/x-html-insertion"},
+            {".qt", "video/quicktime"},
+            {".qti", "image/x-quicktime"},
+            {".qtif", "image/x-quicktime"},
+            {".qtl", "application/x-quicktimeplayer"},
+            {".qxd", "application/octet-stream"},
+            {".ra", "audio/x-pn-realaudio"},
+            {".ram", "audio/x-pn-realaudio"},
+            {".rar", "application/octet-stream"},
+            {".ras", "image/x-cmu-raster"},
+            {".rat", "application/rat-file"},
+            {".rc", "text/plain"},
+            {".rc2", "text/plain"},
+            {".rct", "text/plain"},
+            {".rdlc", "application/xml"},
+            {".resx", "application/xml"},
+            {".rf", "image/vnd.rn-realflash"},
+            {".rgb", "image/x-rgb"},
+            {".rgs", "text/plain"},
+            {".rm", "application/vnd.rn-realmedia"},
+            {".rmi", "audio/mid"},
+            {".rmp", "application/vnd.rn-rn_music_package"},
+            {".roff", "application/x-troff"},
+            {".rpm", "audio/x-pn-realaudio-plugin"},
+            {".rqy", "text/x-ms-rqy"},
+            {".rtf", "application/rtf"},
+            {".rtx", "text/richtext"},
+            {".ruleset", "application/xml"},
+            {".s", "text/plain"},
+            {".safariextz", "application/x-safari-safariextz"},
+            {".scd", "application/x-msschedule"},
+            {".sct", "text/scriptlet"},
+            {".sd2", "audio/x-sd2"},
+            {".sdp", "application/sdp"},
+            {".sea", "application/octet-stream"},
+            {".searchConnector-ms", "application/windows-search-connector+xml"},
+            {".setpay", "application/set-payment-initiation"},
+            {".setreg", "application/set-registration-initiation"},
+            {".settings", "application/xml"},
+            {".sgimb", "application/x-sgimb"},
+            {".sgml", "text/sgml"},
+            {".sh", "application/x-sh"},
+            {".shar", "application/x-shar"},
+            {".shtml", "text/html"},
+            {".sit", "application/x-stuffit"},
+            {".sitemap", "application/xml"},
+            {".skin", "application/xml"},
+            {".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12"},
+            {".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide"},
+            {".slk", "application/vnd.ms-excel"},
+            {".sln", "text/plain"},
+            {".slupkg-ms", "application/x-ms-license"},
+            {".smd", "audio/x-smd"},
+            {".smi", "application/octet-stream"},
+            {".smx", "audio/x-smd"},
+            {".smz", "audio/x-smd"},
+            {".snd", "audio/basic"},
+            {".snippet", "application/xml"},
+            {".snp", "application/octet-stream"},
+            {".sol", "text/plain"},
+            {".sor", "text/plain"},
+            {".spc", "application/x-pkcs7-certificates"},
+            {".spl", "application/futuresplash"},
+            {".src", "application/x-wais-source"},
+            {".srf", "text/plain"},
+            {".SSISDeploymentManifest", "text/xml"},
+            {".ssm", "application/streamingmedia"},
+            {".sst", "application/vnd.ms-pki.certstore"},
+            {".stl", "application/vnd.ms-pki.stl"},
+            {".sv4cpio", "application/x-sv4cpio"},
+            {".sv4crc", "application/x-sv4crc"},
+            {".svc", "application/xml"},
+            {".svg", "image/svg+xml"},
+            {".swf", "application/x-shockwave-flash"},
+            {".t", "application/x-troff"},
+            {".tar", "application/x-tar"},
+            {".tcl", "application/x-tcl"},
+            {".testrunconfig", "application/xml"},
+            {".testsettings", "application/xml"},
+            {".tex", "application/x-tex"},
+            {".texi", "application/x-texinfo"},
+            {".texinfo", "application/x-texinfo"},
+            {".tgz", "application/x-compressed"},
+            {".thmx", "application/vnd.ms-officetheme"},
+            {".thn", "application/octet-stream"},
+            {".tif", "image/tiff"},
+            {".tiff", "image/tiff"},
+            {".tlh", "text/plain"},
+            {".tli", "text/plain"},
+            {".toc", "application/octet-stream"},
+            {".tr", "application/x-troff"},
+            {".trm", "application/x-msterminal"},
+            {".trx", "application/xml"},
+            {".ts", "video/vnd.dlna.mpeg-tts"},
+            {".tsv", "text/tab-separated-values"},
+            {".ttf", "application/octet-stream"},
+            {".tts", "video/vnd.dlna.mpeg-tts"},
+            {".txt", "text/plain"},
+            {".u32", "application/octet-stream"},
+            {".uls", "text/iuls"},
+            {".user", "text/plain"},
+            {".ustar", "application/x-ustar"},
+            {".vb", "text/plain"},
+            {".vbdproj", "text/plain"},
+            {".vbk", "video/mpeg"},
+            {".vbproj", "text/plain"},
+            {".vbs", "text/vbscript"},
+            {".vcf", "text/x-vcard"},
+            {".vcproj", "application/xml"},
+            {".vcs", "text/plain"},
+            {".vcxproj", "application/xml"},
+            {".vddproj", "text/plain"},
+            {".vdp", "text/plain"},
+            {".vdproj", "text/plain"},
+            {".vdx", "application/vnd.ms-visio.viewer"},
+            {".vml", "text/xml"},
+            {".vscontent", "application/xml"},
+            {".vsct", "text/xml"},
+            {".vsd", "application/vnd.visio"},
+            {".vsi", "application/ms-vsi"},
+            {".vsix", "application/vsix"},
+            {".vsixlangpack", "text/xml"},
+            {".vsixmanifest", "text/xml"},
+            {".vsmdi", "application/xml"},
+            {".vspscc", "text/plain"},
+            {".vss", "application/vnd.visio"},
+            {".vsscc", "text/plain"},
+            {".vssettings", "text/xml"},
+            {".vssscc", "text/plain"},
+            {".vst", "application/vnd.visio"},
+            {".vstemplate", "text/xml"},
+            {".vsto", "application/x-ms-vsto"},
+            {".vsw", "application/vnd.visio"},
+            {".vsx", "application/vnd.visio"},
+            {".vtx", "application/vnd.visio"},
+            {".wav", "audio/wav"},
+            {".wave", "audio/wav"},
+            {".wax", "audio/x-ms-wax"},
+            {".wbk", "application/msword"},
+            {".wbmp", "image/vnd.wap.wbmp"},
+            {".wcm", "application/vnd.ms-works"},
+            {".wdb", "application/vnd.ms-works"},
+            {".wdp", "image/vnd.ms-photo"},
+            {".webarchive", "application/x-safari-webarchive"},
+            {".webm", "video/webm"},
+            {".webp", "image/webp"},
+            {".webtest", "application/xml"},
+            {".wiq", "application/xml"},
+            {".wiz", "application/msword"},
+            {".wks", "application/vnd.ms-works"},
+            {".WLMP", "application/wlmoviemaker"},
+            {".wlpginstall", "application/x-wlpg-detect"},
+            {".wlpginstall3", "application/x-wlpg3-detect"},
+            {".wm", "video/x-ms-wm"},
+            {".wma", "audio/x-ms-wma"},
+            {".wmd", "application/x-ms-wmd"},
+            {".wmf", "application/x-msmetafile"},
+            {".wml", "text/vnd.wap.wml"},
+            {".wmlc", "application/vnd.wap.wmlc"},
+            {".wmls", "text/vnd.wap.wmlscript"},
+            {".wmlsc", "application/vnd.wap.wmlscriptc"},
+            {".wmp", "video/x-ms-wmp"},
+            {".wmv", "video/x-ms-wmv"},
+            {".wmx", "video/x-ms-wmx"},
+            {".wmz", "application/x-ms-wmz"},
+            {".wpl", "application/vnd.ms-wpl"},
+            {".wps", "application/vnd.ms-works"},
+            {".wri", "application/x-mswrite"},
+            {".wrl", "x-world/x-vrml"},
+            {".wrz", "x-world/x-vrml"},
+            {".wsc", "text/scriptlet"},
+            {".wsdl", "text/xml"},
+            {".wvx", "video/x-ms-wvx"},
+            {".x", "application/directx"},
+            {".xaf", "x-world/x-vrml"},
+            {".xaml", "application/xaml+xml"},
+            {".xap", "application/x-silverlight-app"},
+            {".xbap", "application/x-ms-xbap"},
+            {".xbm", "image/x-xbitmap"},
+            {".xdr", "text/plain"},
+            {".xht", "application/xhtml+xml"},
+            {".xhtml", "application/xhtml+xml"},
+            {".xla", "application/vnd.ms-excel"},
+            {".xlam", "application/vnd.ms-excel.addin.macroEnabled.12"},
+            {".xlc", "application/vnd.ms-excel"},
+            {".xld", "application/vnd.ms-excel"},
+            {".xlk", "application/vnd.ms-excel"},
+            {".xll", "application/vnd.ms-excel"},
+            {".xlm", "application/vnd.ms-excel"},
+            {".xls", "application/vnd.ms-excel"},
+            {".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12"},
+            {".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12"},
+            {".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
+            {".xlt", "application/vnd.ms-excel"},
+            {".xltm", "application/vnd.ms-excel.template.macroEnabled.12"},
+            {".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"},
+            {".xlw", "application/vnd.ms-excel"},
+            {".xml", "text/xml"},
+            {".xmta", "application/xml"},
+            {".xof", "x-world/x-vrml"},
+            {".XOML", "text/plain"},
+            {".xpm", "image/x-xpixmap"},
+            {".xps", "application/vnd.ms-xpsdocument"},
+            {".xrm-ms", "text/xml"},
+            {".xsc", "application/xml"},
+            {".xsd", "text/xml"},
+            {".xsf", "text/xml"},
+            {".xsl", "text/xml"},
+            {".xslt", "text/xml"},
+            {".xsn", "application/octet-stream"},
+            {".xss", "application/xml"},
+            {".xtp", "application/octet-stream"},
+            {".xwd", "image/x-xwindowdump"},
+            {".z", "application/x-compress"},
+            {".zip", "application/x-zip-compressed"},
+            {"application/fsharp-script", ".fsx"},
+            {"application/msaccess", ".adp"},
+            {"application/msword", ".doc"},
+            {"application/octet-stream", ".bin"},
+            {"application/onenote", ".one"},
+            {"application/postscript", ".eps"},
+            {"application/vnd.ms-excel", ".xls"},
+            {"application/vnd.ms-powerpoint", ".ppt"},
+            {"application/vnd.ms-works", ".wks"},
+            {"application/vnd.visio", ".vsd"},
+            {"application/x-director", ".dir"},
+            {"application/x-shockwave-flash", ".swf"},
+            {"application/x-x509-ca-cert", ".cer"},
+            {"application/xhtml+xml", ".xhtml"},
+            {"application/xml", ".xml"},
+            {"audio/aac", ".AAC"},
+            {"audio/aiff", ".aiff"},
+            {"audio/basic", ".snd"},
+            {"audio/mid", ".midi"},
+            {"audio/wav", ".wav"},
+            {"audio/x-mpegurl", ".m3u"},
+            {"audio/x-pn-realaudio", ".ra"},
+            {"audio/x-smd", ".smd"},
+            {"image/bmp", ".bmp"},
+            {"image/jpeg", ".jpg"},
+            {"image/pict", ".pic"},
+            {"image/png", ".png"},
+            {"image/tiff", ".tiff"},
+            {"image/x-macpaint", ".mac"},
+            {"image/x-quicktime", ".qti"},
+            {"message/rfc822", ".eml"},
+            {"text/html", ".html"},
+            {"text/plain", ".txt"},
+            {"text/scriptlet", ".wsc"},
+            {"text/xml", ".xml"},
+            {"video/3gpp", ".3gp"},
+            {"video/3gpp2", ".3gp2"},
+            {"video/mp4", ".mp4"},
+            {"video/mpeg", ".mpg"},
+            {"video/quicktime", ".mov"},
+            {"video/vnd.dlna.mpeg-tts", ".m2t"},
+            {"video/x-dv", ".dv"},
+            {"video/x-la-asf", ".lsf"},
+            {"video/x-ms-asf", ".asf"},
+            {"x-world/x-vrml", ".xof"}
+        }
+        Dim dictionary2 As Dictionary(Of String, String) = dictionary
+        Dim list As List(Of KeyValuePair(Of String, String)) = dictionary2.ToList()
+
+        For Each item As KeyValuePair(Of String, String) In list
+
+            If Not dictionary2.ContainsKey(item.Value) Then
+                dictionary2.Add(item.Value, item.Key)
+            End If
+        Next
+
+        Return dictionary2
+    End Function
+End Class

Base/ModuleExtensions.vb

@@ -0,0 +1,174 @@
+Imports System.Runtime.CompilerServices
+Imports System.Web
+
+Public Module ModuleExtensions
+    Const UnixEraStartTicks As Long = 621355968000000000
+
+    ' ======================================================
+    ' === DATETIME
+    ' ======================================================
+
+    <Extension()>
+    Public Function GetUnixTimestamp(pDate As Date) As Long
+        Dim UnixEraTicks = pDate.Ticks - UnixEraStartTicks
+        Return UnixEraTicks \ 10000
+    End Function
+
+    <Extension()>
+    Public Function DateFromUnix(pTimestamp As Long) As Date
+        Return New Date(UnixEraStartTicks + pTimestamp * 10000)
+    End Function
+
+    ' ======================================================
+    ' === LIST
+    ' ======================================================
+
+    <Extension()>
+    Public Function JoinToString(pList As IEnumerable(Of String), pSeparator As Char)
+        Return String.Join(pSeparator, pList)
+    End Function
+
+    ' ======================================================
+    ' === STRING
+    ' ======================================================
+
+    ''' <summary>
+    ''' Truncates a string to the specified length if it exceeds that length.
+    ''' </summary>
+    ''' <param name="pString">The string</param>
+    ''' <param name="pLength">The maximum string length</param>
+    ''' <returns>The truncated string</returns>
+    <Extension()>
+    Public Function Truncate(pString As String, pLength As Integer) As String
+        If String.IsNullOrEmpty(pString) Then Return pString
+        Return pString.Substring(0, Math.Min(pLength, pString.Length))
+    End Function
+
+    ''' <summary>
+    ''' Replaces single quotes in text for SQL Commands.
+    ''' </summary>
+    ''' <param name="pString">The string</param>
+    ''' <returns>The escaped string.</returns>
+    <Extension()>
+    Public Function EscapeForSQL(pString As String) As String
+        Return ObjectEx.NotNull(pString, String.Empty).Replace("'", "''")
+    End Function
+
+    ''' <summary>
+    ''' Converts a string to boolean. Accepts true and 1 as truthy values
+    ''' </summary>
+    ''' <param name="pString">The input string</param>
+    ''' <returns>True if input is true or 1, otherwise false.</returns>
+    <Extension()>
+    Public Function ToBoolean(pString As String) As Boolean
+        If String.IsNullOrEmpty(pString) Then Return False
+        Return (pString.Trim().ToLower() = "true") OrElse (pString.Trim() = "1")
+    End Function
+
+    ''' <summary>
+    ''' Checks if a string is null or empty
+    ''' </summary>
+    ''' <param name="pString">The input string</param>
+    ''' <returns>True string is null or empty, otherwise false.</returns>
+    <Extension()>
+    Public Function IsNullOrEmpty(pString As String) As Boolean
+        Return String.IsNullOrEmpty(pString)
+    End Function
+
+    ''' <summary>
+    ''' Checks if a string is NOT null or empty
+    ''' </summary>
+    ''' <param name="pString">The input string</param>
+    ''' <returns>True string is null or empty, otherwise false.</returns>
+    <Extension()>
+    Public Function IsNotNullOrEmpty(pString As String) As Boolean
+        If String.IsNullOrEmpty(pString) Then
+            Return False
+        Else
+            Return True
+        End If
+    End Function
+
+    ' ======================================================
+    ' === DICTIONARY
+    ' ======================================================
+
+    <Extension()>
+    Public Function ToURLQueryString(pDictionary As IDictionary(Of String, String)) As String
+        Dim oQueryString = HttpUtility.ParseQueryString(String.Empty)
+
+        For Each oItem As KeyValuePair(Of String, String) In pDictionary
+            oQueryString.Add(oItem.Key, oItem.Value)
+        Next
+
+        Return oQueryString.ToString()
+    End Function
+
+    ' ======================================================
+    ' === DATATABLE
+    ' ======================================================
+
+    <Extension()>
+    Public Function ItemEx(Of T)(pRow As DataRow, pFieldName As String, Optional pDefaultValue As T = Nothing) As T
+        Try
+            If TableContainsColumn(pRow.Table, pFieldName) = False Then Return pDefaultValue
+            Return ObjectEx.NotNull(pRow.Item(pFieldName), pDefaultValue)
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
+    <Extension()>
+    Public Function ItemEx(Of T)(pRow As DataRow, pFieldIndex As Integer, Optional pDefaultValue As T = Nothing) As T
+        Try
+            If TableContainsColumn(pRow.Table, pFieldIndex) = False Then Return pDefaultValue
+            Return ObjectEx.NotNull(pRow.Item(pFieldIndex), pDefaultValue)
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
+    <Extension()>
+    Public Function FieldOrDefault(Of T)(pRow As DataRow, pFieldName As String, Optional pDefaultValue As T = Nothing) As T
+        Return ItemEx(pRow, pFieldName, pDefaultValue)
+    End Function
+
+    <Extension()>
+    Public Function FieldOrDefault(Of T)(pRow As DataRow, pFieldIndex As Integer, Optional pDefaultValue As T = Nothing) As T
+        Return ItemEx(pRow, pFieldIndex, pDefaultValue)
+    End Function
+
+    <Extension()>
+    Public Function First(pTable As DataTable) As DataRow
+        Try
+            If pTable Is Nothing OrElse pTable.Rows.Count = 0 Then
+                Return Nothing
+            End If
+            Return pTable.Rows.Item(0)
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
+    Private Function TableContainsColumn(pTable As DataTable, pColumnName As String) As Boolean
+        Try
+            If pTable Is Nothing Then Return False
+            If String.IsNullOrEmpty(pColumnName) Then Return False
+
+            Return pTable.Columns.Contains(pColumnName)
+        Catch ex As Exception
+            Return False
+        End Try
+    End Function
+
+    Private Function TableContainsColumn(pTable As DataTable, pColumnIndex As Integer) As Boolean
+        Try
+            If pTable Is Nothing Then Return False
+            If String.IsNullOrEmpty(pColumnIndex) Then Return False
+
+            Return pTable.Columns.Count > pColumnIndex
+        Catch ex As Exception
+            Return False
+        End Try
+    End Function
+End Module

Base/My Project/AssemblyInfo.vb

@@ -1,35 +1,9 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-
+<Assembly: AssemblyTrademark("1.3.9.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("Base")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("Base")>
-<Assembly: AssemblyCopyright("Copyright ©  2022")>
-<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("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.0.0.1")>
-<Assembly: AssemblyFileVersion("1.0.0.1")>

Base/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

Base/My Project/Settings.Designer.vb

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

Base/NativeMethods.vb

@@ -0,0 +1,237 @@
+Imports System.Runtime.InteropServices
+Imports System.Text
+Imports DigitalData.Modules.Base.ScreenEx
+
+Public Class NativeMethods
+    Public Declare Function GetWindowTextLength Lib "user32.dll" Alias "GetWindowTextLengthA" (ByVal hwnd As Int32) As Integer
+    Public Declare Function GetWindowText Lib "user32.dll" Alias "GetWindowTextA" (ByVal hWnd As IntPtr, ByVal WinTitle As String, ByVal MaxLength As Integer) As Integer
+    <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function ShellExecuteEx(ByRef lpExecInfo As ShellExecuteInfo) As Boolean
+    End Function
+    <DllImport("user32", EntryPoint:="SetClipboardViewer")>
+    Public Shared Function SetClipboardViewer(ByVal hWnd As IntPtr) As IntPtr
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function GetDC(ByVal hwnd As IntPtr) As IntPtr
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function ReleaseDC(ByVal hwnd As IntPtr, ByVal hdc As IntPtr) As IntPtr
+    End Function
+    <DllImport("User32.dll")>
+    Public Shared Function ReleaseCapture() As Boolean
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function GetWindowRect(ByVal hWnd As HandleRef, ByRef lpRect As RectangleAPI) As Boolean
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function AttachThreadInput(ByVal idAttach As IntPtr, ByVal idAttachTo As IntPtr, fAttach As Boolean) As Boolean
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function GetFocus() As IntPtr
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function WindowFromPoint(ByVal p As PointAPI) As IntPtr
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function GetForegroundWindow() As IntPtr
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function GetWindowThreadProcessId(ByVal hwnd As IntPtr, ByRef lpdwProcessID As Integer) As Integer
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function GetClassName(ByVal hwnd As Integer, ByVal lpClassName As StringBuilder, ByVal nMaxCount As Integer) As Integer
+    End Function
+    <DllImport("kernel32.dll")>
+    Public Shared Function OpenProcess(ByVal dwDesiredAccess As UInteger, ByVal bInheritHandle As Boolean, ByVal dwProcessId As UInteger) As IntPtr
+    End Function
+    <DllImport("kernel32.dll")>
+    Public Shared Function VirtualAllocEx(ByVal hProcess As IntPtr, ByVal lpAddress As IntPtr, ByVal dwSize As UIntPtr, ByVal flAllocationType As UInteger, ByVal flProtect As PageProtection) As IntPtr
+    End Function
+    <DllImport("user32.dll", SetLastError:=True)>
+    Public Shared Function GetWindowThreadProcessId(ByVal hWnd As IntPtr, <Out> ByRef lpdwProcessId As UInteger) As UInteger
+    End Function
+    <DllImport("kernel32.dll")>
+    Public Shared Function VirtualFreeEx(ByVal hProcess As IntPtr, ByVal lpAddress As IntPtr, ByVal dwSize As UIntPtr, ByVal dwFreeType As UInteger) As Boolean
+    End Function
+    <DllImport("kernel32.dll")>
+    Public Shared Function CloseHandle(ByVal hObject As IntPtr) As Boolean
+    End Function
+    <DllImport("kernel32.dll")>
+    Public Shared Function MapViewOfFile(ByVal hFileMappingObject As IntPtr, ByVal dwDesiredAccess As UInteger, ByVal dwFileOffsetHigh As UInteger, ByVal dwFileOffsetLow As UInteger, ByVal dwNumberOfBytesToMap As UIntPtr) As IntPtr
+    End Function
+    <DllImport("kernel32.dll")>
+    Public Shared Function UnmapViewOfFile(ByVal lpBaseAddress As IntPtr) As Boolean
+    End Function
+    <DllImport("kernel32.dll", SetLastError:=True)>
+    Public Shared Function CreateFileMapping(ByVal hFile As IntPtr, ByVal lpFileMappingAttributes As IntPtr, ByVal flProtect As PageProtection, ByVal dwMaximumSizeHigh As Integer, ByVal dwMaximumSizeLow As Integer, ByVal lpName As String) As IntPtr
+    End Function
+    <DllImport("user32.dll")>
+    Public Shared Function SendMessage(ByVal hwnd As IntPtr, ByVal wMsg As Integer, ByVal wParam As IntPtr, ByVal lParam As IntPtr) As IntPtr
+    End Function
+    <DllImport("kernel32.dll")>
+    Public Shared Function ReadProcessMemory(ByVal hProcess As IntPtr, ByVal lpBaseAddress As IntPtr,
+    <Out> ByVal lpBuffer As Byte(), ByVal nSize As UIntPtr, ByVal lpNumberOfBytesRead As IntPtr) As Boolean
+    End Function
+    <DllImport("Kernel32.dll", EntryPoint:="RtlMoveMemory", SetLastError:=False)>
+    Public Shared Sub MoveMemoryFromByte(ByVal dest As IntPtr, ByRef src As Byte, ByVal size As Integer)
+    End Sub
+    <DllImport("Kernel32.dll", EntryPoint:="RtlMoveMemory", SetLastError:=False)>
+    Public Shared Sub MoveMemoryToByte(ByRef dest As Byte, ByVal src As IntPtr, ByVal size As Integer)
+    End Sub
+    <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)>
+    Public Shared Function RegisterWindowMessage(ByVal lpString As String) As Integer
+    End Function
+    <DllImport("user32.dll", ExactSpelling:=True, SetLastError:=True)>
+    Public Shared Function GetCursorPos(ByRef lpPoint As PointAPI) As <MarshalAs(UnmanagedType.Bool)> Boolean
+    End Function
+    <DllImport("User32.dll", SetLastError:=True)>
+    Friend Shared Function MonitorFromWindow(ByVal hwnd As IntPtr,
+                                             ByVal dwFlags As Integer) As IntPtr
+    End Function
+    <DllImport("Shcore.dll", SetLastError:=True)>
+    Friend Shared Function GetDpiForMonitor(ByVal hmonitor As IntPtr,
+                                            ByVal dpiType As Monitor_DPI_Type,
+                                            ByRef dpiX As UInteger,
+                                            ByRef dpiY As UInteger) As Integer
+    End Function
+    <DllImport("gdi32.dll")>
+    Friend Shared Function GetDeviceCaps(ByVal hdc As IntPtr, ByVal nIndex As Integer) As Integer
+    End Function
+
+    Public Declare Function RegisterHotKey Lib "user32" (
+        ByVal Hwnd As IntPtr,
+        ByVal ID As Integer,
+        ByVal Modifiers As Integer,
+        ByVal Key As Integer
+    ) As Integer
+
+    Public Declare Function UnregisterHotKey Lib "user32" (
+        ByVal Hwnd As IntPtr,
+        ByVal ID As Integer
+    ) As Integer
+
+    Public Declare Auto Function GetWindowText Lib "user32" (
+        ByVal hWnd As IntPtr,
+        ByVal lpString As StringBuilder,
+        ByVal cch As Integer
+    ) As Integer
+
+    Public Declare Function GlobalAddAtom Lib "kernel32" Alias "GlobalAddAtomA" (ByVal IDString As String) As Short
+    Public Declare Function GlobalDeleteAtom Lib "kernel32" (ByVal Atom As Short) As Short
+
+    Public Const STANDARD_RIGHTS_REQUIRED As Integer = &HF0000
+
+    Public Const SECTION_QUERY As Short = &H1
+    Public Const SECTION_MAP_WRITE As Short = &H2
+    Public Const SECTION_MAP_READ As Short = &H4
+    Public Const SECTION_MAP_EXECUTE As Short = &H8
+    Public Const SECTION_EXTEND_SIZE As Short = &H10
+    Public Const SECTION_ALL_ACCESS As Integer = STANDARD_RIGHTS_REQUIRED Or SECTION_QUERY Or SECTION_MAP_WRITE Or SECTION_MAP_READ Or SECTION_MAP_EXECUTE Or SECTION_EXTEND_SIZE
+    Public Const FILE_MAP_ALL_ACCESS As Integer = SECTION_ALL_ACCESS
+
+    Public Const PROCESS_VM_OPERATION As Short = &H8
+    Public Const PROCESS_VM_READ As Short = &H10
+    Public Const PROCESS_VM_WRITE As Short = &H20
+    Public Const PROCESS_ALL_ACCESS As Long = &H1F0FFF
+
+    Public Const MEM_COMMIT As Short = &H1000
+    Public Const MEM_RESERVE As Short = &H2000
+    Public Const MEM_DECOMMIT As Short = &H4000
+    Public Const MEM_RELEASE As Integer = &H8000
+    Public Const MEM_FREE As Integer = &H10000
+    Public Const MEM_PRIVATE As Integer = &H20000
+    Public Const MEM_MAPPED As Integer = &H40000
+    Public Const MEM_TOP_DOWN As Integer = &H100000
+
+    Public Const INVALID_HANDLE_VALUE As Integer = -1
+    Public Const SW_SHOW As Short = 5
+
+    Public Const SEE_MASK_INVOKEIDLIST = &HC
+    Public Const SEE_MASK_NOCLOSEPROCESS = &H40
+    Public Const SEE_MASK_FLAG_NO_UI = &H400
+
+    Public Const ULW_COLORKEY As Integer = &H1
+    Public Const ULW_ALPHA As Integer = &H2
+    Public Const ULW_OPAQUE As Integer = &H4
+
+    Public Const AC_SRC_OVER As Byte = &H0
+    Public Const AC_SRC_ALPHA As Byte = &H1
+
+    Public Const HTCAPTION As Integer = &H2
+
+    Public Const WM_NCLBUTTONDOWN As Integer = &HA1
+    Public Const WM_HOTKEY As Integer = &H312
+    Public Const WM_DRAWCLIPBOARD As Integer = &H308
+
+    Public Enum PageProtection As UInteger
+        NoAccess = &H1
+        [Readonly] = &H2
+        ReadWrite = &H4
+        WriteCopy = &H8
+        Execute = &H10
+        ExecuteRead = &H20
+        ExecuteReadWrite = &H40
+        ExecuteWriteCopy = &H80
+        Guard = &H100
+        NoCache = &H200
+        WriteCombine = &H400
+    End Enum
+
+    Public Enum ChildWindowFromPointFlags As UInteger
+        CWP_ALL
+        CWP_SKIPINVISIBLE
+        CWP_SKIPDISABLED
+        CWP_SKIPTRANSPARENT
+    End Enum
+
+    <StructLayout(LayoutKind.Sequential)>
+    Public Structure WINDOWPOS
+        Public hwnd As IntPtr
+        Public hwndInsertAfter As IntPtr
+        Public x As Integer
+        Public y As Integer
+        Public cx As Integer
+        Public cy As Integer
+        Public flags As Integer
+    End Structure
+
+    Public Structure RectangleAPI
+        Public Left As Integer
+        Public Top As Integer
+        Public Right As Integer
+        Public Bottom As Integer
+
+        Public Overrides Function ToString() As String
+            Return String.Format("Top: {0}, Bottom: {1}, Left: {2}, Right: {3}", Top, Bottom, Left, Right)
+        End Function
+    End Structure
+
+    Public Structure ShellExecuteInfo
+        Public cbSize As Integer
+        Public fMask As Integer
+        Public hwnd As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpVerb As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpFile As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpParameters As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpDirectory As String
+        Dim nShow As Integer
+        Dim hInstApp As IntPtr
+        Dim lpIDList As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpClass As String
+        Public hkeyClass As IntPtr
+        Public dwHotKey As Integer
+        Public hIcon As IntPtr
+        Public hProcess As IntPtr
+    End Structure
+
+    <System.Runtime.InteropServices.StructLayout(Runtime.InteropServices.LayoutKind.Sequential)>
+    Public Structure PointAPI
+        Public X As Integer
+        Public Y As Integer
+
+        Public Sub New(ByVal X As Integer, ByVal Y As Integer)
+            Me.X = X
+            Me.Y = Y
+        End Sub
+    End Structure
+End Class

Base/ObjectEx.vb

@@ -0,0 +1,46 @@
+Public Class ObjectEx
+    ''' <summary>
+    ''' Checks a value for three different `null` values,
+    ''' Nothing, Empty String, DBNull
+    ''' 
+    ''' Returns the original value if the value is not null, or `defaultValue`
+    ''' </summary>
+    ''' <typeparam name="T">The type of the value</typeparam>
+    ''' <param name="value">The value</param>
+    ''' <param name="defaultValue">The default Value</param>
+    ''' <returns>The original value or the default value</returns>
+    Public Shared Function NotNull(Of T)(ByVal value As T, ByVal defaultValue As T) As T
+        If IsNothing(value) OrElse String.IsNullOrEmpty(value.ToString) OrElse IsDBNull(value) Then
+            Return defaultValue
+        Else
+            Return value
+        End If
+    End Function
+
+    ''' <summary>
+    ''' Converts a String value to the given Enum
+    ''' </summary>
+    ''' <typeparam name="T">The Enum Type</typeparam>
+    ''' <param name="value">The string value to convert</param>
+    Public Shared Function ToEnum(Of T)(value As String) As T
+        Return [Enum].Parse(GetType(T), value)
+    End Function
+
+    ''' <summary>
+    ''' Converts an Integer value to the given Enum
+    ''' </summary>
+    ''' <typeparam name="T">The Enum Type</typeparam>
+    ''' <param name="value">The integer value to convert</param>
+    Public Shared Function ToEnum(Of T)(value As Integer) As T
+        Return [Enum].ToObject(GetType(T), value)
+    End Function
+
+    ''' <summary>
+    ''' Converts a Long value to the given Enum
+    ''' </summary>
+    ''' <typeparam name="T">The Enum Type</typeparam>
+    ''' <param name="value">The long value to convert</param>
+    Public Shared Function ToEnum(Of T)(value As Long) As T
+        Return [Enum].ToObject(GetType(T), value)
+    End Function
+End Class

Base/Performance.vb

@@ -1,44 +0,0 @@
-Imports System.IO
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-Imports System.Security.Cryptography
-Imports DigitalData.Modules.Logging
-
-Public Class Performance
-    Public Sub New(pLogConfig As LogConfig, pAppDataPath As String)
-        Dim savedHash = String.Empty
-        Dim assemblyLocation = Assembly.GetEntryAssembly().Location
-
-        Dim hashPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "hash.txt")
-        If Not File.Exists(hashPath) Then
-            File.Create(hashPath)
-        Else
-            savedHash = File.ReadAllText(hashPath)
-        End If
-
-        Dim hash = String.Concat(SHA1.Create().ComputeHash(File.ReadAllBytes(assemblyLocation)).Select(Function(x) x.ToString("x2")))
-        If hash.Equals(savedHash) Then
-            Return
-        End If
-
-        Dim dotNetRuntimePath = RuntimeEnvironment.GetRuntimeDirectory()
-        Dim ngenPath = Path.Combine(dotNetRuntimePath, "ngen.exe")
-
-        Dim process = New Process With {
-            .StartInfo = New ProcessStartInfo With {
-                .FileName = ngenPath,
-                .Arguments = $"install ""{assemblyLocation}"" /nologo",
-                .CreateNoWindow = True,
-                .UseShellExecute = True,
-                .Verb = "runas"
-            }
-        }
-        Try
-            process.Start()
-            process.WaitForExit()
-            File.WriteAllText(hashPath, hash)
-        Catch
-            ' ...
-        End Try
-    End Sub
-End Class

Base/ScreenEx.vb

@@ -0,0 +1,163 @@
+Imports System
+Imports System.Drawing
+Imports System.Runtime.InteropServices
+Imports System.Windows.Forms
+Imports DigitalData.Modules.Base.NativeMethods
+
+Public Class ScreenEx
+    Public Const DEFAULT_WINDOW_HEIGHT = 480
+    Public Const DEFAULT_WINDOW_WIDTH = 640
+
+    Friend Const MONITORINFOF_PRIMARY As Integer = &H1
+    Friend Const MONITOR_DEFAULTTONEAREST As Integer = &H2
+    Friend Const MONITOR_DEFAULTTONULL As Integer = &H0
+    Friend Const MONITOR_DEFAULTTOPRIMARY As Integer = &H1
+
+    Friend Enum Monitor_DPI_Type As Integer
+        MDT_Effective_DPI = 0
+        MDT_Angular_DPI = 1
+        MDT_Raw_DPI = 2
+        MDT_Default = MDT_Effective_DPI
+    End Enum
+
+    Private Enum DeviceCap
+        VERTRES = 10
+        DESKTOPVERTRES = 117
+    End Enum
+
+    Public Shared Function GetLocationWithinScreen(pLocation As Point) As Point?
+        For Each screen As Screen In Screen.AllScreens
+            If screen.Bounds.Contains(pLocation) Then
+                Return New Point(pLocation.X - screen.Bounds.Left, pLocation.Y - screen.Bounds.Top)
+            End If
+        Next
+
+        Return Nothing
+    End Function
+
+    Public Shared Sub RestoreFormPosition(pForm As Form, pPosition As Point)
+        Dim oLocationWithinScreen As Point? = GetLocationWithinScreen(pPosition)
+
+        If oLocationWithinScreen Is Nothing Then
+            Dim oPrimaryScreen = Screen.PrimaryScreen
+            pForm.StartPosition = FormStartPosition.CenterScreen
+        Else
+            pForm.StartPosition = FormStartPosition.Manual
+            pForm.Location = pPosition
+        End If
+    End Sub
+
+    Public Shared Sub RestoreFormState(pForm As Form, pFormState As FormWindowState)
+        If pFormState = FormWindowState.Maximized Then
+            pForm.WindowState = FormWindowState.Normal
+            pForm.WindowState = FormWindowState.Maximized
+        ElseIf pFormState = FormWindowState.Minimized Then
+            pForm.WindowState = FormWindowState.Normal
+            pForm.WindowState = FormWindowState.Minimized
+        Else
+            pForm.WindowState = FormWindowState.Normal
+        End If
+    End Sub
+
+    Public Shared Sub RestoreFormState(pForm As Form, pFormState As String)
+        Dim oFormState As FormWindowState
+        If Not [Enum].TryParse(pFormState, oFormState) Then
+            oFormState = FormWindowState.Normal
+        End If
+
+        RestoreFormState(pForm, oFormState)
+    End Sub
+
+    Public Shared Sub RestoreFormSize(pForm As Form, pFormSize As Size)
+        Dim oFormSize As Size
+        If pFormSize.Height < 1 Or pFormSize.Width < 1 Or pFormSize.IsEmpty Then
+            oFormSize = New Size(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT)
+        Else
+            oFormSize = pFormSize
+        End If
+
+        pForm.Size = oFormSize
+    End Sub
+
+    ''' <summary>
+    ''' Checks if a point is Visible on any screen
+    ''' </summary>
+    Public Shared Function IsVisibleOnAnyScreen(Location As Point) As Boolean
+        Try
+            Dim oRect As New Rectangle(Location, New Size(0, 0))
+
+            For Each oScreen In Screen.AllScreens
+                If oScreen.WorkingArea.IntersectsWith(oRect) Then
+                    Return True
+                End If
+            Next
+
+            Return False
+        Catch ex As Exception
+            Return False
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Checks if Size is not negative
+    ''' </summary>
+    Public Shared Function SizeIsVisible(Size As Size) As Boolean
+        If Size.Width >= 0 And Size.Height >= 0 Then
+            Return True
+        End If
+
+        Return False
+    End Function
+
+    ''' <summary>
+    ''' Checks if Location is not negative
+    ''' </summary>
+    Public Shared Function LocationIsVisible(Location As Point) As Boolean
+        If Location.X >= 0 And Location.Y >= 0 Then
+            Return True
+        End If
+
+        Return False
+    End Function
+
+    Public Function GetScreenScaling(Form As Form) As Single
+        Dim oHandle As IntPtr = Form.Handle
+        Dim oFactor1, oFactor2 As Single
+
+        oFactor1 = GetFactorFromDeviceCaps(oHandle)
+        oFactor2 = GetDPIFromMonitor(oHandle)
+
+        If oFactor1 > 1 Then
+            Return oFactor1
+        Else
+            Return oFactor2
+        End If
+    End Function
+
+    Private Function GetFactorFromDeviceCaps(Handle As IntPtr) As Single
+        Dim g As Graphics = Graphics.FromHwnd(Handle)
+        Dim desktop As IntPtr = g.GetHdc()
+        Dim LogicalScreenHeight As Integer = GetDeviceCaps(desktop, DeviceCap.VERTRES)
+        Dim PhysicalScreenHeight As Integer = GetDeviceCaps(desktop, DeviceCap.DESKTOPVERTRES)
+        Dim oScreenScalingFactor As Single = CSng(PhysicalScreenHeight) / CSng(LogicalScreenHeight)
+        Return oScreenScalingFactor
+    End Function
+
+    Private Function GetDPIFromMonitor(Handle As IntPtr) As Single
+        'Get handle to monitor that contains this window.
+        Dim monitorHandle As IntPtr = MonitorFromWindow(Handle, MONITOR_DEFAULTTONEAREST)
+
+        'Get DPI (If the OS is not Windows 8.1 or newer, calling GetDpiForMonitor will cause exception).
+        Dim dpiX As UInteger
+        Dim dpiY As UInteger
+
+        Dim result As Integer = GetDpiForMonitor(monitorHandle, Monitor_DPI_Type.MDT_Default, dpiX, dpiY)
+
+
+        If (result = 0) Then 'If S_OK (= 0)
+            Return dpiX / 96.0F
+        Else
+            Return -1
+        End If
+    End Function
+End Class

Base/StringFunctions.vb

@@ -0,0 +1,64 @@
+Imports System.Globalization
+Imports DigitalData.Modules.Logging
+
+Public Class StringFunctions
+    Public Shared Function SplitText_Length(ByVal input As String, ByVal maxLength As Integer) As List(Of String)
+        Dim result As New List(Of String)
+
+        For i As Integer = 0 To input.Length - 1 Step maxLength
+            ' Textabschnitt extrahieren
+            Dim chunk As String = input.Substring(i, Math.Min(maxLength, input.Length - i))
+            result.Add(chunk)
+        Next
+
+        Return result
+    End Function
+    Public Shared Function SplitTextByNewLine(text As String) As List(Of String)
+        If String.IsNullOrEmpty(text) Then
+            Return New List(Of String)()
+        End If
+
+        ' Zerlege den Text anhand von Zeilenumbrüchen
+        Dim lines As List(Of String) = text.Split({vbCrLf, vbLf, vbCr}, StringSplitOptions.None).ToList()
+        Return lines
+    End Function
+
+    Public Shared Function DatetimeStringToGermanStringConverter(pDatetimeString As String, pLogger As Logger) As String
+
+        If pDatetimeString.IsNullOrEmpty() = True Then
+            ' Wenn nichts kommt, kommt nichts zurueck
+            Return String.Empty
+        End If
+
+        Dim formatList As List(Of String) = New List(Of String) From {
+                "yyyyMMdd",
+                "MM/dd/yyyy", "M/d/yyyy", "MM/d/yyyy", "M/dd/yyyy",
+                "yyyy-MM-dd", "yyyy-M-d", "yyyy-MM-d", "yyyy-M-dd",
+                "dd.MM.yyyy", "d.M.yyyy", "d.MM.yyyy", "dd.M.yyyy"
+        }
+
+        Dim dateStringResult As Date = Date.MinValue
+        Dim oConvertResult As Boolean = False
+
+        For Each formatStringItem In formatList
+            Try
+                dateStringResult = DateTime.ParseExact(pDatetimeString, formatStringItem, CultureInfo.InvariantCulture)
+                oConvertResult = True
+                Exit For
+            Catch ex As FormatException
+                oConvertResult = False
+                pLogger?.Debug("DatetimeStringToGermanStringConverter() - Could not parse date string {0} ({1})", pDatetimeString, formatStringItem)
+            End Try
+        Next
+
+        If oConvertResult = True Then
+            ' In deutsches Format umwandeln (dd.MM.yyyy)
+            Dim germanDateFormat As String = dateStringResult.ToString("dd.MM.yyyy")
+            Return germanDateFormat
+        Else
+            ' Wenn nichts konvertiert werden konnte, geben wir den ursprünglichen Wert zurück
+            Return pDatetimeString
+        End If
+
+    End Function
+End Class

Base/WindowsEx.vb

@@ -0,0 +1,35 @@
+Imports System.ComponentModel
+Imports System.Runtime.InteropServices
+Imports DigitalData.Modules.Base.NativeMethods
+
+Public Class WindowsEx
+    Private ReadOnly _LogConfig As LogConfig
+    Private ReadOnly _Logger As Logger
+
+    Public Sub New(LogConfig As LogConfig)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+    End Sub
+
+    Public Function OpenFileProperties(FilePath As String) As Boolean
+        Try
+            Dim oShellExecuteInfo As New ShellExecuteInfo()
+            oShellExecuteInfo.cbSize = Marshal.SizeOf(oShellExecuteInfo)
+            oShellExecuteInfo.lpVerb = "properties"
+            oShellExecuteInfo.lpFile = FilePath
+            oShellExecuteInfo.nShow = SW_SHOW
+            oShellExecuteInfo.fMask = SEE_MASK_INVOKEIDLIST
+
+            If Not ShellExecuteEx(oShellExecuteInfo) Then
+                Dim oWin32Error = Marshal.GetLastWin32Error()
+                Dim oException As New Win32Exception(oWin32Error)
+                Throw oException
+            End If
+
+            Return True
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return False
+        End Try
+    End Function
+End Class

Base/packages.config

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

Config/App.config

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
+    </providers>
+    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
+  </entityFramework>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

Config/Config.vbproj

@@ -1,131 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0-windows</TargetFramework>
-    <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>
-    <FileAlignment>512</FileAlignment>
+    <MyType>Empty</MyType>
-    <MyType>Windows</MyType>
+    <ImplicitUsings>enable</ImplicitUsings>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <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>
   </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>
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <PackageReference Include="EntityFramework.Firebird" Version="10.1.0" />
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />
-    </Reference>
+    <PackageReference Include="NLog" Version="5.0.5" />
-    <Reference Include="System" />
+    <PackageReference Include="System.Data.Odbc" Version="8.0.1" />
-    <Reference Include="System.Configuration" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <Reference Include="System.Data" />
+    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <Reference Include="System.IO.Compression" />
+    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <Reference Include="System.Runtime.Serialization" />
+    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <Reference Include="System.ServiceModel" />
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <Reference Include="System.Transactions" />
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <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="DigitalData.Modules.Logging" />
-    <Import Include="System" />
+    <Import Include="DigitalData.Modules.Base" />
-    <Import Include="System.Collections" />
+    <Import Include="DigitalData.Modules.Database" />
-    <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="ConfigAttributes.vb" />
+    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Include="ConfigManager.vb" />
+    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Include="ConfigSample.vb" />
+    <Compile Remove="My Project\Settings.Designer.vb" />
-    <Compile Include="ConfigUtils.vb" />
+    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
+    <None Remove="My Project\Application.myapp" />
-    <Compile Include="My Project\Application.Designer.vb">
+    <None Remove="My Project\Settings.settings" />
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </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">
+    <ProjectReference Include="..\Logging\Logging.vbproj" />
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+    <ProjectReference Include="..\Base\Base.vbproj" />
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+    <ProjectReference Include="..\Database\Database.vbproj" />
-      <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>
-    <ProjectReference Include="..\Filesystem\Filesystem.vbproj">
-      <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
-      <Name>Filesystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Config/ConfigDbFunct.vb

@@ -0,0 +1,54 @@
+Imports NLog
+Imports DigitalData.Modules.Database
+
+
+Public Class ConfigDbFunct
+
+    ''' <summary>
+    ''' Ermittelt die aktuelle Lizenz für das gewünschte Produkt
+    ''' aus der DB-Tabelle TBDD_3RD_PARTY_MODULES
+    ''' </summary>
+    ''' 
+    ''' <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
+
+        Dim oLogger As Logger = pLogConfig.GetLogger()
+
+        If (String.IsNullOrEmpty(pProductName)) Then
+            oLogger.Error("Parameter pProductName is null or empty")
+            Return String.Empty
+        End If
+
+        If (String.IsNullOrEmpty(pVersion)) Then
+            oLogger.Error("Parameter pVersion is null or empty")
+            Return String.Empty
+        End If
+
+        If (String.IsNullOrEmpty(pConnectionString)) Then
+            oLogger.Error("Parameter pConnectionString is null or empty")
+            Return String.Empty
+        End If
+
+        Try
+            Dim oDecryptedConnectionString As String = MSSQLServer.DecryptConnectionString(pConnectionString)
+            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
+
+        Catch ex As Exception
+            oLogger.Error("Exception occured in ConfigDbFunct.GetProductLicense()")
+            oLogger.Error(ex)
+        End Try
+
+        Return String.Empty
+
+    End Function
+
+End Class

Config/ConfigManager.vb

@@ -1,18 +1,22 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Xml.Serialization
-Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Config
-Imports DigitalData.Modules.Encryption
+Imports DigitalData.Modules.Base
-Imports DigitalData.Modules.Config.ConfigAttributes
+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)
-    Private Const USER_CONFIG_NAME As String = "UserConfig.xml"
+    Public Const USER_CONFIG_NAME As String = "UserConfig.xml"
-    Private Const COMPUTER_CONFIG_NAME As String = "ComputerConfig.xml"
+    Public Const COMPUTER_CONFIG_NAME As String = "ComputerConfig.xml"
-    Private Const APP_CONFIG_NAME As String = "AppConfig.xml"
+    Public Const APP_CONFIG_NAME As String = "AppConfig.xml"
 
     Private ReadOnly _LogConfig As LogConfig
     Private ReadOnly _Logger As Logger
-    Private ReadOnly _File As Filesystem.File
+    Private ReadOnly _File As FilesystemEx
 
     Private ReadOnly _UserDirectory As String
     Private ReadOnly _UserConfigPath As String
@@ -26,6 +30,7 @@ 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),
@@ -61,6 +66,10 @@ 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.
@@ -102,18 +111,21 @@ 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 Filesystem.File(_LogConfig)
+        _File = New FilesystemEx(_LogConfig)
 
-        _Blueprint = Activator.CreateInstance(Of T)
+        _Blueprint = Activator.CreateInstance(Of T)()
-        _BlueprintType = _Blueprint.GetType
+        _BlueprintType = _Blueprint.GetType()
         _Serializer = New XmlSerializer(_BlueprintType)
 
         _UserDirectory = _File.CreateDirectory(UserConfigPath)
         _UserConfigPath = Path.Combine(_UserDirectory, USER_CONFIG_NAME)
 
-        If ComputerConfigPath <> String.Empty Then
+        If Not String.IsNullOrWhiteSpace(ComputerConfigPath) Then
             If IO.File.Exists(ComputerConfigPath) Then
                 _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath, False)
             Else
@@ -122,8 +134,8 @@ Public Class ConfigManager(Of T)
             _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)
         End If
 
-            If ApplicationStartupPath <> String.Empty Then
+        _AppConfigDirectory = ApplicationStartupPath
-            _Logger.Info($"AppConfig is being used: [{ApplicationStartupPath}]")
+        If Not String.IsNullOrWhiteSpace(ApplicationStartupPath) Then
             _AppConfigPath = Path.Combine(ApplicationStartupPath, APP_CONFIG_NAME)
         End If
 

Config/ConfigUtils.vb

@@ -1,17 +1,79 @@
-Imports DigitalData.Modules.Logging
+Imports System.IO
+Imports NLog
 
 Public Class ConfigUtils
-    Private _Logger As Logger
+    Private ReadOnly _Logger As Logger
-    Private _File As Filesystem.File
+    ' Private ReadOnly _File As FilesystemEx
 
     Private Const MIGRATE_DIRECTORY As String = "Migrate"
 
-
+    Public Sub New(Logger As NLog.Logger)
-    Public Sub New(LogConfig As LogConfig)
+        _Logger = Logger
-        _Logger = LogConfig.GetLogger()
+        ' _File = New FilesystemEx(LogConfig)
-        _File = New Filesystem.File(LogConfig)
     End Sub
 
+    ''' <summary>
+    ''' Migrate a config file when the ProductName has changed
+    ''' </summary>
+    ''' <param name="pUserBasePath">The user config base path, should be Application.UserAppDataPath</param>
+    ''' <param name="pProductName">The current or new product name</param>
+    ''' <param name="pOldProductName">The old product name</param>
+    ''' <returns></returns>
+    Public Function MigrateUserAppDataConfig(pUserBasePath As String, pProductName As String, pOldProductName As String)
+        Return MigrateAppDataConfig(pUserBasePath, ConfigManager(Of ConfigSample).USER_CONFIG_NAME, pProductName, pOldProductName)
+    End Function
+
+    ''' <summary>
+    ''' Migrate a config file when the ProductName has changed
+    ''' </summary>
+    ''' <param name="pCommonBasePath">The config base path, should be Application.CommonAppDataPath</param>
+    ''' <param name="pProductName">The current or new product name</param>
+    ''' <param name="pOldProductName">The old product name</param>
+    ''' <returns></returns>
+    Public Function MigrateCommonAppDataConfig(pCommonBasePath As String, pProductName As String, pOldProductName As String)
+        Return MigrateAppDataConfig(pCommonBasePath, ConfigManager(Of ConfigSample).COMPUTER_CONFIG_NAME, pProductName, pOldProductName)
+    End Function
+
+    ''' <summary>
+    ''' Migrate a config file when the ProductName has changed
+    ''' </summary>
+    ''' <param name="pBasePath">The config base path, can be Application.UserAppDataPath or Application.CommonAppDataPath</param>
+    ''' <param name="pProductName">The current or new product name</param>
+    ''' <param name="pOldProductName">The old product name</param>
+    ''' <returns></returns>
+    Private Function MigrateAppDataConfig(pBasePath As String, pConfigName As String, pProductName As String, pOldProductName As String)
+        Dim oNewDirPath = pBasePath
+        Dim oOldDirPath = oNewDirPath.Replace(pProductName, pOldProductName)
+        Dim oNewFilePath = Path.Combine(oNewDirPath, pConfigName)
+        Dim oOldFilePath = Path.Combine(oOldDirPath, pConfigName)
+
+        ' If there is already a new config, exit.
+        If File.Exists(oNewFilePath) Then
+            Return True
+        End If
+
+        ' If there is no old config, exit.
+        If Not File.Exists(oOldFilePath) Then
+            Return True
+        End If
+
+        Try
+            If Not Directory.Exists(oNewDirPath) Then
+                Directory.CreateDirectory(oNewDirPath)
+            End If
+
+            _Logger.Info("Migrating Config from [{0}] to [{1}]", pOldProductName, pProductName)
+            File.Move(oOldFilePath, oNewFilePath)
+            Return True
+
+        Catch ex As Exception
+            _Logger.Warn("Error while Migrating Config")
+            _Logger.Error(ex)
+            Return False
+
+        End Try
+    End Function
+
     Public Function TestMigrationNeeded(TargetDirectory As String) As Boolean
         If IO.Directory.Exists(TargetDirectory) Then
             Return False
@@ -21,99 +83,97 @@ Public Class ConfigUtils
     End Function
 
     Public Sub MigrateConfig(SourceDirectory As String, TargetDirectory As String, Optional FilePattern As String = "*.*")
-        If IO.Directory.Exists(TargetDirectory) Then
+        'If IO.Directory.Exists(TargetDirectory) Then
-            _Logger.Warn("Config Migration aborted because new config directory [{0}] already exists!", TargetDirectory)
+        '    _Logger.Warn("Config Migration aborted because new config directory [{0}] already exists!", TargetDirectory)
-            Exit Sub
+        '    Exit Sub
-        End If
+        'End If
 
-        _Logger.Debug("Creating TargetDirectory [{0}]", TargetDirectory)
+        '_Logger.Debug("Creating TargetDirectory [{0}]", TargetDirectory)
-        ' Create target directory
+        '' Create target directory
-        Try
+        'Try
-            IO.Directory.CreateDirectory(TargetDirectory)
+        '    IO.Directory.CreateDirectory(TargetDirectory)
-        Catch ex As Exception
+        'Catch ex As Exception
-            _Logger.Warn("Config Migration aborted because new config directory [{0}] could not be created!", TargetDirectory)
+        '    _Logger.Warn("Config Migration aborted because new config directory [{0}] could not be created!", TargetDirectory)
-            _Logger.Error(ex)
+        '    _Logger.Error(ex)
-            Exit Sub
+        '    Exit Sub
-        End Try
+        'End Try
 
-        ' Create Migration directory
+        '' Create Migration directory
-        Dim oMigrationDirectory = IO.Path.Combine(SourceDirectory, MIGRATE_DIRECTORY)
+        'Dim oMigrationDirectory = IO.Path.Combine(SourceDirectory, MIGRATE_DIRECTORY)
-        _Logger.Debug("Creating MigrationDirectory [{0}]", oMigrationDirectory)
+        '_Logger.Debug("Creating MigrationDirectory [{0}]", oMigrationDirectory)
-        Try
+        'Try
-            IO.Directory.CreateDirectory(oMigrationDirectory)
+        '    IO.Directory.CreateDirectory(oMigrationDirectory)
-        Catch ex As Exception
+        'Catch ex As Exception
-            _Logger.Warn("Config Migration aborted because migration directory [{0}] could not be created!", oMigrationDirectory)
+        '    _Logger.Warn("Config Migration aborted because migration directory [{0}] could not be created!", oMigrationDirectory)
-            _Logger.Error(ex)
+        '    _Logger.Error(ex)
-            Exit Sub
+        '    Exit Sub
-        End Try
+        'End Try
 
-        ' Copy individual files from top level directory
+        '' Copy individual files from top level directory
-        For Each oPath In IO.Directory.EnumerateFiles(SourceDirectory, FilePattern)
+        'For Each oPath In IO.Directory.EnumerateFiles(SourceDirectory, FilePattern)
-            Dim oFileInfo = New IO.FileInfo(oPath)
+        '    Dim oFileInfo = New IO.FileInfo(oPath)
 
-            _Logger.NewBlock($"File {oFileInfo.Name}")
+        '    _Logger.Debug("Processing file [{0}]", oFileInfo.Name)
-            _Logger.Debug("Processing file [{0}]", oFileInfo.Name)
 
-            _Logger.Debug("Copying [{0}] to TargetDirectory..", oFileInfo.Name)
+        '    _Logger.Debug("Copying [{0}] to TargetDirectory..", oFileInfo.Name)
-            ' Copy to target directory
+        '    ' Copy to target directory
-            Try
+        '    Try
-                IO.File.Copy(oPath, IO.Path.Combine(TargetDirectory, oFileInfo.Name))
+        '        IO.File.Copy(oPath, IO.Path.Combine(TargetDirectory, oFileInfo.Name))
-            Catch ex As Exception
+        '    Catch ex As Exception
-                _Logger.Warn("Could not move old config file {0} to new config location {1}", oFileInfo.Name, TargetDirectory)
+        '        _Logger.Warn("Could not move old config file {0} to new config location {1}", oFileInfo.Name, TargetDirectory)
-                _Logger.Error(ex)
+        '        _Logger.Error(ex)
-            End Try
+        '    End Try
 
-            _Logger.Debug("Moving [{0}] to MigrationDirectory..", oFileInfo.Name)
+        '    _Logger.Debug("Moving [{0}] to MigrationDirectory..", oFileInfo.Name)
-            ' Move to migration directory
+        '    ' Move to migration directory
-            Try
+        '    Try
-                IO.File.Move(oPath, IO.Path.Combine(oMigrationDirectory, oFileInfo.Name))
+        '        IO.File.Move(oPath, IO.Path.Combine(oMigrationDirectory, oFileInfo.Name))
-            Catch ex As Exception
+        '    Catch ex As Exception
-                _Logger.Warn("Could not move old config file {0} to migration directory {1}", oFileInfo.Name, oMigrationDirectory)
+        '        _Logger.Warn("Could not move old config file {0} to migration directory {1}", oFileInfo.Name, oMigrationDirectory)
-                _Logger.Error(ex)
+        '        _Logger.Error(ex)
-            End Try
+        '    End Try
-        Next
+        'Next
 
-        For Each oDirectoryPath In IO.Directory.EnumerateDirectories(SourceDirectory, "*", IO.SearchOption.TopDirectoryOnly)
+        'For Each oDirectoryPath In IO.Directory.EnumerateDirectories(SourceDirectory, "*", IO.SearchOption.TopDirectoryOnly)
-            Dim oDirInfo As New IO.DirectoryInfo(oDirectoryPath)
+        '    Dim oDirInfo As New IO.DirectoryInfo(oDirectoryPath)
 
-            _Logger.NewBlock($"Directory {oDirInfo.Name}")
+        '    _Logger.Debug("Processing directory [{0}]", oDirInfo.Name)
-            _Logger.Debug("Processing directory [{0}]", oDirInfo.Name)
 
-            ' Don't copy TargetDirectory if subpath of SourceDirectory or if MigrationDirectory
+        '    ' Don't copy TargetDirectory if subpath of SourceDirectory or if MigrationDirectory
-            If oDirInfo.FullName = TargetDirectory Or oDirInfo.FullName = oMigrationDirectory Then
+        '    If oDirInfo.FullName = TargetDirectory Or oDirInfo.FullName = oMigrationDirectory Then
-                _Logger.Debug("Directory [{0}] should not be copied. Skipping.", oDirInfo.Name)
+        '        _Logger.Debug("Directory [{0}] should not be copied. Skipping.", oDirInfo.Name)
-                Continue For
+        '        Continue For
-            End If
+        '    End If
 
-            ' Copy directory to TargetDirectory
+        '    ' Copy directory to TargetDirectory
-            Dim oNewDirectoryPath = IO.Path.Combine(TargetDirectory, oDirInfo.Name)
+        '    Dim oNewDirectoryPath = IO.Path.Combine(TargetDirectory, oDirInfo.Name)
-            _Logger.Debug("Copying [{0}] to TargetDirectory..", oDirInfo.Name)
+        '    _Logger.Debug("Copying [{0}] to TargetDirectory..", oDirInfo.Name)
-            Try
+        '    Try
-                _File.CopyDirectory(oDirInfo.FullName, oNewDirectoryPath, True)
+        '        _File.CopyDirectory(oDirInfo.FullName, oNewDirectoryPath, True)
-            Catch ex As Exception
+        '    Catch ex As Exception
-                _Logger.Warn("Could not move directory [{0}] to new path [{1}]", oDirInfo.FullName, oNewDirectoryPath)
+        '        _Logger.Warn("Could not move directory [{0}] to new path [{1}]", oDirInfo.FullName, oNewDirectoryPath)
-                _Logger.Error(ex)
+        '        _Logger.Error(ex)
-            End Try
+        '    End Try
 
-            _Logger.Debug("Copying [{0}] to MigrationDirectory..", oDirInfo.Name)
+        '    _Logger.Debug("Copying [{0}] to MigrationDirectory..", oDirInfo.Name)
-            ' Copy directory to MigrationDirectory
+        '    ' Copy directory to MigrationDirectory
-            Dim oMigrationDirectoryPath = IO.Path.Combine(oMigrationDirectory, oDirInfo.Name)
+        '    Dim oMigrationDirectoryPath = IO.Path.Combine(oMigrationDirectory, oDirInfo.Name)
-            Try
+        '    Try
-                _File.CopyDirectory(oDirInfo.FullName, oMigrationDirectoryPath, True)
+        '        _File.CopyDirectory(oDirInfo.FullName, oMigrationDirectoryPath, True)
-            Catch ex As Exception
+        '    Catch ex As Exception
-                _Logger.Error(ex)
+        '        _Logger.Error(ex)
-                _Logger.Warn("Could not move directory [{0}] to migration directory [{1}]", oDirInfo.FullName, oMigrationDirectoryPath)
+        '        _Logger.Warn("Could not move directory [{0}] to migration directory [{1}]", oDirInfo.FullName, oMigrationDirectoryPath)
-            End Try
+        '    End Try
 
-            _Logger.Debug("Deleting [{0}]..", oDirInfo.Name)
+        '    _Logger.Debug("Deleting [{0}]..", oDirInfo.Name)
-            ' Delete directory
+        '    ' Delete directory
-            Try
+        '    Try
-                IO.Directory.Delete(oDirInfo.FullName, True)
+        '        IO.Directory.Delete(oDirInfo.FullName, True)
-            Catch ex As Exception
+        '    Catch ex As Exception
-                _Logger.Error(ex)
+        '        _Logger.Error(ex)
-                _Logger.Warn("Could not delete directory [{0}]", oDirInfo.FullName)
+        '        _Logger.Warn("Could not delete directory [{0}]", oDirInfo.FullName)
-            End Try
+        '    End Try
-        Next
+        'Next
     End Sub
 
 End Class

Config/My Project/Application.Designer.vb

@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-

Config/My Project/AssemblyInfo.vb

@@ -1,35 +1,9 @@
 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("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("Modules.Config")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
 <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.1.4.1")>
-<Assembly: AssemblyFileVersion("1.1.4.1")>

Config/My Project/Resources.Designer.vb

@@ -1,63 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-
-Namespace My.Resources
-    
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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

Config/My Project/Resources.resx

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

Config/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.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

Config/My Project/Settings.settings

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

Config/SampleConfig.vb

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

Config/packages.config

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

Database.Test/My Project/Application.myapp

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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>
+  <MySubMain>true</MySubMain>
+  <MainForm>Form1</MainForm>
   <SingleInstance>false</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>1</ApplicationType>
   <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
 </MyApplicationData>

Database/Adapters/Firebird.vb

@@ -2,6 +2,7 @@
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
 Imports System.ComponentModel
+Imports System.Data
 
 ''' <summary>
 ''' MODULE:         Firebird

Database/Adapters/MSSQLServer.vb

@@ -1,16 +1,23 @@
 Imports System.ComponentModel
-Imports System.Data.Common
+Imports System.Data
 Imports System.Data.SqlClient
 Imports DigitalData.Modules.Encryption
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Base
-Imports System.Threading
 
 Public Class MSSQLServer
     Implements IDatabase
 
     Public Property DBInitialized As Boolean = False Implements IDatabase.DBInitialized
     Public Property CurrentConnectionString As String = "" Implements IDatabase.CurrentConnectionString
+    Public ReadOnly Property MaskedConnectionString As String
+        Get
+            If CurrentConnectionString = "" Then
+                Return ""
+            Else
+                Return MaskConnectionString(CurrentConnectionString)
+            End If
+        End Get
+    End Property
 
     Private ReadOnly QueryTimeout As Integer
     Private ReadOnly Logger As Logger
@@ -103,33 +110,34 @@ Public Class MSSQLServer
         End Try
     End Function
 
-    <DebuggerStepThrough()>
+    Private Function MaybeGetTransaction(pConnection As SqlConnection, pTransactionMode As TransactionMode, pTransaction As SqlTransaction) As SqlTransaction
-    Private Function MaybeGetTransaction(Connection As SqlConnection, Mode As TransactionMode, Transaction As SqlTransaction) As SqlTransaction
+        If pConnection Is Nothing Then
-        If Connection Is Nothing Then
+            Throw New ArgumentNullException("Connection", "Could not get transaction because connection is null!")
-            Throw New ArgumentNullException("Connection")
         End If
 
-        If Mode = TransactionMode.NoTransaction Then
+        Logger.Debug("Transaction Mode: [{0}]", pTransactionMode.ToString)
+
+        If pTransactionMode = TransactionMode.NoTransaction Then
             Return Nothing
-        ElseIf Mode = TransactionMode.ExternalTransaction Then
+        ElseIf pTransactionMode = TransactionMode.ExternalTransaction Then
-            Return Transaction
+            Return pTransaction
         Else
-            Return Connection.BeginTransaction()
+            Return pConnection.BeginTransaction()
         End If
     End Function
 
-    <DebuggerStepThrough()>
+    Private Function MaybeCommitTransaction(pTransaction As SqlTransaction, pTransactionMode As TransactionMode) As Boolean
-    Private Function MaybeCommitTransaction(Transaction As SqlTransaction, TransactionMode As TransactionMode) As Boolean
+        Select Case pTransactionMode
-        Select Case TransactionMode
             Case TransactionMode.NoTransaction
                 Return True
             Case TransactionMode.ExternalTransaction
                 Return True
             Case TransactionMode.WithTransaction
                 Try
-                    Transaction.Commit()
+                    pTransaction.Commit()
                     Return True
                 Catch ex As Exception
+                    Logger.Warn("Error while committing transaction!")
                     Logger.Error(ex)
                     Return False
                 End Try
@@ -141,7 +149,24 @@ Public Class MSSQLServer
     Public Function GetConnectionStringForId(pConnectionId As Integer) As String
         Return Get_ConnectionStringforID(pConnectionId)
     End Function
-
+    Public Function GetGDPictureString() As String
+        Using oConnection As SqlConnection = GetSQLConnection()
+            Dim oSQL = Queries.DD_ECM.ThirdPartyModules.GdPictureLicense
+            Dim oGDPicture = GetScalarValueWithConnectionObject(oSQL, oConnection)
+            If oGDPicture = String.Empty Then
+                oSQL = Queries.DD_ECM.ThirdPartyModules.GdPictureLicense_REGULAR
+                oGDPicture = GetScalarValueWithConnectionObject(oSQL, oConnection)
+            End If
+            Return oGDPicture
+        End Using
+    End Function
+    Public Function GetDDCatalog() As DataTable
+        Using oConnection As SqlConnection = GetSQLConnection()
+            Dim oSQL = Queries.DD_ECM.DD_SELECTS.TBDD_CATALOG
+            Dim oDT_CATALOG As DataTable = GetDatatable(oSQL)
+            Return oDT_CATALOG
+        End Using
+    End Function
     Public Function Get_ConnectionStringforID(pConnectionId As Integer) As String
         Dim oConnectionString As String = String.Empty
 
@@ -206,10 +231,13 @@ Public Class MSSQLServer
             Dim oDecryptedConnectionString = DecryptConnectionString(pConnectionString)
             Dim oConnection As New SqlConnection(oDecryptedConnectionString)
             OpenSQLConnection(oConnection)
-            oConnection.Close()
+            oConnection?.Close()
             Return True
+
         Catch ex As Exception
+            Logger.Error("Error while testing connection!")
             Logger.Error(ex)
+
             Return False
         End Try
     End Function
@@ -217,14 +245,21 @@ Public Class MSSQLServer
     ''' <summary>
     ''' This Function intentionally has no try..catch block to have any errors caught outside
     ''' </summary>
-    ''' <param name="Connection"></param>
+    ''' <param name="pConnection"></param>
     ''' <returns></returns>
-    Private Function OpenSQLConnection(Connection As SqlConnection) As SqlConnection
+    Private Function OpenSQLConnection(pConnection As SqlConnection) As SqlConnection
-        If Connection.State = ConnectionState.Closed Then
+        Try
-            Connection.Open()
+            If pConnection.State = ConnectionState.Closed Then
-        End If
+                pConnection.Open()
+            End If
 
-        Return Connection
+            Return pConnection
+        Catch ex As Exception
+            Logger.Error("Error while opening Connection!")
+            Logger.Error(ex)
+
+            Throw ex
+        End Try
     End Function
 
     <DebuggerStepThrough()>
@@ -242,6 +277,7 @@ Public Class MSSQLServer
 
             Return oConnection
         Catch ex As Exception
+            Logger.Error("Connection could not be created or opened!")
             Logger.Error(ex)
 
             Return Nothing
@@ -253,14 +289,16 @@ Public Class MSSQLServer
         Try
             If pConnectionString Is Nothing OrElse pConnectionString.Length = 0 Then
                 Logger.Warn("Connection String is empty!")
-                Throw New ArgumentNullException("pConnectionString")
+                Throw New ArgumentNullException("pConnectionString", "Could not mask connection string because connectiong string is empty!")
             End If
 
             Dim oBuilder As New SqlConnectionStringBuilder() With {.ConnectionString = pConnectionString}
             Dim oConnectionString = pConnectionString.Replace(oBuilder.Password, "XXXXX")
             Return oConnectionString
         Catch ex As Exception
+            Logger.Error("ConnectionString is invalid and could not be masked!")
             Logger.Error(ex)
+
             Return "Invalid ConnectionString"
         End Try
     End Function
@@ -288,15 +326,11 @@ Public Class MSSQLServer
     End Function
 
     Public Function GetDatatable(pSqlCommand As String, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
-        Using oSqlConnection = GetSQLConnection()
+        Return GetDatatableWithConnectionObject(pSqlCommand, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-            Return GetDatatableWithConnectionObject(pSqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-        End Using
     End Function
 
     Public Function GetDatatable(pSqlCommandObject As SqlCommand, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
-        Using oSqlConnection = GetSQLConnection()
+        Return GetDatatableWithConnectionObject(pSqlCommandObject, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-            Return GetDatatableWithConnectionObject(pSqlCommandObject, oSqlConnection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-        End Using
     End Function
 
     Public Async Function GetDatatableAsync(pSqlCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of DataTable)
@@ -319,6 +353,20 @@ Public Class MSSQLServer
         End Using
     End Function
 
+    Public Async Function GetDatatableWithConnectionObjectAsync(pSqlCommand As String, pSqlConnection As SqlConnection,
+                                                     Optional pTransactionMode As TransactionMode = TransactionMode.WithTransaction,
+                                                     Optional pTransaction As SqlTransaction = Nothing,
+                                                     Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of DataTable)
+        Return Await Task.Run(Function() GetDatatableWithConnectionObject(pSqlCommand, pSqlConnection, pTransactionMode, pTransaction, pTimeout))
+    End Function
+
+    Public Async Function GetDatatableWithConnectionObjectAsync(pSqlCommandObject As SqlCommand, pSqlConnection As SqlConnection,
+                                                     Optional pTransactionMode As TransactionMode = TransactionMode.WithTransaction,
+                                                     Optional pTransaction As SqlTransaction = Nothing,
+                                                     Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of DataTable)
+        Return Await Task.Run(Function() GetDatatableWithConnectionObject(pSqlCommandObject, pSqlConnection, pTransactionMode, pTransaction, pTimeout))
+    End Function
+
     Public Function GetDatatableWithConnectionObject(pSqlCommand As String, pSqlConnection As SqlConnection,
                                                      Optional pTransactionMode As TransactionMode = TransactionMode.WithTransaction,
                                                      Optional pTransaction As SqlTransaction = Nothing,
@@ -340,13 +388,13 @@ Public Class MSSQLServer
             pSqlCommandObject.CommandTimeout = pTimeout
 
             Using oAdapter As New SqlDataAdapter(pSqlCommandObject)
-                Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", pSqlCommandObject.CommandText)
+                Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}] and Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))
                 oAdapter.Fill(oTable)
             End Using
 
         Catch ex As Exception
+            Logger.Error("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject.CommandText)
             Logger.Error(ex)
-            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject)
             Throw ex
         Finally
             MaybeCommitTransaction(oTransaction, pTransactionMode)
@@ -381,15 +429,11 @@ Public Class MSSQLServer
 
 
     Public Function ExecuteNonQuery(pSQLCommand As String, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
-        Using oConnection = GetSQLConnection()
+        Return ExecuteNonQueryWithConnectionObject(pSQLCommand, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-            Return ExecuteNonQueryWithConnectionObject(pSQLCommand, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-        End Using
     End Function
 
     Public Function ExecuteNonQuery(pSQLCommandObject As SqlCommand, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
-        Using oConnection = GetSQLConnection()
+        Return ExecuteNonQueryWithConnectionObject(pSQLCommandObject, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-            Return ExecuteNonQueryWithConnectionObject(pSQLCommandObject, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-        End Using
     End Function
 
     Public Async Function ExecuteNonQueryAsync(pSQLCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Boolean)
@@ -427,7 +471,7 @@ Public Class MSSQLServer
         Dim oTransaction As SqlTransaction = MaybeGetTransaction(pSqlConnection, pTransactionMode, pTransaction)
 
         Try
-            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", pSqlCommandObject.CommandText)
+            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}] and Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))
 
             pSqlCommandObject.Connection = pSqlConnection
             pSqlCommandObject.Transaction = oTransaction
@@ -436,8 +480,10 @@ Public Class MSSQLServer
 
             Return True
         Catch ex As Exception
+            Dim omsg = $"Unexpected Error in ExecuteNonQueryWithConnectionObject while executing command: [{pSqlCommandObject.CommandText}]"
+            Logger.Warn(omsg)
             Logger.Error(ex)
-            Logger.Warn("ExecuteNonQueryWithConnectionObject: Error in ExecuteNonQueryWithConnectionObject while executing command: [{0}]-[{1}]", SqlCommand, SqlConnection.ConnectionString)
+
             Return False
         Finally
             MaybeCommitTransaction(oTransaction, pTransactionMode)
@@ -469,15 +515,11 @@ Public Class MSSQLServer
     End Function
 
     Public Function GetScalarValue(pSQLCommand As String, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
-        Using oConnection = GetSQLConnection()
+        Return GetScalarValueWithConnectionObject(pSQLCommand, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-            Return GetScalarValueWithConnectionObject(pSQLCommand, oConnection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-        End Using
     End Function
 
     Public Function GetScalarValue(pSQLCommandObject As SqlCommand, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
-        Using oConnection = GetSQLConnection()
+        Return GetScalarValueWithConnectionObject(pSQLCommandObject, pTransaction.Connection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-            Return GetScalarValueWithConnectionObject(pSQLCommandObject, oConnection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
-        End Using
     End Function
 
     Public Async Function GetScalarValueAsync(pSQLCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Object)
@@ -517,6 +559,9 @@ Public Class MSSQLServer
         Dim oResult As Object = Nothing
 
         Try
+
+            Logger.Debug("GetScalarValueWithConnectionObject: Running Query [{0}] with Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))
+
             pSqlCommandObject.Connection = pSqlConnection
             pSqlCommandObject.CommandTimeout = pTimeout
             pSqlCommandObject.Transaction = oTransaction
@@ -524,7 +569,7 @@ Public Class MSSQLServer
 
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject)
+            Logger.Error("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject.CommandText)
 
         Finally
             MaybeCommitTransaction(oTransaction, pTransactionMode)
@@ -559,7 +604,7 @@ Public Class MSSQLServer
             End Using
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn($"GetScalarValue failed SQLCommand [{pSqlCommand}]")
+            Logger.Error($"GetScalarValue failed SQLCommand [{pSqlCommand}]")
 
             Return Nothing
         End Try
@@ -591,7 +636,7 @@ Public Class MSSQLServer
             End Using
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn($"NewExecuteNonQueryAsync failed SQLCommand [{SqlCommand}]")
+            Logger.Error($"NewExecuteNonQueryAsync failed SQLCommand [{SqlCommand}]")
 
         End Try
     End Sub
@@ -601,4 +646,18 @@ Public Class MSSQLServer
         Dim res = command.EndExecuteNonQuery(result)
         Logger.Info("Finished executing Async database operation: {0}", command.CommandText)
     End Sub
+
+    Private Function GetParameterListAsString(pSQLCommand As SqlCommand) As String
+        Dim oList = pSQLCommand.Parameters.
+            Cast(Of SqlParameter).
+            Select(Function(p) $"({p.ParameterName}={p.Value})").
+            ToList()
+
+        Dim oParamString = String.Join(",", oList)
+        If oParamString.Length > 1000 Then
+            oParamString = oParamString.Substring(1, 1000)
+        End If
+        Return oParamString
+
+    End Function
 End Class

Database/Adapters/ODBC.vb

@@ -1,19 +1,18 @@
 Imports System.Data.Odbc
-Imports DigitalData.Modules.Logging
+Imports System.Data
+Imports NLog
 
 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(LogConfig As LogConfig, Datasource As String, User As String, Password As String)
+    Public Sub New(Datasource As String, User As String, Password As String)
         Try
-            _LogConfig = LogConfig
+            _Logger = LogManager.GetCurrentClassLogger()
-            _Logger = _LogConfig.GetLogger()
 
             _connectionDatasource = Datasource
             _connectionPassword = Password

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

Database/App.config

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

Database/Database.vbproj

@@ -1,167 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0</TargetFramework>
-    <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>
-    <FileAlignment>512</FileAlignment>
+    <MyType>Empty</MyType>
-    <MyType>Windows</MyType>
+    <ImplicitUsings>enable</ImplicitUsings>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <PostBuildEvent>powershell.exe -command "&amp; { &amp;'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }"</PostBuildEvent>
-    <NuGetPackageImportStamp>
+    <AssemblyTitle>Modules.Database</AssemblyTitle>
-    </NuGetPackageImportStamp>
+    <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>
   </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>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+    <PackageReference Include="EntityFramework.Firebird" Version="10.1.0" />
-    </Reference>
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />
-    <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
+    <PackageReference Include="NLog" Version="5.0.5" />
-      <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
+    <PackageReference Include="System.Data.Odbc" Version="8.0.1" />
-    </Reference>
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    </Reference>
+    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    </Reference>
+    <PackageReference Include="Oracle.ManagedDataAccess" Version="23.4.0" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\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="Microsoft.VisualBasic" />
+    <Import Include="DigitalData.Modules.Logging" />
-    <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="ConnectionString.vb" />
+    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Include="Constants.vb" />
+    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Include="Dispatcher.vb" />
+    <Compile Remove="My Project\Settings.Designer.vb" />
-    <Compile Include="Exceptions.vb" />
+    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <Compile Include="Adapters\Firebird.vb" />
+    <None Remove="My Project\Application.myapp" />
-    <Compile Include="Helpers.vb" />
+    <None Remove="My Project\Settings.settings" />
-    <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>
-    </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" />
-    <Compile Include="TableCache.vb" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
+    <ProjectReference Include="..\Logging\Logging.vbproj" />
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+    <ProjectReference Include="..\Encryption\Encryption.vbproj" />
-      <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>
-  <ItemGroup>
-    <ProjectReference Include="..\Encryption\Encryption.vbproj">
-      <Project>{8a8f20fc-c46e-41ac-bee7-218366cfff99}</Project>
-      <Name>Encryption</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </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')" />
 </Project>

Database/Dispatcher.vb

@@ -1,5 +1,6 @@
 Imports DigitalData.Modules.Logging
 Imports Oracle.ManagedDataAccess.Client
+Imports System.Data
 
 Public Class Dispatcher
     Public ReadOnly Property Connections As New List(Of DispatcherConnection)

Database/Helpers.vb

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

Database/IDatabase.vb

@@ -1,4 +1,5 @@
 Imports System.Data.Common
+Imports System.Data
 Imports System.Data.SqlClient
 
 Public Interface IDatabase

Database/My Project/Application.Designer.vb

@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-

Database/My Project/Application.myapp

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

Database/My Project/AssemblyInfo.vb

@@ -1,35 +1,9 @@
 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("")>
-<Assembly: AssemblyCompany("Digital Data")>
-<Assembly: AssemblyProduct("Modules.Database")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("2.2.7.5")>
 
 <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.2.7.5")>
-<Assembly: AssemblyFileVersion("2.2.7.5")>

Database/My Project/Resources.Designer.vb

@@ -1,63 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-
-Namespace My.Resources
-    
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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

Database/My Project/Resources.resx

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

Database/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.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

Database/My Project/Settings.settings

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

Database/Queries.vb

@@ -1,11 +1,15 @@
 Public Class Queries
     Public Class DD_ECM
         Public Class ThirdPartyModules
-            Public Const GdPictureLicense As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
+            Public Const GdPictureLicense As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1 AND NAME = 'GDPICTURE' AND [VERSION] = '11.2024'"
+            Public Const GdPictureLicense_REGULAR As String = "SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND ACTIVE = 1"
+        End Class
+        Public Class DD_SELECTS
+            Public Const TBDD_CATALOG As String = "SELECT * FROM TBDD_CATALOG"
         End Class
 
         Public Class Connections
-            Public Const AllConnections As String = "SELECT * FROM TBDD_CONNECTION"
+            Public Const AllConnections As String = "SELECT * FROM TBDD_CONNECTION AND AKTIV = 1"
         End Class
     End Class
 End Class

Database/TableCache.vb

@@ -1,17 +0,0 @@
-Public Class TableCache
-    Private Items As New Dictionary(Of String, DataTable)
-
-    Public Function [Get](SQLCommand As String)
-        Dim oKey As String = SQLCommand.ToUpper
-        If Items.ContainsKey(oKey) Then
-            Return Items.Item(oKey)
-        Else
-
-        End If
-    End Function
-
-    Private Function SaveTable()
-
-    End Function
-
-End Class

Database/packages.config

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EntityFramework" version="6.4.4" targetFramework="net461" />
-  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net461" />
-  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
-  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net461" />
-</packages>

EDMIAPI/Client.vb

@@ -1,9 +1,10 @@
-Imports System.IO
+Imports System.Data
+Imports System.IO
 Imports System.ServiceModel
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.EDMI.API.Constants
 Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.Modules.EDMI.API.Rights
-Imports DigitalData.Modules.Language.Utils
 Imports DigitalData.Modules.Logging
 
 Public Class Client
@@ -550,10 +551,10 @@ Public Class Client
                     .Id = oRow.Item("AttributeId"),
                     .Title = oRow.Item("AttributeTitle"),
                     .Type = oRow.Item("AttributeType"),
-                    .ValueBigInt = NotNull(oRow.Item("ValueBigInt"), Nothing),
+                    .ValueBigInt = oRow.ItemEx(Of Object)("ValueBigInt", Nothing),
-                    .ValueDate = NotNull(oRow.Item("ValueDate"), Nothing),
+                    .ValueDate = oRow.ItemEx(Of Object)("ValueDate", Nothing),
-                    .ValueDecimal = NotNull(oRow.Item("ValueDecimal"), Nothing),
+                    .ValueDecimal = oRow.ItemEx(Of Object)("ValueDecimal", Nothing),
-                    .ValueText = NotNull(oRow.Item("ValueText"), Nothing)
+                    .ValueText = oRow.ItemEx(Of Object)("ValueText", Nothing)
                 }
 
                 oAttributes.Add(oAttribute)
@@ -932,11 +933,11 @@ Public Class Client
 
 
     Private Function GetUserLanguage(pOverrideLanguage As String) As String
-        Return NotNull(pOverrideLanguage, Threading.Thread.CurrentThread.CurrentUICulture.Name)
+        Return ObjectEx.NotNull(pOverrideLanguage, Threading.Thread.CurrentThread.CurrentUICulture.Name)
     End Function
 
     Private Function GetUserName(pOverrideName) As String
-        Return NotNull(pOverrideName, Environment.UserName)
+        Return ObjectEx.NotNull(pOverrideName, Environment.UserName)
     End Function
 #End Region
 

EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb

@@ -3109,18 +3109,6 @@ 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

EDMIAPI/DatabaseWithFallback.vb

@@ -1,9 +1,9 @@
-Imports DigitalData.Modules.Database
+Imports System.Data
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.EDMI.API.Constants
 Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Language.Utils
 
 Public Class DatabaseWithFallback
     Private ReadOnly _Logger As Logger
@@ -191,25 +191,30 @@ Public Class DatabaseWithFallback
 
             ' If there is no client, we assume there is no service (configured)
             If _Client Is Nothing Then
+                _Logger.Debug("Client is empty, falling back to direct database access.")
                 Return GetDatatableFromDatabase(pFallbackSQL, pFallbackType, pConnectionId)
             End If
 
             ' If ForceFallback flag is set, we go to database immediately
             If pForceFallback Or _ClientConfig.ForceDirectDatabaseAccess Then
+                _Logger.Debug("ForceFallback is True, falling back to direct database access.")
                 Return GetDatatableFromDatabase(pFallbackSQL, pFallbackType, pConnectionId)
             End If
 
             ' If the table is not cached, we try going through the service
             If Not IsTableCached(pDataTableName) Then
+                _Logger.Debug("Datatable is not chached, fetching data from service.")
                 Return GetDatatableFromService(pFallbackSQL, pFallbackType, pConnectionId)
             End If
 
             ' If there is a proper ConnectionId, we try going through the service
             If pConnectionId > 0 Then
+                _Logger.Debug("ConnectionId is set, fetching data from service.")
                 Return GetDatatableFromService(pFallbackSQL, pFallbackType, pConnectionId)
             End If
 
             Try
+                _Logger.Debug("Datatable is chached, fetching data from cache.")
                 oTableResult = _Client.GetDatatableByName(pDataTableName, pFilterExpression, pSortByColumn)
             Catch ex As Exception
                 _Logger.Error(ex)
@@ -332,26 +337,25 @@ Public Class DatabaseWithFallback
     End Function
 
 
-    Private Function GetDatatableFromDatabase(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As DataTable
+    Private Function GetDatatableFromDatabase(pSQLCommand As String, pDatabaseType As Constants.DatabaseType, pConnectionId As Integer) As DataTable
         Try
-            Dim oResult As ExecuteNonQueryResponse = Nothing
+            _Logger.Debug("Fetching data from database [{0}] with Connection Id [{0}]", pDatabaseType.ToString, pConnectionId)
-
-            Select Case DatabaseType
-                Case Constants.DatabaseType.ECM
-                    Return _DatabaseECM.GetDatatable(pSQLCommand)
 
+            Select Case pDatabaseType
                 Case Constants.DatabaseType.IDB
                     Return _DatabaseIDB.GetDatatable(pSQLCommand)
 
                 Case Else
-                    Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId)
+                    If pConnectionId > 0 Then
-                    If oConnectionString = String.Empty Then
+                        _Logger.Debug("Retrieving Connection String from Connection Id [{0}]", pConnectionId)
-                        Return _DatabaseECM.GetDatatable(pSQLCommand)
+                        Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId)
-                    Else
                         Return _DatabaseECM.GetDatatableWithConnection(pSQLCommand, oConnectionString)
+                    Else
+                        Return _DatabaseECM.GetDatatable(pSQLCommand)
                     End If
 
             End Select
+
         Catch ex As Exception
             _Logger.Error(ex)
             Return Nothing
@@ -397,20 +401,19 @@ Public Class DatabaseWithFallback
     Private Function GetScalarValueFromDatabase(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As Object
         Try
             Select Case DatabaseType
-                Case Constants.DatabaseType.ECM
-                    Return _DatabaseECM.GetScalarValue(pSQLCommand)
-
                 Case Constants.DatabaseType.IDB
                     Return _DatabaseIDB.GetScalarValue(pSQLCommand)
 
                 Case Else
-                    Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId)
+                    If pConnectionId > 0 Then
-                    If oConnectionString = String.Empty Then
+                        Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId)
-                        Return _DatabaseECM.GetScalarValue(pSQLCommand)
-                    Else
                         Return _DatabaseECM.GetScalarValueWithConnection(pSQLCommand, oConnectionString)
+                    Else
+                        Return _DatabaseECM.GetScalarValue(pSQLCommand)
                     End If
+
             End Select
+
         Catch ex As Exception
             _Logger.Error(ex)
             Return Nothing
@@ -455,21 +458,19 @@ Public Class DatabaseWithFallback
     Private Function ExecuteNonQueryFromDatabase(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As Boolean
         Try
             Select Case DatabaseType
-                Case Constants.DatabaseType.ECM
-                    Return _DatabaseECM.ExecuteNonQuery(pSQLCommand)
-
                 Case Constants.DatabaseType.IDB
                     Return _DatabaseIDB.ExecuteNonQuery(pSQLCommand)
 
                 Case Else
-                    Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId)
+                    If pConnectionId > 0 Then
-                    If oConnectionString = String.Empty Then
+                        Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId)
-                        Return _DatabaseECM.ExecuteNonQuery(pSQLCommand)
-                    Else
                         Return _DatabaseECM.ExecuteNonQueryWithConnection(pSQLCommand, oConnectionString)
+                    Else
+                        Return _DatabaseECM.ExecuteNonQuery(pSQLCommand)
                     End If
 
             End Select
+
         Catch ex As Exception
             _Logger.Error(ex)
             Return False

EDMIAPI/EDMI.API.vbproj

@@ -1,120 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
-    <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>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <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>
   </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>
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="NLog" Version="5.0.5" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+    <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
-    </Reference>
+    <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
-    <Reference Include="System" />
+    <PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
-    <Reference Include="System.Configuration" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
-    <Reference Include="System.Data" />
+    <PackageReference Include="System.ServiceModel.Security" Version="6.0.0" />
-    <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="Microsoft.VisualBasic" />
+    <Compile Update="Connected Services\EDMIServiceReference\Reference.vb">
-    <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 Include="Client.vb" />
+    <Compile Update="My Project\Application.Designer.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 Include="My Project\Resources.Designer.vb">
+    <Compile Update="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
+    <Compile Update="My Project\Settings.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
+    <EmbeddedResource Update="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
@@ -122,158 +63,153 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Update="Connected Services\EDMIServiceReference\Arrays.xsd">
-    <None Include="Connected Services\EDMIServiceReference\Arrays.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.CheckInOutFileResponse.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.CheckInOutFileResponse.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.Globix_ImportFileResponse.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.Globix_ImportFileResponse.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse1.datasource">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse1.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.ZooFlow.State.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Modules.ZooFlow.State.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Exceptions.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Exceptions.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Messages.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Messages.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Base.GetClientConfig.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Base.GetClientConfig.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.ExecuteNonQuery.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.ExecuteNonQuery.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetDatatable.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetDatatable.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetScalarValue.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.GetScalarValue.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.Database.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.GlobalIndexer.ImportFile.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.GlobalIndexer.ImportFile.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.CheckInOutFile.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.CheckInOutFile.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetAttributeValue.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetAttributeValue.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetFileObject.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.GetFileObject.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.ImportFile.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.ImportFile.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.NewFile.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.NewFile.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.UpdateFile.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.UpdateFile.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Methods.IDB.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.wsdl" />
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.xsd">
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService1.xsd">
+    <None Update="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService1.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\Message.xsd">
+    <None Update="Connected Services\EDMIServiceReference\Message.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\service.wsdl" />
+    <None Update="Connected Services\EDMIServiceReference\service.xsd">
-    <None Include="Connected Services\EDMIServiceReference\service.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\System.Data.xsd">
+    <None Update="Connected Services\EDMIServiceReference\System.Data.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\System.IO.xsd">
+    <None Update="Connected Services\EDMIServiceReference\System.IO.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Connected Services\EDMIServiceReference\System.xsd">
+    <None Update="Connected Services\EDMIServiceReference\System.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="My Project\Application.myapp">
+    <None Update="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
     </None>
-    <None Include="My Project\DataSources\System.Data.DataTable.datasource" />
+    <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>
     <WCFMetadata Include="Connected Services\" />
@@ -282,42 +218,15 @@
     <WCFMetadataStorage Include="Connected Services\EDMIServiceReference\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Connected Services\EDMIServiceReference\configuration91.svcinfo" />
+    <None Update="Connected Services\EDMIServiceReference\Reference.svcmap">
-  </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="..\Base\Base.vbproj" />
-      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
+    <ProjectReference Include="..\Config\Config.vbproj" />
-      <Name>Base</Name>
+    <ProjectReference Include="..\Database\Database.vbproj" />
-    </ProjectReference>
+    <ProjectReference Include="..\Logging\Logging.vbproj" />
-    <ProjectReference Include="..\Config\Config.vbproj">
-      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
-      <Name>Config</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Database\Database.vbproj">
-      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
-      <Name>Database</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Filesystem\Filesystem.vbproj">
-      <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
-      <Name>Filesystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Language\Language.vbproj">
-      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
-      <Name>Language</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

EDMIAPI/Helpers.vb

@@ -1,16 +1,17 @@
-Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.Modules.Logging
 
 
 Public Class Helpers
     Private ReadOnly LogConfig As LogConfig
     Private ReadOnly Logger As Logger
-    Private ReadOnly FileEx As Filesystem.File
+    Private ReadOnly FileEx As FilesystemEx
 
     Public Sub New(pLogConfig As LogConfig)
         LogConfig = pLogConfig
         Logger = pLogConfig.GetLogger()
-        FileEx = New Filesystem.File(pLogConfig)
+        FileEx = New FilesystemEx(pLogConfig)
     End Sub
 
     Public Function GetFileProperties(pFilePath As String, pDateImportedAt As Date) As FileProperties

EDMIAPI/Modules/BaseMethod.vb

@@ -1,4 +1,5 @@
-Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.Modules.Logging
 
 Namespace Modules
@@ -6,14 +7,14 @@ Namespace Modules
         Friend ReadOnly LogConfig As LogConfig
         Friend ReadOnly Logger As Logger
         Friend ReadOnly Channel As IEDMIServiceChannel
-        Friend ReadOnly FileEx As Filesystem.File
+        Friend ReadOnly FileEx As FilesystemEx
         Friend ReadOnly Helpers As Helpers
 
         Public Sub New(pLogConfig As LogConfig, pChannel As IEDMIServiceChannel)
             LogConfig = pLogConfig
             Logger = pLogConfig.GetLogger()
             Channel = pChannel
-            FileEx = New Filesystem.File(pLogConfig)
+            FileEx = New FilesystemEx(pLogConfig)
             Helpers = New Helpers(pLogConfig)
         End Sub
     End Class

EDMIAPI/Modules/IDB/NewFile.vb

@@ -1,6 +1,5 @@
 Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Filesystem
 
 Namespace Modules.IDB
     Public Class NewFile

EDMIAPI/My Project/AssemblyInfo.vb

@@ -1,35 +1,9 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-
+<Assembly: AssemblyTrademark("1.6.1.1")>
-' 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 © 2022")>
-<Assembly: AssemblyTrademark("1.5.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("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.5.4.0")>
-<Assembly: AssemblyFileVersion("1.5.4.0")>

EDMIAPI/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.EDMIAPI.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.EDMI.API.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

EDMIAPI/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -63,7 +63,7 @@ Namespace My
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Module MySettingsProperty
         
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
         Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMI.API.My.MySettings
             Get
                 Return Global.DigitalData.Modules.EDMI.API.My.MySettings.Default

EDMIAPI/app.config

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

EDMIAPI/packages.config

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

Encryption/Compression.vb

@@ -1,9 +1,10 @@
 Imports System.IO
 Imports System.IO.Compression
 Imports DigitalData.Modules.Logging
+Imports NLog
 
 Public Class Compression
-    Private ReadOnly _logger As Logger
+    Private ReadOnly _logger As NLog.Logger
 
     Public Sub New(LogConfig As LogConfig)
         _logger = LogConfig.GetLogger()

Encryption/Encryption.vb

@@ -1,7 +1,7 @@
 Imports System.IO
 Imports System.Security.Cryptography
 Imports System.Text.Encoding
-Imports DigitalData.Modules.Logging
+Imports NLog
 
 ''' <summary>
 ''' https://stackoverflow.com/questions/10168240/encrypting-decrypting-a-string-in-c-sharp

Encryption/Encryption.vbproj

@@ -1,123 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0</TargetFramework>
-    <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>
-    <FileAlignment>512</FileAlignment>
+    <MyType>Empty</MyType>
-    <MyType>Windows</MyType>
+    <ImplicitUsings>enable</ImplicitUsings>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <AssemblyTitle>DDModules.DDEncryption</AssemblyTitle>
-    <Deterministic>true</Deterministic>
+    <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>
   </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>
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="NLog" Version="5.0.5" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    </Reference>
+    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    <Reference Include="System" />
+    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <Reference Include="System.Configuration" />
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <Reference Include="System.Data" />
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <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="Microsoft.VisualBasic" />
+    <Import Include="DigitalData.Modules.Logging" />
-    <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="Compression.vb" />
+    <Compile Remove="My Project\Application.Designer.vb" />
-    <Compile Include="Encryption.vb" />
+    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Compile Include="EncryptionLegacy.vb" />
+    <Compile Remove="My Project\Settings.Designer.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
+    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <Compile Include="My Project\Application.Designer.vb">
+    <None Remove="My Project\Application.myapp" />
-      <AutoGen>True</AutoGen>
+    <None Remove="My Project\Settings.settings" />
-      <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">
+    <ProjectReference Include="..\Logging\Logging.vbproj" />
-      <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="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Encryption/My Project/Application.Designer.vb

@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-

Encryption/My Project/Application.myapp

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

Encryption/My Project/AssemblyInfo.vb

@@ -1,35 +1,9 @@
 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("Encryption")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("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.1.0.0")>
-<Assembly: AssemblyFileVersion("1.1.0.0")>

Encryption/My Project/Resources.Designer.vb

@@ -1,63 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-
-Namespace My.Resources
-    
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.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

Encryption/My Project/Resources.resx

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

Encryption/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.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

Encryption/My Project/Settings.settings

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

Encryption/packages.config

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

Filesystem/File.vb

@@ -121,6 +121,33 @@ Public Class File
 
             Dim oVersionSeparator As Char = "~"c
 
+            ' Split Filename without extension at version separator to:
+            ' - Check if file is already versioned
+            ' - Get the file version of an already versioned file
+            ' 
+            ' Example: 
+            ' test1.pdf         --> test1           --> ['test1']               --> no fileversion
+            ' test1~2.pdf       --> test1~2         --> ['test1', '2']          --> version 2
+            ' test1~12345~2.pdf --> test1~12345~2   --> ['test1', '12345', '2'] --> still version 2
+            'Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
+            'Dim oSplitFilename = oFileNameWithoutExtension.Split(oVersionSeparator).ToList()
+
+            ' if file is already versioned, extract file version
+            ' else just use the filename and set version to 1
+            'If oSplitFilename.Count > 1 Then
+            '    Dim oVersion As Integer = 1
+            '    Try
+            '        oVersion = Integer.Parse(oSplitFilename.Last())
+            '        oFileNameWithoutExtension = String.Join("", oSplitFilename.Take(oSplitFilename.Count - 1))
+            '    Catch ex As Exception
+            '        ' oFilenameWithoutExtension does NOT change
+            '        oFileNameWithoutExtension = oFileNameWithoutExtension
+            '    Finally
+            '        oFileVersion = oVersion
+            '    End Try
+            'Else
+            '    oFileVersion = 1
+            'End If
 
             Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(oFileName)
             Dim oSplitResult = GetVersionedString(oFileNameWithoutExtension, oVersionSeparator)
@@ -130,8 +157,7 @@ Public Class File
 
             ' Shorten the filename (only filename, without extension or version)
             ' by cutting the length in half. This should work no matter how long the path and/or filename are.
-            ' The initial check operates on the full path to catch all scenarios.
+            If oFileName.Length > MAX_FILE_PATH_LENGTH Then
-            If Destination.Length > MAX_FILE_PATH_LENGTH Then
                 _Logger.Info("Filename is too long. Filename will be cut to prevent further errors.")
                 _Logger.Info("Original Filename is: {0}", oFileNameWithoutExtension)
                 Dim oNewLength As Integer = Math.Round(oFileNameWithoutExtension.Length / 2)

Filesystem/Filesystem.vbproj

@@ -1,132 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0</TargetFramework>
-    <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>
-    <FileAlignment>512</FileAlignment>
+    <MyType>Empty</MyType>
-    <MyType>Windows</MyType>
+    <ImplicitUsings>enable</ImplicitUsings>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <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>
   </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>
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="NLog" Version="5.0.5" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <PackageReference Include="NuGet.CommandLine" Version="6.13.2" />
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+    <PackageReference Include="protobuf-net" Version="2.4.0" />
-    </Reference>
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.1" />
-    <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-      <HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
+    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-    </Reference>
+    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    <Reference Include="System" />
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <Reference Include="System.Configuration" />
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-    <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="Microsoft.VisualBasic" />
+    <Compile Remove="My Project\Application.Designer.vb" />
-    <Import Include="System" />
+    <Compile Remove="My Project\Resources.Designer.vb" />
-    <Import Include="System.Collections" />
+    <Compile Remove="My Project\Settings.Designer.vb" />
-    <Import Include="System.Collections.Generic" />
+    <EmbeddedResource Remove="My Project\Resources.resx" />
-    <Import Include="System.Data" />
+    <None Remove="My Project\Application.myapp" />
-    <Import Include="System.Diagnostics" />
+    <None Remove="My Project\Settings.settings" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FileContainer\DocumentObject.vb" />
+    <ProjectReference Include="..\Encryption\Encryption.vbproj" />
-    <Compile Include="FileContainer\FileContainer.vb" />
+    <ProjectReference Include="..\Logging\Logging.vbproj" />
-    <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>
-    </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>
-    <ProjectReference Include="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Filesystem/My Project/Application.Designer.vb

@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-

Filesystem/My Project/Application.myapp

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

Filesystem/My Project/AssemblyInfo.vb

@@ -1,35 +1,9 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-
+<Assembly: AssemblyTrademark("1.3.1.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.Filesystem")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("Digital Data")>
-<Assembly: AssemblyProduct("Modules.Filesystem")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("1.3.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("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.1.1")>
-<Assembly: AssemblyFileVersion("1.3.1.1")>

Filesystem/My Project/Resources.Designer.vb

@@ -1,63 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-
-Namespace My.Resources
-    
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.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

Filesystem/My Project/Resources.resx

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

Filesystem/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.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

Filesystem/My Project/Settings.settings

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

Filesystem/packages.config

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

Interfaces/ActiveDirectoryInterface.vb

@@ -37,23 +37,22 @@ Public Class ActiveDirectoryInterface
         _logger.Info("Using RootPath {0}", _rootPath)
     End Sub
 
-    Public Function SyncUsersForGroup(GroupName As String, Firebird As Firebird, MSSQL As MSSQLServer) As List(Of ADUser)
+    Public Function SyncUsersForGroup(GroupName As String, MSSQL As MSSQLServer) As List(Of ADUser)
         Try
-            Return SyncUsersForGroup(GroupName, New List(Of AttributeMapping), Firebird, MSSQL)
+            Return SyncUsersForGroup(GroupName, New List(Of AttributeMapping), MSSQL)
         Catch ex As Exception
             _logger.Error(ex)
             Return Nothing
         End Try
     End Function
 
-    Public Function SyncUsersForGroup(GroupName As String, AttributeMappings As List(Of AttributeMapping), Firebird As Firebird, MSSQL As MSSQLServer, Optional Filter As String = DEFAULT_USER_FILTER) As List(Of ADUser)
+    Public Function SyncUsersForGroup(GroupName As String, AttributeMappings As List(Of AttributeMapping), MSSQL As MSSQLServer, Optional Filter As String = DEFAULT_USER_FILTER) As List(Of ADUser)
         Dim oUsers As New List(Of ADUser)
         Dim oSyncedUsers As New List(Of ADUser)
         Dim oGroupId As Int64 = Nothing
 
-        Dim oFirebirdSync As New SyncUsers.SyncUsersFirebird(_logConfig, Firebird)
         Dim oSQLSync As New SyncUsers.SyncUsersMSSQL(_logConfig, MSSQL)
-        Dim oSyncedUsersFirebird, oSyncedUsersMSSQL As List(Of ADUser)
+        Dim oSyncedUsersMSSQL As List(Of ADUser)
 
         Try
             _logger.Debug("Fetching users from ActiveDirectory")
@@ -64,16 +63,6 @@ Public Class ActiveDirectoryInterface
             Return Nothing
         End Try
 
-        ' Do the actual sync into firebird
-        If Firebird IsNot Nothing Then
-            oSyncedUsersFirebird = oFirebirdSync.SyncUsers(GroupName, oUsers, AttributeMappings)
-            If oSyncedUsersFirebird.Count > 0 Then
-                _logger.Debug("Synced {0} users to Firebird", oSyncedUsersFirebird.Count)
-            End If
-        Else
-            _logger.Debug("SyncUsersForGroup: _firebird is nothing. ")
-        End If
-
         ' Do the actual sync into MSSQL
         If MSSQL IsNot Nothing Then
             oSyncedUsersMSSQL = oSQLSync.SyncUsers(GroupName, oUsers, AttributeMappings)
@@ -81,7 +70,7 @@ Public Class ActiveDirectoryInterface
                 _logger.Debug("Synced {0} users to MSSQLServer", oSyncedUsersMSSQL.Count)
             End If
         Else
-            _logger.Debug("SyncUsersForGroup: _mssql is nothing. ")
+            _logger.Debug("SyncUsersForGroup: _mssql is nothing.")
         End If
 
         Return oUsers
@@ -193,6 +182,8 @@ Public Class ActiveDirectoryInterface
                                                     .FirebirdSyskey = oMap.FirebirdSyskey,
                                                     .MSSQLColumn = oMap.MSSQLColumn
                                                 })
+                                            Else
+                                                _logger.Debug("Attribute [{0}] is empty.", oMap.AttributeName)
                                             End If
                                         Next
                                     Else
@@ -229,10 +220,23 @@ Public Class ActiveDirectoryInterface
             Return oUsers
         End Try
     End Function
+    Private Function GetPartFromFirstOU(dnString As String) As String
+        Dim keyword As String = "OU="
+        Dim index As Integer = dnString.IndexOf(keyword)
 
-    Public Function FindUserWithFilter(User As UserPrincipalEx, Filter As String) As Boolean
+        If index <> -1 Then
+            Return dnString.Substring(index)
+        Else
+            Return "No_Result_from_GetPartFromFirstOU"
+        End If
+    End Function
+    Public Function FindUserWithFilter(pUser As UserPrincipalEx, pFilter As String) As Boolean
         Try
-            Dim oRootPath = String.Join(","c, User.DistinguishedName.Split(","c).Skip(1))
+            'Dim oRootPath = String.Join(","c, pUser.DistinguishedName.Split(","c).Skip(1))
+            Dim oRootPath = GetPartFromFirstOU(pUser.DistinguishedName)
+            _logger.Debug("FindUserWithFilter: pUser.DistinguishedName: [{0}]", pUser.DistinguishedName)
+            _logger.Debug("FindUserWithFilter: oRootPath from User.DistinguishedName: [{0}]", oRootPath)
+
             Dim oPlaceholder = "@SAMACCOUNTNAME"
             Dim oProtocol = "LDAP://"
             Dim oEntry As New DirectoryEntry(oProtocol & oRootPath) With {
@@ -240,22 +244,25 @@ Public Class ActiveDirectoryInterface
                 .Password = Nothing,
                 .AuthenticationType = AuthenticationTypes.Secure
             }
-
+            _logger.Debug("FindUserWithFilter: got oDirectoryEntry (Path): [{0}]", oProtocol & oRootPath)
-            If Filter = String.Empty Then
+            If pFilter = String.Empty Then
-                _logger.Debug("FindUserWithFilter: Filter was empty, returning True for User [{0}]", User.SamAccountName)
+                _logger.Debug("FindUserWithFilter: Filter was empty, returning True for User [{0}]", pUser.SamAccountName)
                 Return True
             End If
 
-            If Filter.Contains(oPlaceholder) Then
+            If pFilter.Contains(oPlaceholder) Then
-                Filter = Filter.Replace(oPlaceholder, User.SamAccountName)
+                pFilter = pFilter.Replace(oPlaceholder, pUser.SamAccountName)
+                _logger.Debug("FindUserWithFilter: Filter.Contains(oPlaceholder) [{0}]", pFilter)
             Else
                 _logger.Warn("FindUserWithFilter: Placeholder [{0}] was not found in filter. Results may not be correct.")
             End If
 
-            Dim oSearcher As New DirectorySearcher(oEntry, Filter)
+            Dim oSearcher As New DirectorySearcher(oEntry, pFilter)
+            _logger.Debug("FindUserWithFilter: oSearcher created! Now executing DirectoryServices.SearchResult with .FindOne ...")
             Dim oResult As SearchResult = oSearcher.FindOne()
 
-            If oResult IsNot Nothing AndAlso oResult.Path.Replace(oProtocol, String.Empty) = User.DistinguishedName Then
+            If oResult IsNot Nothing AndAlso oResult.Path.Replace(oProtocol, String.Empty) = pUser.DistinguishedName Then
+                _logger.Debug("FindUserWithFilter: We have an oResult - oResult.Path: [{0}]", oResult.Path)
                 Return True
             Else
                 Return False