diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj
index c26d17b5..baf6f8f2 100644
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -68,7 +68,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config
index 99e34262..c1fd79a0 100644
--- a/Controls.DocumentViewer/packages.config
+++ b/Controls.DocumentViewer/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/DDEmailService/App.config b/DDEmailService/App.config
index b4ef8fa7..7eb8eeb4 100644
--- a/DDEmailService/App.config
+++ b/DDEmailService/App.config
@@ -1,7 +1,7 @@
-
+
-
+
@@ -33,4 +33,9 @@
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DDEmailService/DDEmailService.vbproj b/DDEmailService/DDEmailService.vbproj
index 10331743..09761bae 100644
--- a/DDEmailService/DDEmailService.vbproj
+++ b/DDEmailService/DDEmailService.vbproj
@@ -6,7 +6,7 @@
AnyCPU
{83ED2617-B398-4859-8F59-B38F8807E83E}
WinExe
- DDEmailService.Service1
+ DDEmailService.EmailService
DDEmailService
DDEmailService
512
@@ -47,11 +47,23 @@
On
+
+ ..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll
+
+
+
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
+
+
+
+
+
+
@@ -80,11 +92,11 @@
Component
-
+
Component
-
- Service1.vb
+
+ EmailService.vb
@@ -120,6 +132,29 @@
Settings.Designer.vb
+
+
+
+
+ {eaf0ea75-5fa7-485d-89c7-b2d843b03a96}
+ Database
+
+
+ {991d0231-4623-496d-8bd0-9ca906029cbc}
+ Filesystem
+
+
+ {d3c8cfed-d6f6-43a8-9bdf-454145d0352f}
+ Language
+
+
+ {903b2d7d-3b80-4be9-8713-7447b704e1b0}
+ Logging
+
+
+ {af664d85-0a4b-4bab-a2f8-83110c06553a}
+ Messaging
+
\ No newline at end of file
diff --git a/DDEmailService/Service1.Designer.vb b/DDEmailService/EmailService.Designer.vb
similarity index 97%
rename from DDEmailService/Service1.Designer.vb
rename to DDEmailService/EmailService.Designer.vb
index 1ca347fd..4b562e79 100644
--- a/DDEmailService/Service1.Designer.vb
+++ b/DDEmailService/EmailService.Designer.vb
@@ -1,7 +1,7 @@
Imports System.ServiceProcess
_
-Partial Class Service1
+Partial Class EmailService
Inherits System.ServiceProcess.ServiceBase
'UserService überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -28,7 +28,7 @@ Partial Class Service1
'
' ServicesToRun = New System.ServiceProcess.ServiceBase () {New Service1, New MySecondUserService}
'
- ServicesToRun = New System.ServiceProcess.ServiceBase() {New Service1}
+ ServicesToRun = New System.ServiceProcess.ServiceBase() {New EmailService}
System.ServiceProcess.ServiceBase.Run(ServicesToRun)
End Sub
diff --git a/DDEmailService/EmailService.vb b/DDEmailService/EmailService.vb
new file mode 100644
index 00000000..77b532c4
--- /dev/null
+++ b/DDEmailService/EmailService.vb
@@ -0,0 +1,347 @@
+Imports System.ComponentModel
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Messaging
+Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.Language
+Imports System.Timers
+Imports System.IO
+Public Class EmailService
+ Private _Logger As Logger
+ Private _LogConfig As LogConfig
+ Private _Firebird As Firebird
+ Private _MSSQL As MSSQLServer
+ Private _MSSQL_Test As MSSQLServer
+ Private _Email As Email
+ Private _Encryption As EncryptionLegacy
+
+ Private _EmailQueue As BackgroundWorker
+ Private _QueueTimer As Timer
+
+ Private _AnyDatabaseInitialized As Boolean = False
+
+ Private Enum DatabaseType
+ Firebird
+ MSSQL
+ End Enum
+
+ Protected Overrides Sub OnStart(ByVal args() As String)
+ Try
+ ' === Initialize Logger ===
+
+ _LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"))
+ _LogConfig.Debug = My.Settings.DEBUG
+ _Logger = _LogConfig.GetLogger()
+
+ _Logger.Info("Starting {0}", ServiceName)
+
+ ' === Inititalize Encryption ===
+
+ _Logger.NewBlock("Inititalize Encryption")
+
+ _Encryption = New EncryptionLegacy("!35452didalog=")
+
+ _Logger.EndBlock()
+
+ ' === Initialize Databases ===
+
+ _Logger.NewBlock("Inititalize Databases")
+
+ If My.Settings.FB_ConnString <> String.Empty Then
+ _Firebird = New Firebird(_LogConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
+
+ If _Firebird._DBInitialized = False Then
+ _Logger.Warn("Firebird Connection could not be established. Check the Error Log")
+ End If
+ End If
+
+ If My.Settings.SQLSERVER_CS <> String.Empty Then
+ _MSSQL = New MSSQLServer(_LogConfig, My.Settings.SQLSERVER_CS)
+
+ If _MSSQL.DBInitialized = False Then
+ _Logger.Warn("MSSQL Connection could not be established. Check the Error Log")
+ End If
+ End If
+
+ If My.Settings.SQLSERVER_CS_TEST <> String.Empty Then
+ _MSSQL_Test = New MSSQLServer(_LogConfig, My.Settings.SQLSERVER_CS_TEST)
+
+ If _MSSQL_Test.DBInitialized = False Then
+ _Logger.Warn("MSSQL Test Connection could not be established. Check the Error Log")
+ End If
+ End If
+
+ _AnyDatabaseInitialized = _Firebird._DBInitialized Or _MSSQL.DBInitialized Or _MSSQL_Test.DBInitialized
+
+ _Logger.EndBlock()
+
+ ' === Initialize Email ===
+
+ _Logger.NewBlock("Inititalize Email")
+
+ _Email = New Email(_LogConfig)
+
+ _Logger.EndBlock()
+
+ ' === Initialize Queue ===
+
+ _Logger.NewBlock("Inititalize Queue")
+
+ If _AnyDatabaseInitialized Then
+ _EmailQueue = New BackgroundWorker() With {
+ .WorkerReportsProgress = True,
+ .WorkerSupportsCancellation = True
+ }
+
+ AddHandler _EmailQueue.DoWork, AddressOf EmailQueue_DoWork
+ AddHandler _EmailQueue.RunWorkerCompleted, AddressOf EmailQueue_Completed
+ End If
+
+ _Logger.EndBlock()
+
+ ' === Initialize & Start Timer ===
+
+ _Logger.NewBlock("Initialize & Start Timer")
+
+ If _AnyDatabaseInitialized Then
+ _QueueTimer = New Timer With {
+ .Interval = 60000,
+ .Enabled = True
+ }
+
+ AddHandler _QueueTimer.Elapsed, AddressOf QueueTimer_Elapsed
+ End If
+
+ _Logger.EndBlock()
+
+ ' === Initial Run ===
+
+ If _AnyDatabaseInitialized Then
+ _Logger.Info("Starting Initial Run...")
+ _EmailQueue.RunWorkerAsync()
+ End If
+ Catch ex As Exception
+ _Logger.Error(ex)
+ End Try
+ End Sub
+
+ Private Sub QueueTimer_Elapsed(sender As Object, e As ElapsedEventArgs)
+ If Not _EmailQueue.IsBusy Then
+ _EmailQueue.RunWorkerAsync()
+ _Logger.Info("Worker is ready, executing.")
+ Else
+ _Logger.Info("Worker is busy, skipping execution.")
+ End If
+ End Sub
+
+ Private Sub EmailQueue_DoWork(sender As Object, e As DoWorkEventArgs)
+ Try
+ If _Firebird._DBInitialized Then
+ SendEmailFrom(DatabaseType.Firebird, Nothing)
+ End If
+
+ If _MSSQL.DBInitialized Then
+ SendEmailFrom(DatabaseType.MSSQL, _MSSQL)
+ End If
+
+ If _MSSQL_Test.DBInitialized Then
+ SendEmailFrom(DatabaseType.MSSQL, _MSSQL_Test)
+ End If
+ Catch ex As Exception
+ _Logger.Error(ex)
+ End Try
+ End Sub
+
+ Private Function SendEmailFromMSSQL()
+ Throw New NotImplementedException()
+ End Function
+
+ Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer)
+ Try
+ Dim oSQL As String = String.Empty
+ Dim oEmailAccounts As DataTable
+ Dim oEmailQueue As DataTable
+
+ Select Case Database
+ Case DatabaseType.Firebird
+ oSQL = "SELECT * FROM TBEDM_EMAIL_ACCOUNT WHERE ACTIVE = True"
+ oEmailAccounts = _Firebird.GetDatatable(oSQL)
+ Case DatabaseType.MSSQL
+ oSQL = "SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1"
+ oEmailAccounts = MSSQLInstance.GetDatatable(oSQL)
+ End Select
+
+ If IsNothing(oEmailAccounts) Then
+ _Logger.Warn("Error in TBEDM_EMAIL_ACCOUNT Query. Exiting.")
+ _Logger.Warn("Query: {0}", oSQL)
+ Return False
+ End If
+
+ If oEmailAccounts.Rows.Count = 0 Then
+ _Logger.Warn("No Active Email Accounts Configured! Exiting.")
+ Return False
+ End If
+
+ Select Case Database
+ Case DatabaseType.Firebird
+ oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
+ oEmailQueue = _Firebird.GetDatatable(oSQL)
+ Case DatabaseType.MSSQL
+ oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
+ oEmailQueue = MSSQLInstance.GetDatatable(oSQL)
+ End Select
+
+ If IsNothing(oEmailQueue) Then
+ _Logger.Warn("Error in EmailQueue Query. Exiting.")
+ _Logger.Warn("Query: {0}", oSQL)
+ Return False
+ End If
+
+ If oEmailQueue.Rows.Count = 0 Then
+ _Logger.Info("Email Queue is empty. Exiting.")
+ Return False
+ End If
+
+ Dim oEmailTo, oSubject, oBody As String
+ Dim oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment
+ Dim oAccountId, oGuid, oJobId As Integer
+
+ For Each oEmailToRow As DataRow In oEmailQueue.Rows
+ Dim oAccountMatch As Boolean = False
+ Dim oComment As String = String.Empty
+
+ Select Case Database
+ Case DatabaseType.Firebird
+ oAccountId = oEmailToRow.Item("EMAIL_ACCOUNT_ID")
+ Case DatabaseType.MSSQL
+ oAccountId = oEmailToRow.Item("SENDING_PROFILE")
+ End Select
+
+ For Each oAccountRow As DataRow In oEmailAccounts.Rows
+ If oAccountRow.Item("GUID") = oAccountId Then
+ oAccountMatch = True
+
+ Select Case Database
+ Case DatabaseType.Firebird
+ oMailFrom = oAccountRow.Item("EMAIL_FROM")
+ oMailSMTP = oAccountRow.Item("SERVER_OUT")
+ oMailport = oAccountRow.Item("PORT_OUT")
+ oMailUser = oAccountRow.Item("EMAIL_USER")
+ oAuthType = oAccountRow.Item("AUTH_TYPE")
+ oMailPW = oAccountRow.Item("EMAIL_PW")
+
+ Case DatabaseType.MSSQL
+ oMailFrom = oAccountRow.Item("EMAIL_FROM")
+ oMailSMTP = oAccountRow.Item("EMAIL_SMTP")
+ oMailport = oAccountRow.Item("PORT")
+ oMailUser = oAccountRow.Item("EMAIL_USER")
+ oAuthType = oAccountRow.Item("AUTH_TYPE")
+ oMailPW = oAccountRow.Item("EMAIL_PW")
+ End Select
+
+ Dim oPasswordPlain = _Encryption.DecryptData(oMailPW)
+ If Not IsNothing(oPasswordPlain) Then
+ oMailPW = oPasswordPlain
+ Else
+ _Logger.Warn("Could not decrypt email password. Exiting.")
+ Return False
+ End If
+ End If
+ Next
+
+ If IsNothing(oMailFrom) Or IsNothing(oMailPW) Then
+ If oAccountMatch Then
+ _Logger.Warn("Account credentials are empty. Exiting.")
+ Else
+ _Logger.Warn("Account credentials are empty and account with Id {0} does not match the configuration. Exiting.", oAccountId)
+ End If
+
+ Return False
+ End If
+
+ Select Case Database
+ Case DatabaseType.Firebird
+ oGuid = oEmailToRow.Item("GUID")
+ oEmailTo = oEmailToRow.Item("EMAIL_TO")
+ _Logger.Debug("oEmailTo: {0}", oEmailTo)
+ oSubject = oEmailToRow.Item("EMAIL_SUBJ")
+ _Logger.Debug("oSubject: {0}", oSubject)
+ oBody = oEmailToRow.Item("EMAIL_BODY")
+ _Logger.Debug("oBody: {0}", oBody)
+ oJobId = oEmailToRow.Item("JOB_ID")
+ _Logger.Debug("oJOB_ID: {0}", oJobId)
+ oAttachment = Utils.NotNull(oEmailToRow.Item("EMAIL_ATTMT1"), String.Empty)
+
+ Case DatabaseType.MSSQL
+ oGuid = oEmailToRow.Item("GUID")
+ oEmailTo = oEmailToRow.Item("EMAIL_ADRESS")
+ _Logger.Debug($"oEmailTo: {oEmailTo}")
+ oSubject = oEmailToRow.Item("EMAIL_SUBJ")
+ _Logger.Debug($"oSubject: {oSubject}")
+ oBody = oEmailToRow.Item("EMAIL_BODY")
+ _Logger.Debug($"oBody: {oBody}")
+ oJobId = oEmailToRow.Item("REFERENCE_ID")
+ _Logger.Debug($"oJOB_ID: {oJobId}")
+ oAttachment = Utils.NotNull(oEmailToRow.Item("EMAIL_ATTMT1"), String.Empty)
+ End Select
+
+ If oAttachment <> String.Empty Then
+ If IO.File.Exists(oAttachment) = False Then
+ _Logger.Warn($"Email Attachment FB FileNotFound Exception!")
+ oComment = "Email Attachment FB FileNotFound Exception"
+ oAttachment = String.Empty
+ Else
+ _Logger.Debug("Email Attachment is: {0}", oAttachment)
+ End If
+ End If
+
+ Dim oEmailSent As Boolean = False
+ oEmailSent = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEmailService", oAttachment)
+
+ If oEmailSent Then
+ Select Case Database
+ Case DatabaseType.Firebird
+ oSQL = $"UPDATE TBEDM_EMAIL_QUEUE SET EMAIL_SENT = CURRENT_TIMESTAMP,COMMENT = '{oComment}' WHERE GUID = {oGuid}"
+ If oSQL.Contains(",COMMENT = ''") Then
+ oSQL.Replace(",COMMENT = ''", "")
+ End If
+ _Firebird.ExecuteNonQuery(oSQL)
+ Case DatabaseType.MSSQL
+ oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(),COMMENT = '{oComment}' WHERE GUID = {oGuid} "
+ If oSQL.Contains(",COMMENT = ''") Then
+ oSQL.Replace(",COMMENT = ''", "")
+ End If
+ MSSQLInstance.NewExecutenonQuery(oSQL)
+ End Select
+ End If
+ Next
+
+ Return True
+ Catch ex As Exception
+ _Logger.Warn("Error in SendEmailFromFirebird. Email was not sent.")
+ _Logger.Error(ex)
+ Return False
+ End Try
+ End Function
+
+ Private Sub EmailQueue_Completed(sender As Object, e As RunWorkerCompletedEventArgs)
+ Try
+ If e.Cancelled Then
+ _Logger.Warn("EmailQueue has been cancelled manually!")
+ ElseIf e.Error IsNot Nothing Then
+ _Logger.Warn("Unexpected Error in EmailQueue: {0}", e.Error.Message)
+ _Logger.Error(e.Error)
+ End If
+ Catch ex As Exception
+ _Logger.Error(e.Error)
+ End Try
+ End Sub
+
+ Protected Overrides Sub OnStop()
+ Try
+ _Logger.Warn("Service {0} was stopped.", ServiceName)
+ Catch ex As Exception
+ _Logger.Error(ex)
+ End Try
+ End Sub
+End Class
diff --git a/DDEmailService/ProjectInstaller.Designer.vb b/DDEmailService/ProjectInstaller.Designer.vb
index 6dcd0922..899afad2 100644
--- a/DDEmailService/ProjectInstaller.Designer.vb
+++ b/DDEmailService/ProjectInstaller.Designer.vb
@@ -26,12 +26,14 @@
'
'ServiceProcessInstaller1
'
+ Me.ServiceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalService
Me.ServiceProcessInstaller1.Password = Nothing
Me.ServiceProcessInstaller1.Username = Nothing
'
'ServiceInstaller1
'
- Me.ServiceInstaller1.ServiceName = "Service1"
+ Me.ServiceInstaller1.DisplayName = "Digital Data Email Service"
+ Me.ServiceInstaller1.ServiceName = "DDEmailService"
'
'ProjectInstaller
'
diff --git a/DDEmailService/ProjectInstaller.resx b/DDEmailService/ProjectInstaller.resx
index 323abb16..e1b81e8f 100644
--- a/DDEmailService/ProjectInstaller.resx
+++ b/DDEmailService/ProjectInstaller.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 17, 17
+ 17, 56
197, 17
diff --git a/DDEmailService/Service1.vb b/DDEmailService/Service1.vb
deleted file mode 100644
index ae82c66a..00000000
--- a/DDEmailService/Service1.vb
+++ /dev/null
@@ -1,18 +0,0 @@
-Imports System.ComponentModel
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Messaging
-Imports DigitalData.EMLProfiler
-Imports System.IO
-Public Class Service1
-
- Protected Overrides Sub OnStart(ByVal args() As String)
- ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge
- ' ausführen, damit der Dienst gestartet werden kann.
- End Sub
-
- Protected Overrides Sub OnStop()
- ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen.
- End Sub
-
-End Class
diff --git a/DDEmailService/packages.config b/DDEmailService/packages.config
new file mode 100644
index 00000000..da1b48cf
--- /dev/null
+++ b/DDEmailService/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/DDLicenseService/DDEDMLicenseService.vbproj b/DDLicenseService/DDEDMLicenseService.vbproj
index 0b27b112..b1ab85f2 100644
--- a/DDLicenseService/DDEDMLicenseService.vbproj
+++ b/DDLicenseService/DDEDMLicenseService.vbproj
@@ -49,7 +49,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
@@ -125,7 +125,9 @@
My
Settings.Designer.vb
-
+
+ Designer
+
diff --git a/DDLicenseService/packages.config b/DDLicenseService/packages.config
index 99e34262..c1fd79a0 100644
--- a/DDLicenseService/packages.config
+++ b/DDLicenseService/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/DDZUGFeRDService/DDZUGFeRDService.vbproj b/DDZUGFeRDService/DDZUGFeRDService.vbproj
index a2bc47fb..acf33725 100644
--- a/DDZUGFeRDService/DDZUGFeRDService.vbproj
+++ b/DDZUGFeRDService/DDZUGFeRDService.vbproj
@@ -52,7 +52,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/DDZUGFeRDService/packages.config b/DDZUGFeRDService/packages.config
index 7a05eafe..da1b48cf 100644
--- a/DDZUGFeRDService/packages.config
+++ b/DDZUGFeRDService/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/DD_CommunicationService/DD_CommunicationService.vbproj b/DD_CommunicationService/DD_CommunicationService.vbproj
index 12a90bf1..286848e8 100644
--- a/DD_CommunicationService/DD_CommunicationService.vbproj
+++ b/DD_CommunicationService/DD_CommunicationService.vbproj
@@ -143,5 +143,11 @@
+
+
+ {AF664D85-0A4B-4BAB-A2F8-83110C06553A}
+ Messaging
+
+
\ No newline at end of file
diff --git a/DD_CommunicationService/MyComService.vb b/DD_CommunicationService/MyComService.vb
index 860e1297..c358c780 100644
--- a/DD_CommunicationService/MyComService.vb
+++ b/DD_CommunicationService/MyComService.vb
@@ -241,6 +241,7 @@ Public Class MyComService
Dim oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment
Dim oACCOUNT_MATCH As Boolean = False
+
For Each oAccountRow As DataRow In oDT_EMAIL_ACCOUNT.Rows
If oAccountRow.Item("GUID") = oEMAILACCOUNT_ID Then
oACCOUNT_MATCH = True
@@ -251,8 +252,6 @@ Public Class MyComService
oAuthType = oAccountRow.Item("AUTH_TYPE")
oMailPW = oAccountRow.Item("EMAIL_PW")
-
-
Dim owrapper As New clsEncryption("!35452didalog=")
Dim oPWPlain = owrapper.DecryptData(oMailPW)
@@ -264,6 +263,7 @@ Public Class MyComService
End If
End If
Next
+
If IsNothing(oMailFrom) Or IsNothing(oMailPW) Then
If oACCOUNT_MATCH = True Then
myLogger.Warn("ACCOUNT-Infos are nothing!")
diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj
index 460c519d..e716d318 100644
--- a/GUIs.ClientSuite/ClientSuite.vbproj
+++ b/GUIs.ClientSuite/ClientSuite.vbproj
@@ -89,7 +89,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll
@@ -496,6 +496,10 @@
{44982f9b-6116-44e2-85d0-f39650b1ef99}
Config
+
+ {5b1171dc-fffe-4813-a20d-786aae47b320}
+ EDMIAPI
+
{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}
Language
diff --git a/GUIs.ClientSuite/packages.config b/GUIs.ClientSuite/packages.config
index 22b3f7df..4da9616a 100644
--- a/GUIs.ClientSuite/packages.config
+++ b/GUIs.ClientSuite/packages.config
@@ -3,6 +3,6 @@
-
+
\ No newline at end of file
diff --git a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
index 7bc352ab..b6d18b01 100644
--- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
+++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
@@ -58,7 +58,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/GUIs.ClipboardWatcher/packages.config b/GUIs.ClipboardWatcher/packages.config
index 99e34262..c1fd79a0 100644
--- a/GUIs.ClipboardWatcher/packages.config
+++ b/GUIs.ClipboardWatcher/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj
index 7d833f94..277c7740 100644
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@@ -62,7 +62,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
@@ -154,7 +154,6 @@
My
Settings.Designer.vb
-
@@ -179,6 +178,7 @@
+
diff --git a/GUIs.Common/packages.config b/GUIs.Common/packages.config
index 99e34262..c1fd79a0 100644
--- a/GUIs.Common/packages.config
+++ b/GUIs.Common/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/GUIs.Test.ADSyncTest/ADSyncTest.vbproj b/GUIs.Test.ADSyncTest/ADSyncTest.vbproj
index 1f4366ce..e9ae7bc5 100644
--- a/GUIs.Test.ADSyncTest/ADSyncTest.vbproj
+++ b/GUIs.Test.ADSyncTest/ADSyncTest.vbproj
@@ -49,7 +49,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/GUIs.Test.ADSyncTest/packages.config b/GUIs.Test.ADSyncTest/packages.config
index 99e34262..c1fd79a0 100644
--- a/GUIs.Test.ADSyncTest/packages.config
+++ b/GUIs.Test.ADSyncTest/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj b/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj
index e33a4524..6b36ada7 100644
--- a/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj
+++ b/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj
@@ -52,7 +52,7 @@
..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/GUIs.Test.GraphQLTest/packages.config b/GUIs.Test.GraphQLTest/packages.config
index b96ef76e..605fc874 100644
--- a/GUIs.Test.GraphQLTest/packages.config
+++ b/GUIs.Test.GraphQLTest/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
index 793769eb..9e16c7b2 100644
--- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
+++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
@@ -52,7 +52,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/GUIs.Test.ZUGFeRDTest/packages.config b/GUIs.Test.ZUGFeRDTest/packages.config
index 7a05eafe..da1b48cf 100644
--- a/GUIs.Test.ZUGFeRDTest/packages.config
+++ b/GUIs.Test.ZUGFeRDTest/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 0dcd26c4..f08c2ae2 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -55,7 +55,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
@@ -181,9 +181,6 @@
Application.Designer.vb
-
-
-
{b7d465a2-ae31-4cdf-a8b2-34b42d3ea84e}
@@ -228,6 +225,7 @@
+
diff --git a/GUIs.ZooFlow/packages.config b/GUIs.ZooFlow/packages.config
index 99e34262..c1fd79a0 100644
--- a/GUIs.ZooFlow/packages.config
+++ b/GUIs.ZooFlow/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.Config/Config.vbproj b/Modules.Config/Config.vbproj
index 0f139413..68caa542 100644
--- a/Modules.Config/Config.vbproj
+++ b/Modules.Config/Config.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.Config/packages.config b/Modules.Config/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.Config/packages.config
+++ b/Modules.Config/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.Database/Database.vbproj b/Modules.Database/Database.vbproj
index 03ceee90..6bcb694e 100644
--- a/Modules.Database/Database.vbproj
+++ b/Modules.Database/Database.vbproj
@@ -59,7 +59,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll
diff --git a/Modules.Database/packages.config b/Modules.Database/packages.config
index 7fbd4098..e4841ee5 100644
--- a/Modules.Database/packages.config
+++ b/Modules.Database/packages.config
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/Modules.EDMIAPI/EDMIAPI.vbproj b/Modules.EDMIAPI/EDMIAPI.vbproj
index 6454ba73..30062d20 100644
--- a/Modules.EDMIAPI/EDMIAPI.vbproj
+++ b/Modules.EDMIAPI/EDMIAPI.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.EDMIAPI/packages.config b/Modules.EDMIAPI/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.EDMIAPI/packages.config
+++ b/Modules.EDMIAPI/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.Filesystem/Filesystem.vbproj b/Modules.Filesystem/Filesystem.vbproj
index 80864930..f7220adf 100644
--- a/Modules.Filesystem/Filesystem.vbproj
+++ b/Modules.Filesystem/Filesystem.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll
diff --git a/Modules.Filesystem/packages.config b/Modules.Filesystem/packages.config
index c8b3963c..d9d64de0 100644
--- a/Modules.Filesystem/packages.config
+++ b/Modules.Filesystem/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Modules.Interfaces/Interfaces.vbproj b/Modules.Interfaces/Interfaces.vbproj
index 82c333b1..4127fe30 100644
--- a/Modules.Interfaces/Interfaces.vbproj
+++ b/Modules.Interfaces/Interfaces.vbproj
@@ -48,7 +48,7 @@
..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.Interfaces/packages.config b/Modules.Interfaces/packages.config
index b96ef76e..605fc874 100644
--- a/Modules.Interfaces/packages.config
+++ b/Modules.Interfaces/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Modules.Jobs/Jobs.vbproj b/Modules.Jobs/Jobs.vbproj
index a98f142f..59c4bb25 100644
--- a/Modules.Jobs/Jobs.vbproj
+++ b/Modules.Jobs/Jobs.vbproj
@@ -110,7 +110,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.Jobs/packages.config b/Modules.Jobs/packages.config
index 7a05eafe..da1b48cf 100644
--- a/Modules.Jobs/packages.config
+++ b/Modules.Jobs/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Modules.Language/Language.vbproj b/Modules.Language/Language.vbproj
index 87f6e6f8..b8058057 100644
--- a/Modules.Language/Language.vbproj
+++ b/Modules.Language/Language.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.Language/packages.config b/Modules.Language/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.Language/packages.config
+++ b/Modules.Language/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.License/License.vbproj b/Modules.License/License.vbproj
index 2787322b..174a3edd 100644
--- a/Modules.License/License.vbproj
+++ b/Modules.License/License.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.License/packages.config b/Modules.License/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.License/packages.config
+++ b/Modules.License/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.Logging/Logging.vbproj b/Modules.Logging/Logging.vbproj
index 626bc166..3bdb779d 100644
--- a/Modules.Logging/Logging.vbproj
+++ b/Modules.Logging/Logging.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.Logging/packages.config b/Modules.Logging/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.Logging/packages.config
+++ b/Modules.Logging/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.Messaging/Messaging.vbproj b/Modules.Messaging/Messaging.vbproj
index 2aed5974..6f4da727 100644
--- a/Modules.Messaging/Messaging.vbproj
+++ b/Modules.Messaging/Messaging.vbproj
@@ -43,15 +43,12 @@
On
-
- ..\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll
-
P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Email .NET\Bin\Independentsoft.Email.dll
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll
@@ -120,5 +117,11 @@
+
+
+ {903b2d7d-3b80-4be9-8713-7447b704e1b0}
+ Logging
+
+
\ No newline at end of file
diff --git a/Modules.Messaging/packages.config b/Modules.Messaging/packages.config
index bbb74850..fe4a2ab7 100644
--- a/Modules.Messaging/packages.config
+++ b/Modules.Messaging/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Modules.Patterns/Patterns.vbproj b/Modules.Patterns/Patterns.vbproj
index a994de37..179d1ddc 100644
--- a/Modules.Patterns/Patterns.vbproj
+++ b/Modules.Patterns/Patterns.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.Patterns/packages.config b/Modules.Patterns/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.Patterns/packages.config
+++ b/Modules.Patterns/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.Windream/Windream.vbproj b/Modules.Windream/Windream.vbproj
index 8e132854..ee6bed08 100644
--- a/Modules.Windream/Windream.vbproj
+++ b/Modules.Windream/Windream.vbproj
@@ -65,7 +65,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.Windream/packages.config b/Modules.Windream/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.Windream/packages.config
+++ b/Modules.Windream/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Modules.ZooFlow/ZooFlow.vbproj b/Modules.ZooFlow/ZooFlow.vbproj
index 758f8c4e..5c865766 100644
--- a/Modules.ZooFlow/ZooFlow.vbproj
+++ b/Modules.ZooFlow/ZooFlow.vbproj
@@ -45,7 +45,7 @@
- ..\..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Modules.ZooFlow/packages.config b/Modules.ZooFlow/packages.config
index 99e34262..c1fd79a0 100644
--- a/Modules.ZooFlow/packages.config
+++ b/Modules.ZooFlow/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/SERVICES/DDEDM_NetworkService/IDBService.vb b/SERVICES/DDEDM_NetworkService/IDBService.vb
index 35a9031f..bfbf3ee6 100644
--- a/SERVICES/DDEDM_NetworkService/IDBService.vb
+++ b/SERVICES/DDEDM_NetworkService/IDBService.vb
@@ -3,6 +3,7 @@ Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging
Imports System.IO
Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Services.IDBService
Public Class IDBService
@@ -168,7 +169,7 @@ Public Class IDBService
End Try
End Function
- Public Function UpdateFile(DocObject As Modules.EDMIAPI.IDBServiceReference.DocumentObject, Contents() As Byte) As DocumentResult Implements IIDBService.UpdateFile
+ Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IIDBService.UpdateFile
Try
TestFileExists(DocObject.ContainerId)
diff --git a/SERVICES/DDEDM_NetworkService/IDBService.vbproj b/SERVICES/DDEDM_NetworkService/IDBService.vbproj
index dacb4825..24016a7d 100644
--- a/SERVICES/DDEDM_NetworkService/IDBService.vbproj
+++ b/SERVICES/DDEDM_NetworkService/IDBService.vbproj
@@ -52,7 +52,7 @@
- ..\..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/SERVICES/DDEDM_NetworkService/packages.config b/SERVICES/DDEDM_NetworkService/packages.config
index 7a05eafe..da1b48cf 100644
--- a/SERVICES/DDEDM_NetworkService/packages.config
+++ b/SERVICES/DDEDM_NetworkService/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Service.JobRunner/JobRunner.vbproj b/Service.JobRunner/JobRunner.vbproj
index 4b0ddea7..0d372e2c 100644
--- a/Service.JobRunner/JobRunner.vbproj
+++ b/Service.JobRunner/JobRunner.vbproj
@@ -52,7 +52,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
..\packages\Quartz.3.0.7\lib\net452\Quartz.dll
diff --git a/Service.JobRunner/packages.config b/Service.JobRunner/packages.config
index c2fb6688..985d84fe 100644
--- a/Service.JobRunner/packages.config
+++ b/Service.JobRunner/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Windows/Windows.vbproj b/Windows/Windows.vbproj
index 1a1dd32a..6245ade5 100644
--- a/Windows/Windows.vbproj
+++ b/Windows/Windows.vbproj
@@ -45,7 +45,7 @@
- ..\packages\NLog.4.6.7\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.8\lib\net45\NLog.dll
diff --git a/Windows/packages.config b/Windows/packages.config
index 99e34262..c1fd79a0 100644
--- a/Windows/packages.config
+++ b/Windows/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file