Database: Version 2.2.7.5

Database.Test/Database.Test.vbproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>Database.Test</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+  </ItemGroup>
+
+</Project>

Database.Test/UnitTest1.vb

@@ -0,0 +1,12 @@
+Imports Microsoft.VisualStudio.TestTools.UnitTesting
+
+Namespace Database.Test
+    <TestClass>
+    Public Class UnitTest1
+        <TestMethod>
+        Sub TestSub()
+
+        End Sub
+    End Class
+End Namespace
+

Database/Adapters/MSSQLServer.vb

@@ -4,6 +4,7 @@ Imports System.Data.SqlClient
 Imports DigitalData.Modules.Encryption
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Base
+Imports System.Threading
 
 Public Class MSSQLServer
     Implements IDatabase
@@ -264,118 +265,174 @@ Public Class MSSQLServer
         End Try
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function GetDatatable(SqlCommand As String) As DataTable Implements IDatabase.GetDatatable
-        Return GetDatatable(SqlCommand, QueryTimeout)
+    ''' <summary>
+    ''' Returns a Datatable for a SQL Statement 
+    ''' </summary>
+    ''' <param name="pSqlCommand">SQL Command Text for Datatable (select XYZ from TableORView)</param>
+    ''' <returns>A datatable</returns>
+    Public Function GetDatatable(pSqlCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable Implements IDatabase.GetDatatable
+        Using oSqlConnection = GetSQLConnection()
+            Return GetDatatableWithConnectionObject(pSqlCommand, oSqlConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
+        End Using
     End Function
 
     ''' <summary>
-    ''' Returns a datatable for a sql-statement 
+    ''' Returns a datatable for a SQL Statement 
     ''' </summary>
-    ''' <param name="SqlCommand">sqlcommand for datatable (select XYZ from TableORView)</param>
-    ''' <returns>Returns a datatable</returns>
-    Public Function GetDatatable(SqlCommand As String, Timeout As Integer) As DataTable Implements IDatabase.GetDatatable
+    ''' <param name="pSqlCommandObject">SQL Command Object for Datatable (select XYZ from TableORView)</param>
+    ''' <returns>A datatable</returns>
+    Public Function GetDatatable(pSqlCommandObject As SqlCommand, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable Implements IDatabase.GetDatatable
         Using oSqlConnection = GetSQLConnection()
-            Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.WithTransaction, Nothing, Timeout)
+            Return GetDatatableWithConnectionObject(pSqlCommandObject, oSqlConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
+    Public Function GetDatatable(pSqlCommand As String, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
         Using oSqlConnection = GetSQLConnection()
-            Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction, Timeout)
+            Return GetDatatableWithConnectionObject(pSqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Async Function GetDatatableAsync(SqlCommand As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of DataTable)
-        Return Await Task.Run(Function() GetDatatable(SqlCommand, Timeout))
+    Public Function GetDatatable(pSqlCommandObject As SqlCommand, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
+        Using oSqlConnection = GetSQLConnection()
+            Return GetDatatableWithConnectionObject(pSqlCommandObject, oSqlConnection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
+        End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function GetDatatableWithConnection(SqlCommand As String, pConnectionString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
+    Public Async Function GetDatatableAsync(pSqlCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of DataTable)
+        Return Await Task.Run(Function() GetDatatable(pSqlCommand, pTimeout))
+    End Function
+
+    Public Async Function GetDatatableAsync(pSqlCommandObject As SqlCommand, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of DataTable)
+        Return Await Task.Run(Function() GetDatatable(pSqlCommandObject, pTimeout))
+    End Function
+
+    Public Function GetDatatableWithConnection(pSqlCommand As String, pConnectionString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
         Using oConnection = GetConnection(pConnectionString)
-            Return GetDatatableWithConnectionObject(SqlCommand, oConnection, Timeout:=Timeout)
+            Return GetDatatableWithConnectionObject(pSqlCommand, oConnection, pTimeout:=Timeout)
         End Using
     End Function
 
-    Public Function GetDatatableWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection,
-                                                     Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction,
-                                                     Optional Transaction As SqlTransaction = Nothing,
-                                                     Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
-        Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction)
+    Public Function GetDatatableWithConnection(pSqlCommandObject As SqlCommand, pConnectionString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
+        Using oConnection = GetConnection(pConnectionString)
+            Return GetDatatableWithConnectionObject(pSqlCommandObject, oConnection, pTimeout:=Timeout)
+        End Using
+    End Function
+
+    Public Function GetDatatableWithConnectionObject(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 DataTable
+        Dim oSQLCommand As New SqlCommand(pSqlCommand)
+        Return GetDatatableWithConnectionObject(oSQLCommand, pSqlConnection, pTransactionMode, pTransaction, pTimeout)
+    End Function
+
+    Public Function GetDatatableWithConnectionObject(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 DataTable
+        Dim oTransaction As SqlTransaction = MaybeGetTransaction(pSqlConnection, pTransactionMode, pTransaction)
         Dim oTable As New DataTable() With {.TableName = Constants.DEFAULT_TABLE}
 
         Try
-            Dim oAdapter As New SqlDataAdapter(New SqlCommand With {
-                .CommandText = SqlCommand,
-                .Connection = SqlConnection,
-                .Transaction = oTransaction,
-                .CommandTimeout = Timeout
-            })
+            pSqlCommandObject.Connection = pSqlConnection
+            pSqlCommandObject.Transaction = oTransaction
+            pSqlCommandObject.CommandTimeout = pTimeout
 
-            Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", SqlCommand)
+            Using oAdapter As New SqlDataAdapter(pSqlCommandObject)
+                Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", pSqlCommandObject.CommandText)
+                oAdapter.Fill(oTable)
+            End Using
 
-            oAdapter.Fill(oTable)
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand)
+            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject)
             Throw ex
         Finally
-            MaybeCommitTransaction(oTransaction, TransactionMode)
+            MaybeCommitTransaction(oTransaction, pTransactionMode)
         End Try
 
         Return oTable
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function ExecuteNonQuery(SQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery
+    Public Function ExecuteNonQuery(pSQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery
         Using oConnection = GetSQLConnection()
-            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, QueryTimeout)
+            Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, QueryTimeout)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery
+    Public Function ExecuteNonQuery(pSQLCommandObject As SqlCommand) As Boolean
         Using oConnection = GetSQLConnection()
-            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
+            Return ExecuteNonQueryWithConnectionObject(pSQLCommandObject, oConnection, TransactionMode.WithTransaction, Nothing, QueryTimeout)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
+    Public Function ExecuteNonQuery(pSQLCommand As String, pTimeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery
         Using oConnection = GetSQLConnection()
-            Return ExecuteNonQueryWithConnectionObject(SQLCommand, Transaction.Connection, TransactionMode.ExternalTransaction, Transaction, Timeout)
+            Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Async Function ExecuteNonQueryAsync(SQLCommand As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Boolean)
-        Return Await Task.Run(Function() ExecuteNonQuery(SQLCommand, Timeout))
+    Public Function ExecuteNonQuery(pSQLCommandObject As SqlCommand, pTimeout As Integer) As Boolean
+        Using oConnection = GetSQLConnection()
+            Return ExecuteNonQueryWithConnectionObject(pSQLCommandObject, oConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
+        End Using
+    End Function
+
+
+    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)
+        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)
+        End Using
+    End Function
+
+    Public Async Function ExecuteNonQueryAsync(pSQLCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Boolean)
+        Return Await Task.Run(Function() ExecuteNonQuery(pSQLCommand, pTimeout))
+    End Function
+
+    Public Async Function ExecuteNonQueryAsync(pSQLCommandObject As SqlCommand, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Boolean)
+        Return Await Task.Run(Function() ExecuteNonQuery(pSQLCommandObject, pTimeout))
     End Function
 
-    '<DebuggerStepThrough()>
     Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
         Using oConnection = GetConnection(ConnString)
             Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
         End Using
     End Function
 
-    Public Function ExecuteNonQueryWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection,
-                                                        Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction,
-                                                        Optional Transaction As SqlTransaction = Nothing,
-                                                        Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
-        Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction)
+    Public Function ExecuteNonQueryWithConnection(pSQLCommandObject As SqlCommand, ConnString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
+        Using oConnection = GetConnection(ConnString)
+            Return ExecuteNonQueryWithConnectionObject(pSQLCommandObject, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
+        End Using
+    End Function
+
+    Public Function ExecuteNonQueryWithConnectionObject(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 Boolean
+        Dim oSQLCommand As New SqlCommand(pSqlCommand)
+        Return ExecuteNonQueryWithConnectionObject(oSQLCommand, pSqlConnection, pTransactionMode, pTransaction, pTimeout)
+    End Function
+
+    Public Function ExecuteNonQueryWithConnectionObject(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 Boolean
+        Dim oTransaction As SqlTransaction = MaybeGetTransaction(pSqlConnection, pTransactionMode, pTransaction)
 
         Try
-            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", SqlCommand)
+            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", pSqlCommandObject.CommandText)
 
-            Using oSQLCOmmand = SqlConnection.CreateCommand()
-                oSQLCOmmand.CommandText = SqlCommand
-                oSQLCOmmand.CommandTimeout = Timeout
-                oSQLCOmmand.Transaction = oTransaction
-                oSQLCOmmand.ExecuteNonQuery()
-            End Using
+            pSqlCommandObject.Connection = pSqlConnection
+            pSqlCommandObject.Transaction = oTransaction
+            pSqlCommandObject.CommandTimeout = pTimeout
+            pSqlCommandObject.ExecuteNonQuery()
 
             Return True
         Catch ex As Exception
@@ -383,96 +440,126 @@ Public Class MSSQLServer
             Logger.Warn("ExecuteNonQueryWithConnectionObject: Error in ExecuteNonQueryWithConnectionObject while executing command: [{0}]-[{1}]", SqlCommand, SqlConnection.ConnectionString)
             Return False
         Finally
-            MaybeCommitTransaction(oTransaction, TransactionMode)
+            MaybeCommitTransaction(oTransaction, pTransactionMode)
         End Try
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function GetScalarValue(SQLQuery As String) As Object Implements IDatabase.GetScalarValue
+    Public Function GetScalarValue(pSqlQuery As String) As Object Implements IDatabase.GetScalarValue
         Using oConnection As SqlConnection = GetSQLConnection()
-            Return GetScalarValueWithConnectionObject(SQLQuery, oConnection)
+            Return GetScalarValueWithConnectionObject(pSqlQuery, oConnection)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function GetScalarValue(SQLCommand As String, Timeout As Integer) As Object Implements IDatabase.GetScalarValue
+    Public Function GetScalarValue(pSqlCommandObject As SqlCommand) As Object
+        Using oConnection As SqlConnection = GetSQLConnection()
+            Return GetScalarValueWithConnectionObject(pSqlCommandObject, oConnection)
+        End Using
+    End Function
+
+    Public Function GetScalarValue(pSqlCommand As String, pTimeout As Integer) As Object Implements IDatabase.GetScalarValue
         Using oConnection = GetSQLConnection()
-            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
+            Return GetScalarValueWithConnectionObject(pSqlCommand, oConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
+    Public Function GetScalarValue(pSqlCommandObject As SqlCommand, pTimeout As Integer) As Object
         Using oConnection = GetSQLConnection()
-            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, Timeout)
+            Return GetScalarValueWithConnectionObject(pSqlCommandObject, oConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
         End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Async Function GetScalarValueAsync(SQLQuery As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Object)
-        Return Await Task.Run(Function() GetScalarValue(SQLQuery, Timeout))
+    Public Function GetScalarValue(pSQLCommand As String, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
+        Using oConnection = GetSQLConnection()
+            Return GetScalarValueWithConnectionObject(pSQLCommand, oConnection, TransactionMode.ExternalTransaction, pTransaction, pTimeout)
+        End Using
     End Function
 
-    '<DebuggerStepThrough()>
-    Public Function GetScalarValueWithConnection(SQLCommand As String, pConnectionString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
+    Public Function GetScalarValue(pSQLCommandObject As SqlCommand, pTransaction As SqlTransaction, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
+        Using oConnection = GetSQLConnection()
+            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)
+        Return Await Task.Run(Function() GetScalarValue(pSQLCommand, pTimeout))
+    End Function
+
+    Public Async Function GetScalarValueAsync(pSQLCommandObject As SqlCommand, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Object)
+        Return Await Task.Run(Function() GetScalarValue(pSQLCommandObject, pTimeout))
+    End Function
+
+    Public Function GetScalarValueWithConnection(pSQLCommand As String, pConnectionString As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
         Using oConnection = GetConnection(pConnectionString)
-            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
+            Return GetScalarValueWithConnectionObject(pSQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
         End Using
     End Function
 
-    Public Function GetScalarValueWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection,
-                                                       Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction,
-                                                       Optional Transaction As SqlTransaction = Nothing,
-                                                       Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
+    Public Function GetScalarValueWithConnection(pSqlCommandObject As SqlCommand, pConnectionString As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
+        Using oConnection = GetConnection(pConnectionString)
+            Return GetScalarValueWithConnectionObject(pSqlCommandObject, oConnection, TransactionMode.WithTransaction, Nothing, pTimeout)
+        End Using
+    End Function
 
-        Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction)
+    Public Function GetScalarValueWithConnectionObject(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 Object
+        Dim oSQLCommand As New SqlCommand(pSqlCommand)
+        Return GetScalarValueWithConnectionObject(oSQLCommand, pSqlConnection, pTransactionMode, pTransaction, pTimeout)
+    End Function
+
+    Public Function GetScalarValueWithConnectionObject(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 Object
+
+        Dim oTransaction As SqlTransaction = MaybeGetTransaction(pSqlConnection, pTransactionMode, pTransaction)
         Dim oResult As Object = Nothing
 
         Try
-            Using oSQLCOmmand = SqlConnection.CreateCommand()
-                oSQLCOmmand.CommandText = SqlCommand
-                oSQLCOmmand.CommandTimeout = Timeout
-                oSQLCOmmand.Transaction = oTransaction
+            pSqlCommandObject.Connection = pSqlConnection
+            pSqlCommandObject.CommandTimeout = pTimeout
+            pSqlCommandObject.Transaction = oTransaction
+            oResult = pSqlCommandObject.ExecuteScalar()
 
-                oResult = oSQLCOmmand.ExecuteScalar()
-            End Using
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand)
+            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject)
+
         Finally
-            MaybeCommitTransaction(oTransaction, TransactionMode)
+            MaybeCommitTransaction(oTransaction, pTransactionMode)
         End Try
 
         Return oResult
     End Function
 
-    Public Function GetScalarValue(SQLCommand As SqlCommand, OutputParameter As String, Timeout As Integer) As Object
+    Public Function GetScalarValue(pSqlCommand As SqlCommand, pOutputParameter As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
         Try
             If TestCanConnect() = False Then
                 Return Nothing
             End If
 
-            Logger.Debug("GetScalarValue: Running Query [{0}]", SQLCommand)
+            Logger.Debug("GetScalarValue: Running Query [{0}]", pSqlCommand)
 
-            If SQLCommand.CommandText.Contains(" ") Then
-                SQLCommand.CommandType = CommandType.Text
+            If pSqlCommand.CommandText.Contains(" ") Then
+                pSqlCommand.CommandType = CommandType.Text
             Else
-                SQLCommand.CommandType = CommandType.StoredProcedure
+                pSqlCommand.CommandType = CommandType.StoredProcedure
             End If
 
             Using oConnection As SqlConnection = GetSQLConnection()
 
-                SQLCommand.Connection = oConnection
-                SQLCommand.Parameters(OutputParameter).Direction = ParameterDirection.Output
-                SQLCommand.CommandTimeout = Timeout
-                SQLCommand.ExecuteNonQuery()
+                pSqlCommand.Connection = oConnection
+                pSqlCommand.Parameters(pOutputParameter).Direction = ParameterDirection.Output
+                pSqlCommand.CommandTimeout = pTimeout
+                pSqlCommand.ExecuteNonQuery()
                 oConnection.Close()
 
-                Return SQLCommand.Parameters(OutputParameter).Value
+                Return pSqlCommand.Parameters(pOutputParameter).Value
             End Using
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn($"GetScalarValue failed SQLCommand [{SQLCommand}]")
+            Logger.Warn($"GetScalarValue failed SQLCommand [{pSqlCommand}]")
 
             Return Nothing
         End Try
@@ -509,7 +596,6 @@ Public Class MSSQLServer
         End Try
     End Sub
 
-    '<DebuggerStepThrough()>
     Private Sub NewExecuteNonQueryAsync_Callback(ByVal result As IAsyncResult)
         Dim command As SqlCommand = CType(result.AsyncState, SqlCommand)
         Dim res = command.EndExecuteNonQuery(result)

Database/Database.vbproj

@@ -99,6 +99,7 @@
     <Compile Include="Dispatcher.vb" />
     <Compile Include="Exceptions.vb" />
     <Compile Include="Adapters\Firebird.vb" />
+    <Compile Include="Helpers.vb" />
     <Compile Include="IDatabase.vb" />
     <Compile Include="Adapters\ODBC.vb" />
     <Compile Include="Adapters\Oracle.vb" />

Database/Helpers.vb

@@ -0,0 +1,10 @@
+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.SqlClient
 
 Public Interface IDatabase
     ''' <summary>
@@ -7,8 +8,8 @@ Public Interface IDatabase
     Property DBInitialized As Boolean
     Property CurrentConnectionString As String
 
-    Function GetDatatable(SqlCommand As String, Timeout As Integer) As DataTable
-    Function GetDatatable(SqlCommand As String) As DataTable
+    Function GetDatatable(SqlCommand As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
+    Function GetDatatable(SqlCommand As SqlCommand, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
 
     Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean
     Function ExecuteNonQuery(SQLCommand As String) As Boolean

Database/My Project/AssemblyInfo.vb

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

Interfaces/GraphQLInterface.vb

@@ -30,11 +30,46 @@ Public Class GraphQLInterface
             _userEmail = Email
             _userPassword = Password
 
-            Dim oStore As New X509Store(StoreName.Root, StoreLocation.CurrentUser)
+            Dim oStoreNames As New List(Of StoreName) From {StoreName.Root, StoreName.My}
+            Dim oStoreLocations As New List(Of StoreLocation) From {StoreLocation.CurrentUser, StoreLocation.LocalMachine}
+
+            Dim oCertificate As X509Certificate2 = Nothing
+
+            For Each oStoreLocation In oStoreLocations
+                _logger.Debug("Checking Stores in Location [{0}]", oStoreLocation.ToString)
+
+                For Each oStoreName In oStoreNames
+                    oCertificate = FindCertificateByFingerprint(oStoreLocation, oStoreName, CertificateFingerprint, False)
+
+                    If oCertificate IsNot Nothing Then
+                        _logger.Info("Certificate found in Store [{0}]/[{1}]!", oStoreName.ToString, oStoreLocation.ToString)
+                        Exit For
+                    End If
+                Next
+            Next
+
+
+            If oCertificate Is Nothing Then
+                _logger.Warn("Certificate could not be found! Exiting.")
+                Exit Sub
+            End If
+
+            _certificate = oCertificate
+
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    Private Function FindCertificateByFingerprint(pLocation As StoreLocation, pStoreName As StoreName, pFingerprint As String, pValidOnly As Boolean) As X509Certificate2
+        Try
+            Dim oStore As New X509Store(pStoreName, pLocation)
+            Dim oLocation As String = pLocation.ToString
+
+            _logger.Info("Opening Store [{0}]/[{1}]..", oLocation, oStore.Name)
             oStore.Open(OpenFlags.ReadOnly)
 
-
-            _logger.Debug("Available Certificates ({0}):", oStore.Certificates.Count)
+            _logger.Info("Available Certificates in Store [{0}]/[{1}]: [{2}]", oLocation, oStore.Name, oStore.Certificates.Count)
 
             For Each oCert In oStore.Certificates
                 _logger.Debug("FriendlyName: {0}", oCert.FriendlyName)
@@ -43,20 +78,24 @@ Public Class GraphQLInterface
                 _logger.Debug("Fingerprint: {0}", oCert.Thumbprint)
             Next
 
-            _logger.Debug("Looking for Certificate with Fingerprint [{0}]", CertificateFingerprint)
+            _logger.Debug("Looking for Certificate with Fingerprint [{0}]", pFingerprint)
+            Dim oFoundCerts = oStore.Certificates.Find(X509FindType.FindByThumbprint, pFingerprint, pValidOnly)
 
-            Dim oFoundCerts = oStore.Certificates.Find(X509FindType.FindByThumbprint, CertificateFingerprint, False)
+            _logger.Debug("Closing store..")
+            oStore.Close()
 
             If oFoundCerts.Count = 0 Then
-                _logger.Warn("Certificate could not be found! Exiting.")
-                Exit Sub
+                _logger.Debug("Certificate with Fingerprint [{0}] not found in Store [{1}]/[{2}]", pFingerprint, oLocation, oStore.Name)
+                Return Nothing
             End If
 
-            _certificate = oFoundCerts.Item(0)
+            Return oFoundCerts.Item(0)
         Catch ex As Exception
+            _logger.Warn("Unexpected error while searching for certificate with Fingerprint [{0}].", pFingerprint)
             _logger.Error(ex)
+            Return Nothing
         End Try
-    End Sub
+    End Function
 
     Public Sub SaveCookies(Cookie As Cookie)
         GetCookies().Add(Cookie)
@@ -144,13 +183,18 @@ Public Class GraphQLInterface
 
     Private Function GetRequest(Url As String, PostData As Byte()) As HttpWebRequest
         Try
+            ' Set supported TLS versions for WebRequest
+            ' Source: https://stackoverflow.com/questions/10822509/the-request-was-aborted-could-not-create-ssl-tls-secure-channel
+            'SetSecurityOptions()
+            'SetSecurityOptionsInsecure()
+            'SetSecurityOptionsModern()
+
             Dim oRequest As HttpWebRequest = WebRequest.Create($"{_baseUrl}{Url}")
             oRequest.Method = "POST"
             oRequest.ContentType = "application/json"
             oRequest.ContentLength = PostData.Length
             oRequest.ClientCertificates.Add(_certificate)
             oRequest.CookieContainer = GetCookies()
-
             oRequest.Proxy = Nothing
 
             If Proxy Is Nothing Then
@@ -167,6 +211,26 @@ Public Class GraphQLInterface
         End Try
     End Function
 
+
+    Private Sub SetSecurityOptions()
+        ServicePointManager.SecurityProtocol =
+            SecurityProtocolType.Tls Or
+            SecurityProtocolType.Tls11 Or
+            SecurityProtocolType.Tls12
+    End Sub
+
+    Private Sub SetSecurityOptionsInsecure()
+        ServicePointManager.SecurityProtocol =
+            SecurityProtocolType.Tls Or
+            SecurityProtocolType.Tls11 Or
+            SecurityProtocolType.Tls12 Or
+            SecurityProtocolType.Ssl3
+    End Sub
+
+    Private Sub SetSecurityOptionsModern()
+        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
+    End Sub
+
     Private Function GetCookies() As CookieContainer
         If _cookieJar Is Nothing Then
             _cookieJar = New CookieContainer(MAX_COOKIE_COUNT, MAX_COOKIE_COUNT_PER_DOMAIN, MAX_COOKIE_SIZE)

Interfaces/Interfaces.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Modules.Interfaces</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -98,6 +99,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>

Interfaces/My Project/AssemblyInfo.vb

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

Interfaces/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()>  _

Interfaces/My Project/Settings.Designer.vb

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

Interfaces/app.config

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <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" />
+        <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>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

Jobs/App.config

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
   <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" />
+        <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>
+</configuration>

Jobs/Jobs.vbproj

@@ -10,9 +10,10 @@
     <AssemblyName>DigitalData.Modules.Jobs</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Empty</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

Jobs/My Project/Settings.Designer.vb

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

Mailfunctions/Mail.vb

@@ -1,13 +0,0 @@
-Imports DigitalData.Modules.Logging
-Public Class Mail
-    Private LogConfig As LogConfig
-    Private Logger As DigitalData.Modules.Logging.Logger
-    Public Sub New(LogConfig As LogConfig)
-        LogConfig = LogConfig
-        Logger = LogConfig.GetLogger()
-        Logger.Info("MailingClass initialized")
-    End Sub
-    Public Function Connecttest()
-
-    End Function
-End Class

Mailfunctions/Mailfunctions.vbproj

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Mailfunctions</RootNamespace>
-    <AssemblyName>Mailfunctions</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Mailfunctions.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>Mailfunctions.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="Mail">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
-    </Reference>
-    <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="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Mail.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="..\Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>

Mailfunctions/My Project/Application.Designer.vb

@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-

Mailfunctions/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>

Mailfunctions/My Project/AssemblyInfo.vb

@@ -1,35 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' Allgemeine Informationen über eine Assembly werden über die folgenden
-' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-' die einer Assembly zugeordnet sind.
-
-' Werte der Assemblyattribute überprüfen
-
-<Assembly: AssemblyTitle("Mailfunctions")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("Mailfunctions")>
-<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("ba66c227-214d-4a87-9134-1f93f51d8bf9")>
-
-' 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.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>

Mailfunctions/My Project/Resources.Designer.vb

@@ -1,62 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My.Resources
-    
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
-    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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>
-        '''  Returns the cached ResourceManager instance used by this class.
-        '''</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("Mailfunctions.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-
-        '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set(ByVal value As Global.System.Globalization.CultureInfo)
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace

Mailfunctions/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>

Mailfunctions/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </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", "11.0.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 "My.Settings Auto-Save Functionality"
-#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(ByVal sender As Global.System.Object, ByVal 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.Mailfunctions.My.MySettings
-            Get
-                Return Global.Mailfunctions.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace

Mailfunctions/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>

Mailfunctions/packages.config

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

Messaging/Email.vb

@@ -294,9 +294,12 @@ Public Class Email
                     _logger.Debug("SSL = false")
                     myClient.EnableSsl = False
                 End If
-                _logger.Debug($"mailUser [{mailUser}]")
-                myClient.Credentials = New NetworkCredential(mailUser, mailPW)
-                myClient.UseDefaultCredentials = False
+                If mailUser <> String.Empty Then
+                    _logger.Debug($"mailUser [{mailUser}]")
+                    myClient.Credentials = New NetworkCredential(mailUser, mailPW)
+                    myClient.UseDefaultCredentials = False
+                End If
+
 
                 If Test = True Then
                     myMesssage.Body = $"This is the body (text will be replaced within profile)! <br> mailsmtp: {mailsmtp} <br> mailport: {mailport} <br> mailUser: {mailUser} <br> mailPW: XXXX <br> AUTH_TYPE: {AUTH_TYPE}"

Messaging/Email2.vb

@@ -69,9 +69,10 @@ Public Class Email2
                 pSMTP.StartTLS()
             End If
             Logger.Debug("Connection to SMTP Server [{0}] established!", pServer)
-
-            Logger.Debug("Logging in with user [{0}]", pUsername)
-            pSMTP.UseBestLogin(pUsername, pPassword)
+            If pUsername <> String.Empty Then
+                Logger.Debug("Logging in with user [{0}]", pUsername)
+                pSMTP.UseBestLogin(pUsername, pPassword)
+            End If
 
             Return pSMTP
 

Messaging/MailSender.vb

@@ -14,6 +14,7 @@ Public Class MailSender
     Private AuthType As String
 
     Private Session As Smtp = Nothing
+    Public Connected2Server As Boolean = False
 
     Const SMTP_IGNORED_ERRORS As SslPolicyErrors =
         SslPolicyErrors.RemoteCertificateChainErrors Or ' self-signed
@@ -39,7 +40,7 @@ Public Class MailSender
         Password = pPassword
         AuthType = pAuthType
 
-        Logger.Info("Connecting to Server..")
+        Logger.Debug("Connecting to Server..")
         Logger.Debug("SMTP Server: [{0}]", Server)
         Logger.Debug("SMTP Port: [{0}]", Port)
         Logger.Debug("SMTP User: [{0}]", User)
@@ -108,9 +109,10 @@ Public Class MailSender
         End If
 
         Try
-            Logger.Info("Logging in with user [{0}]", pUser)
-            oSession.UseBestLogin(pUser, pPassword)
-
+            If pUser <> String.Empty Then
+                Logger.Info("Logging in with user [{0}]", pUser)
+                oSession.UseBestLogin(pUser, pPassword)
+            End If
         Catch ex As Exception
             Logger.Warn("Error while connecting with Auth type PLAINTEXT!")
             Logger.Error(ex)
@@ -119,7 +121,7 @@ Public Class MailSender
         End Try
 
         Session = oSession
-
+        Connected2Server = True
         Return True
     End Function
 
@@ -175,6 +177,10 @@ Public Class MailSender
 
     Private Function SendMailTo(pSession As Smtp, pSendTo As String, pSendFrom As String, pSubject As String, pBody As String, pCreationTime As Date, pAttachments As List(Of String), pTest As Boolean)
         Try
+            If IsNothing(pSession) Then
+                Logger.Info("ATTENTION-ERROR: pSession is nothing!")
+                Return False
+            End If
             Logger.Debug("Preparing to send mail to [{0}]", pSendTo)
 
             Dim oMailBuilder As New Limilabs.Mail.MailBuilder()
@@ -189,6 +195,10 @@ Public Class MailSender
             oMailBuilder = AddAttachments(oMailBuilder, pAttachments)
 
             Logger.Debug("Now sending mail..")
+            If IsNothing(oMailBuilder) Then
+                Logger.Info("ATTENTION-ERROR: oMailBuilder is nothing!")
+                Return False
+            End If
             Dim oMail = oMailBuilder.Create()
             pSession.SendMessage(oMail)
             Logger.Info("Mail to [{0}] has been sent.", pSendTo)

Modules.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31005.135
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Base", "Base\Base.vbproj", "{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}"
 EndProject
@@ -27,8 +27,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging", "Logging\Logging.
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging.Test", "Logging.Test\Logging.Test.vbproj", "{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Mailfunctions", "Mailfunctions\Mailfunctions.vbproj", "{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Patterns", "Patterns\Patterns.vbproj", "{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Windows", "Windows\Windows.vbproj", "{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}"
@@ -39,6 +37,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZooFlow", "ZooFlow\ZooFlow.
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Messaging", "Messaging\Messaging.vbproj", "{AF664D85-0A4B-4BAB-A2F8-83110C06553A}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Database.Test", "Database.Test\Database.Test.vbproj", "{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,10 +93,6 @@ Global
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9827B8D-9EF9-411A-A6BF-4807794F8C8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -117,6 +113,10 @@ Global
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ZooFlow/Environment.vb

@@ -3,8 +3,8 @@
 Public Class Environment
     Public Property User As New State.UserState
     Public Property Settings As New State.SettingsState
-    Public Property Service As State.ServiceState
+    Public Property Service As New State.ServiceState
     Public Property Database As MSSQLServer
     Public Property DatabaseIDB As MSSQLServer
-    Public Property Modules As Dictionary(Of String, State.ModuleState)
+    Public Property Modules As New Dictionary(Of String, State.ModuleState)
 End Class