MS Mailhandling und Update Service

.gitignore

@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.vs
 
 # Build results
 

app/ClassWMResulthandler/DD_WMResulthandler.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DD_WMResulthandler</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>
@@ -43,12 +44,15 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Independentsoft.Email">
+    <Reference Include="DigitalData.Modules.Messaging">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Email .NET\Bin\Independentsoft.Email.dll</HintPath>
+      <HintPath>..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="Interop.WINDREAMLib">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
@@ -70,8 +74,8 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
@@ -104,7 +108,6 @@
     <Compile Include="clsCURRENT.vb" />
     <Compile Include="clsDatabase.vb" />
     <Compile Include="clsDateiverarbeitung.vb" />
-    <Compile Include="clsEmail.vb" />
     <Compile Include="clsEncryption.vb" />
     <Compile Include="clsFileWork.vb" />
     <Compile Include="clsJob_Work.vb" />
@@ -116,6 +119,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>

app/ClassWMResulthandler/ModCurrent.vb

@@ -3,5 +3,6 @@
     Public CURRENToWMConnect As Object
     Public CURRENToWMSession As Object
     Public CURRENT_WMDriveLetter As String = "W"
+    Public CURRENT_TempFiles As List(Of String)
 
 End Module

app/ClassWMResulthandler/My Project/AssemblyInfo.vb

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

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

app/ClassWMResulthandler/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

app/ClassWMResulthandler/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="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

app/ClassWMResulthandler/clsDateiverarbeitung.vb

@@ -4,6 +4,7 @@ Imports System.Text
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
 Imports Newtonsoft.Json
+Imports Newtonsoft.Json.Linq
 Imports WINDREAMLib
 
 Public Class clsDateiverarbeitung
@@ -211,7 +212,7 @@ Public Class clsDateiverarbeitung
         Try
             Const WMObjectEditModeLifeCycleEdit = "&H00000080"
             Const WMLifeCycleTypeArchivePeriod = 2
-
+            Logger.Debug($"ArchiveDate for WMFile shall be changed: pFromDate [{pFromDate}] pDateOperator [{pDateOperator}]...")
             pWMObject.LockFor(WMObjectEditModeLifeCycleEdit)
             Dim oLC = pWMObject.aWMLifeCycle()
 
@@ -236,6 +237,7 @@ Public Class clsDateiverarbeitung
                     Return False
             End Select
             Dim archBis = DateAdd(oDateIntervall, pIntervall, oDateFrom)
+            Logger.Debug($"...archBis is [{archBis.ToShortDateString}]!")
             'Dim pArchiveDate As String = archBis.ToString("yyyy-MM-dd")
             oLC.SetPeriodEndDate(WMLifeCycleTypeArchivePeriod, archBis)
 
@@ -699,6 +701,18 @@ Public Class clsDateiverarbeitung
                             wdIndexwert = wdIndexwert.ToString.TrimEnd
                             wdIndexwert = wdIndexwert.ToString.TrimStart
                             Logger.Debug("indexvalue read is: '" & wdIndexwert & "'")
+                            Try
+                                Dim oConvertDT As DateTime
+                                If DateTime.TryParse(wdIndexwert.ToString, oConvertDT) Then
+                                    Logger.Debug("indexvalue is datetime - converting to date")
+                                    Dim myDate As Date = wdIndexwert
+                                    wdIndexwert = Format(myDate, "yyyy-MM-dd")
+                                End If
+                            Catch ex As Exception
+                                Logger.Warn("clsDateiverarbeitung: Error checking datetime: " & ex.Message)
+                            End Try
+
+
                             _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString)
                             Logger.Debug("REGEX_String  (" & i & ") " & _STRING)
                             i += 1

app/ClassWMResulthandler/clsEmail.vb

@@ -1,84 +0,0 @@
-
-Imports System
-Imports Independentsoft.Email
-Imports Independentsoft.Email.Smtp
-Imports Independentsoft.Email.Mime
-Imports DigitalData.Modules.Logging
-Imports System.Net.Mail
-Imports System.Net
-Imports System.Net.Mime
-
-Public Class clsEmail
-    Dim Logger As DigitalData.Modules.Logging.Logger
-    Private Shared MailAktiv As Boolean = False
-    Sub New(MyLogger As LogConfig)
-        Logger = MyLogger.GetLogger()
-    End Sub
-    Public Function Email_Send(ByVal pMailSubject As String, ByVal pMailBody As String, pMailto As String,
-                                                      pMailfrom As String, pMailSmtp As String, pMailport As Integer, pMailUser As String, pMailPW As String,
-                                                      pAUTH_TYPE As String, Optional pAttment As String = "", Optional pTest As Boolean = False)
-        Try
-            Dim oError As Boolean = False
-            Dim oReceipiants As String()
-            If pMailto.Contains(";") Then
-                oReceipiants = pMailto.Split(";")
-            Else
-                ReDim Preserve oReceipiants(0)
-                oReceipiants(0) = pMailto
-            End If
-            For Each oMailReceipiant As String In oReceipiants
-                Dim sClient = New Net.Mail.SmtpClient(pMailSmtp)
-                Dim mymesssage As New MailMessage
-                sClient.Port = pMailport
-                If pAUTH_TYPE = "SSL" Then
-                    sClient.EnableSsl = True
-                Else
-                    sClient.EnableSsl = False
-                End If
-
-                sClient.Credentials = New NetworkCredential(pMailUser, pMailPW)
-                sClient.UseDefaultCredentials = False
-                If pTest = True Then
-                    mymesssage.Body = $"This is the body (text will be replaced within profile)! <br> mailsmtp: {pMailSmtp} <br> mailport: {pMailport} <br> mailUser: {pMailUser} <br> mailPW: XXXX <br> AUTH_TYPE: {pAUTH_TYPE}"
-                Else
-                    mymesssage.Body = pMailBody
-                End If
-
-                'mymesssage.IsBodyHtml = True
-                Dim htmlView As AlternateView = AlternateView.CreateAlternateViewFromString(mymesssage.Body)
-                htmlView.ContentType = New System.Net.Mime.ContentType("text/html")
-                mymesssage.AlternateViews.Add(htmlView)
-                pAttment = pAttment.Replace("W:\", "\\windream\objects\")
-                If pAttment <> String.Empty Then
-                    If System.IO.File.Exists(pAttment) Then
-                        Logger.Debug($"working on attachment {pAttment.ToString}...")
-                        Dim oAttachment As New System.Net.Mail.Attachment(pAttment)
-                        mymesssage.Attachments.Add(oAttachment)
-                    Else
-                        Logger.Warn($"Attachment {pAttment.ToString} is not existing - Mail won't be send!")
-                        oError = True
-
-                    End If
-                End If
-
-
-                mymesssage.From = New MailAddress(pMailfrom)
-                mymesssage.Subject = pMailSubject
-                mymesssage.To.Add(New MailAddress(oMailReceipiant))
-                sClient.Send(mymesssage)
-                Logger.Info($"Email successfully send to: [{oMailReceipiant}]!")
-                Logger.Debug($"Email successfully send to: [{oMailReceipiant}]!")
-            Next
-            If oError = False Then
-                Return True
-            Else
-                Return False
-            End If
-
-        Catch ex As Exception
-            Logger.Error(ex)
-            Return False
-        End Try
-
-    End Function
-End Class

app/ClassWMResulthandler/clsJob_Work.vb

@@ -1,9 +1,12 @@
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Messaging
+Imports DigitalData.Modules.Messaging.Mail
+
 Public Class clsJob_Work
     Dim Logger As Logger
     Private MyLogger As LogConfig
-    Private _mail As clsEmail
+    Private _mail As MailSender
-    Public Sub New(MyLoggerConf As LogConfig, _email As clsEmail)
+    Public Sub New(MyLoggerConf As LogConfig, _email As MailSender)
         Logger = MyLoggerConf.GetLogger()
         MyLogger = MyLoggerConf
         _mail = _email
@@ -44,12 +47,27 @@ Public Class clsJob_Work
                 Logger.Warn("PWPlain is Nothing - Could not decrypt passwort 44")
                 Return False
             End If
-            If _mail.Email_Send(Email_subject, Email_Body, Email_receipiants, oMAILFROM, oMAILSMTP, oMAIL_PORT, oMAIL_USER, oMAIL_USER_PW, oMAIL_AUTH_TYPE, Attachment_Filename) = True Then
+            Dim oSendto As New List(Of String)
+            Dim oSplit = Email_receipiants.Split(";")
+            For Each oMailAdress In oSplit
+                oSendto.Add(oMailAdress)
+            Next
+
+            Dim oAttMt As New List(Of String)
+            If Attachment_Filename <> String.Empty Then
+                oAttMt.Add(Attachment_Filename)
+            End If
+            Dim oSession = _mail.Connect(oMAILSMTP, oMAIL_PORT, oMAIL_USER, oPWPlain, oMAIL_AUTH_TYPE)
+            If oSession.Connected = True Then
+                Logger.Info($"MAIL: Connection to {oMAILSMTP} successfull!")
+                If _mail.SendMail(oSendto, oMAILFROM, Email_subject, Email_Body, Now, oAttMt, 0) = True Then
                     Return True
+
                 Else
-                Logger.Warn("Email_Send_Independentsoft was not successfull!")
+                    Logger.Warn("ConnectToServer was not successfull!")
                     Return False
                 End If
+            End If
         Catch ex As Exception
             Logger.Error(ex)
             Return False

app/ClassWMResulthandler/clsProfil.vb

@@ -3,10 +3,14 @@ Imports System.IO
 Imports System.Text
 Imports Newtonsoft.Json
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Messaging
+Imports DigitalData.Modules.Messaging.Mail
+Imports DigitalData.Modules.Messaging.Mail.MailSession
 
 Public Class clsProfil
     Inherits clsCURRENT
     Dim Logger As Logger
+    Dim MyLogConfig As LogConfig
 #Region "***** Variablen *****"
     Private Shared CriticalError As Boolean = False
     Private windream As clsWindream_allgemein
@@ -14,30 +18,31 @@ Public Class clsProfil
     Private _database As clsDatabase
     Private _dateiverarbeitung As clsDateiverarbeitung
     Private _JobWork As clsJob_Work
-    Private _email As clsEmail
+    Private _email As MailSender
     Private Shared WD_aktivesDokument As WMObject
 #End Region
-    Sub New(MyLogger As LogConfig, PROFIL_ID As Integer)
+    Sub New(pLogConfig As LogConfig, PROFIL_ID As Integer)
-        Logger = MyLogger.GetLogger()
+        Logger = pLogConfig.GetLogger()
-        windream = New clsWindream_allgemein(MyLogger)
+        MyLogConfig = pLogConfig
-        windream_index = New clsWindream_Index(MyLogger)
+        windream = New clsWindream_allgemein(pLogConfig)
-        _database = New clsDatabase(MyLogger)
+        windream_index = New clsWindream_Index(pLogConfig)
-        _dateiverarbeitung = New clsDateiverarbeitung(MyLogger)
+        _database = New clsDatabase(pLogConfig)
-        _email = New clsEmail(MyLogger)
+        _dateiverarbeitung = New clsDateiverarbeitung(pLogConfig)
-        _JobWork = New clsJob_Work(MyLogger, _email)
+        _email = New MailSender(pLogConfig)
+        _JobWork = New clsJob_Work(pLogConfig, _email)
 
     End Sub
-    Public Function Init(PROFIL_ID As Integer)
+    Public Function Init(PROFIL_ID As Integer, pManual As Boolean)
         Try
             Logger.Debug("Start Initialisierung Profil für GUID: " & PROFIL_ID.ToString)
             Dim DT As DataTable = _database.Return_Datatable("Select * from TBWMRH_PROFIL where GUID = " & PROFIL_ID)
-            If DT.Rows.Count > 0 Then
+            If DT.Rows.Count = 1 Then
                 For Each DR As DataRow In DT.Rows
                     _profGUID = PROFIL_ID
                     _Profilname = CStr(DR.Item("Profilname"))
                     Logger.Debug("Check Profilname '" & _Profilname & "', GUID: " & _profGUID & " geladen")
                     ' Überprüfen ob Profil aktiv oder inaktiv
-                    If CBool(DR.Item("Aktiv")) = False Then
+                    If CBool(DR.Item("Aktiv")) = False And pManual = False Then
                         Logger.Info("## Profil '" & _Profilname & "' ist inaktiv geschaltet")
                         Return False
                     Else
@@ -62,23 +67,24 @@ Public Class clsProfil
 
     End Function
     'Durchlauf des Profils wird aus dem Service gestartet wenn Init = True war
-    Public Function Profil_Durchlauf(manually As Boolean) As Boolean
+    Public Function Profil_Durchlauf(pManRun As Boolean) As Boolean
         Dim _error As Boolean = False
         Try
-            Dim Run_Profile As Boolean = False
+            Dim oRunProfile As Boolean = False
+            If pManRun = False Then
                 'Soll die Verarbeitung heute durchgeführt werden??
                 Dim Dayofweek As Integer = My.Computer.Clock.LocalTime.DayOfWeek
                 Dim SUBS As Integer = 0
-            Dim RUNTODAY As Integer = 0
                 If Dayofweek = 0 Then
                     SUBS = 6
                 Else
 
                 End If
-            RUNTODAY = _profDay.Substring(Dayofweek - 1, 1)
-
-
                 If _profDay.Substring(Dayofweek - 1, 1) = 1 Then
+                    oRunProfile = True
+                Else
+                    Logger.Info("Verarbeitung für JETZT NICHT konfiguriert")
+                End If
                 'Verarbeitung soll heute durchgeführt werden
                 Logger.Debug("Verarbeitung soll heute durchgeführt werden!")
                 Logger.Debug("_RunType: " & _profRunType)
@@ -94,11 +100,11 @@ Public Class clsProfil
                         Logger.Debug("_RunTime.ToShortTimeString: " & _RunTime.ToShortTimeString & " # " & "Now.ToShortTimeString: " & Now.ToShortTimeString)
                         If Time_next.ToString.StartsWith("11.11.1911") Then
                             Logger.Info("Manueller Durchlauf des Profils - 11.11.1911")
-                            Run_Profile = True
+                            oRunProfile = True
                         Else
                             'Ist die Uhrzeit in der Range
                             If _RunTime.ToShortTimeString = Now.ToShortTimeString Then
-                                Run_Profile = True
+                                oRunProfile = True
                             Else
                                 Logger.Debug("No run as " & _RunTime.ToShortTimeString & "<>" & Now.ToShortTimeString)
                             End If
@@ -113,18 +119,20 @@ Public Class clsProfil
 
                         If DiffMin >= CInt(arr(1)) Then
                             'Den Durchlauf erlauben
-                            Run_Profile = True
+                            oRunProfile = True
                         Else
                             Logger.Debug("No run as DiffMin (" & DiffMin & ") <= Intervall(" & arr(1) & ")")
                         End If
                     Case Else
                         Logger.Warn("_profRunType konnte nicht ausgewertet werden - " & arr(0))
                 End Select
-                If Run_Profile = False And manually = True Then
+            Else
-                    Logger.Info("This is a manual run of profile!")
+                Logger.Info("### This is a manual run of profile! ###")
-                    Run_Profile = True
+                oRunProfile = True
             End If
-                If Run_Profile = True Then
+
+
+            If oRunProfile = True Then
                 Logger.Debug($"'{_Profilname}' - Run_Profile = True")
                 clsCURRENT.DT_TBDD_EMAIL = _database.Return_Datatable("SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1")
                 clsCURRENT.PROFILE_HandledFiles = Nothing
@@ -167,6 +175,16 @@ Public Class clsProfil
                                 oGesamtFiles = windreamSucheErgebnisse.Count
                                 Dim oCountDocs As Integer = 0
                                 Dim oEmailAttachment_path As String
+
+
+                                Dim MAILFROM As String = ""
+                                Dim MAILSMTP As String = ""
+                                Dim MAIL_USER As String = ""
+                                Dim MAIL_USER_PW As String = ""
+                                Dim MAIL_AUTH_TYPE As String = "SSL"
+                                Dim MAIL_PORT As String = "25"
+                                Dim MAILSession As SessionInfo
+
                                 For Each WMdok As WMObject In windreamSucheErgebnisse
 
                                     oEmailAttachment_path = String.Empty
@@ -212,14 +230,8 @@ Public Class clsProfil
                                                         Return False
                                                     End If
 
-
+                                                    If oCountDocs = 1 Then
-                                                        Dim MAILFROM As String = ""
+                                                        Logger.Debug("##### EMAIL BASICS CONSTRUCT (oCountDocs = 1) ######")
-                                                        Dim MAILSMTP As String = ""
-                                                        Dim MAIL_USER As String = ""
-                                                        Dim MAIL_USER_PW As String = ""
-                                                        Dim MAIL_AUTH_TYPE As String = "SSL"
-                                                        Dim MAIL_PORT As String = "25"
-
                                                         For Each emailrow As DataRow In clsCURRENT.DT_TBDD_EMAIL.Rows
                                                             If emailrow.Item("GUID") = CInt(EMAIL_PROFIL) Then
                                                                 MAILFROM = emailrow.Item("EMAIL_FROM")
@@ -249,21 +261,61 @@ Public Class clsProfil
                                                             Email_Empfänger = _dateiverarbeitung.REGEX_REPLACE(WMdok, Email_Empfänger)
                                                             Logger.Debug("Email_Empfänger: " & Email_Empfänger)
                                                         End If
+                                                    End If
+
 
                                                     oEmail_Betreff = _dateiverarbeitung.REGEX_REPLACE(WMdok, oEmail_Betreff)
                                                     Email_Body = _dateiverarbeitung.REGEX_REPLACE(WMdok, Email_Body)
                                                     oEmail_Betreff = $"{oEmail_Betreff} [eMail {oCountDocs} von {oGesamtFiles}]"
                                                     If oAttachment_FullFilename <> String.Empty Then
-                                                            Logger.Warn($"Email Attachment {oAttachment_FullFilename}")
+                                                        Logger.Info($"Email Attachment {oAttachment_FullFilename}")
                                                     End If
-                                                        If _email.Email_Send(oEmail_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE, oAttachment_FullFilename) = True Then
+                                                    Dim oSendto As New List(Of String)
+                                                    Dim oSplit = Email_Empfänger.split(";")
+                                                    For Each oMailAdress In oSplit
+                                                        oSendto.Add(oMailAdress)
+                                                    Next
 
-                                                            FileJobSuccessful = True
+                                                    Dim oAttMt As New List(Of String)
+                                                    If oAttachment_FullFilename <> String.Empty Then
+                                                        oAttMt.Add(oAttachment_FullFilename)
+                                                        clsCURRENT.TEMP_FILES.Add(oAttachment_FullFilename)
+                                                    End If
+
+                                                    Dim oReInit As Boolean = False
+                                                    If oCountDocs = 1 Or IsNothing(MAILSession) Then
+                                                        Logger.Debug("Init MAILSession...")
+                                                        oReInit = True
+                                                    ElseIf IsNothing(_email) Or _email.Connected2Server = False Or MAILSession.Connected = False Then
+                                                        Logger.Info("Re-Init MAILSession...")
+                                                        oReInit = True
+                                                    End If
+                                                    If oReInit = True Then
+                                                        _email = New MailSender(MyLogConfig)
+                                                        MAILSession = _email.Connect(MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE)
+                                                        If MAILSession.Connected = True Then
+                                                            Logger.Info($"MAIL: Connection to {MAILSMTP} successfull!")
                                                         Else
-
+                                                            Logger.Warn($"{oFileRunNo} - _email.Connect was not successfull!")
-                                                            Logger.Warn($"{oFileRunNo} Email_Send_Independentsoft 1 was not successfull!")
                                                             FileJobSuccessful = False
                                                         End If
+                                                    End If
+
+                                                    If Not IsNothing(_email) And _email.SendMail(oSendto, MAILFROM, oEmail_Betreff, Email_Body, Now, oAttMt, 0) = True Then
+                                                        FileJobSuccessful = True
+                                                    Else
+                                                        FileJobSuccessful = False
+                                                        Logger.Info("Setting MAILSession.Connected to [false]")
+                                                        MAILSession.Connected = False
+                                                        If IsNothing(_email) Then
+                                                            Logger.Info($"_email is nothing")
+                                                        Else
+                                                            Logger.Info($"{oFileRunNo} - Email_SendMail was not successfull!")
+
+                                                        End If
+
+                                                    End If
+
                                                 Else
                                                     Logger.Warn($"{oFileRunNo} DT_TBDD_EMAIL is nothing or contains no rows")
                                                     Return False
@@ -312,6 +364,8 @@ Public Class clsProfil
 
                                         End Select
                                     Next
+
+
                                     '##################################
                                     'JETZT DER DURCHLAUF DER DATEI-JOBS
                                     '##################################
@@ -319,7 +373,7 @@ Public Class clsProfil
                                         'Für jeden File-Job
                                         For Each DR_PR_FILE_JOB As DataRow In DT_PROFIL_FILE_JOB.Rows
                                             If FileJobSuccessful = False Then
-                                                    Logger.Info($"{oFileRunNo} AUSSTIEG FOR SCHLEIFE cause FileJobSuccessful = False...")
+                                                Logger.Info($"{oFileRunNo} FileJobSuccessful = False...Exit For")
                                                 Exit For
                                             End If
 
@@ -446,8 +500,19 @@ Public Class clsProfil
                                     Else
                                         Logger.Warn("KEINE File-JOBS für Profil '" & _Profilname & "' angelegt!")
                                     End If
-                                    Next
 
+                                Next
+                                Try
+                                    If Not IsNothing(_email) Then
+                                        If _email.Connected2Server = True Then
+                                            Logger.Warn("KEINE File-JOBS für Profil '" & _Profilname & "' angelegt!")
+                                            _email.Disconnect()
+                                        End If
+
+                                    End If
+                                Catch ex As Exception
+
+                                End Try
                                 'Jetzt nochmal ein Durchlauf für Profiljobs wo alle Dateien abgearbeitet wurden.
                                 For Each DR_PR_JB As DataRow In DT_PROFIL_JOB.Rows
                                     Logger.Info("New run for " & DR_PR_JB.Item("JOB_TYP").ToString.ToUpper)
@@ -561,12 +626,12 @@ Public Class clsProfil
                                                 Dim EMAIL_PROFIL = DR_PR_JB.Item("STRING4")
                                                 Logger.Debug("EMAIL_PROFIL: " & EMAIL_PROFIL)
                                                 If Not IsNothing(clsCURRENT.DT_TBDD_EMAIL) And clsCURRENT.DT_TBDD_EMAIL.Rows.Count >= 1 Then
-                                                        Dim MAILFROM As String = ""
+                                                    MAILFROM = ""
-                                                        Dim MAILSMTP As String = ""
+                                                    MAILSMTP = ""
-                                                        Dim MAIL_USER As String = ""
+                                                    MAIL_USER = ""
-                                                        Dim MAIL_USER_PW As String = ""
+                                                    MAIL_USER_PW = ""
-                                                        Dim MAIL_AUTH_TYPE As String = "SSL"
+                                                    MAIL_AUTH_TYPE = "SSL"
-                                                        Dim MAIL_PORT As Integer
+                                                    MAIL_PORT = 0
 
                                                     For Each emailrow As DataRow In clsCURRENT.DT_TBDD_EMAIL.Rows
                                                         If emailrow.Item("GUID") = CInt(EMAIL_PROFIL) Then
@@ -594,14 +659,41 @@ Public Class clsProfil
 
                                                         Return False
                                                     End If
+                                                    Dim oSendto As New List(Of String)
+                                                    Dim oSplit = Email_Empfänger.split(";")
+                                                    For Each oMailAdress In oSplit
+                                                        oSendto.Add(oMailAdress)
+                                                    Next
 
-                                                        If _email.Email_Send(Email_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE, clsCURRENT.CONCATTED_FILE) = True Then
+                                                    Dim oAttMt As New List(Of String)
-                                                            FileJobSuccessful = True
+                                                    If clsCURRENT.CONCATTED_FILE <> String.Empty Then
+                                                        oAttMt.Add(clsCURRENT.CONCATTED_FILE)
+                                                        clsCURRENT.TEMP_FILES.Add(clsCURRENT.CONCATTED_FILE)
+                                                    End If
+                                                    If Not IsNothing(_email) And _email.Connected2Server = False And MAILSession.Connected = True Then
+                                                        Logger.Debug("Re/init MAILSession(2)...")
+                                                        MAILSession = _email.Connect(MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE)
+                                                        If MAILSession.Connected = True Then
+                                                            Logger.Info($"MAIL: Connection to {MAILSMTP} successfull!")
                                                         Else
-                                                            Logger.Warn("Email_Send_Independentsoft 2 was not successfull!")
+                                                            Logger.Warn($"{oFileRunNo} Email_ConnectToServer was not successfull!")
                                                             FileJobSuccessful = False
                                                         End If
 
+                                                    End If
+
+                                                    If MAILSession.Connected = True Then
+                                                        If _email.SendMail(oSendto, MAILFROM, Email_Betreff, Email_Body, Now, oAttMt, 0) = True Then
+                                                            FileJobSuccessful = True
+                                                        Else
+                                                            Logger.Warn("Email_SendMail(2) was not successfull!")
+                                                            FileJobSuccessful = False
+                                                        End If
+                                                        _email.Disconnect()
+                                                    Else
+                                                        Logger.Warn($"Email_ConnectToServer(2) was not successfull!")
+                                                        FileJobSuccessful = False
+                                                    End If
 
                                                 Else
                                                     Logger.Warn("DT_TBDD_EMAIL is nothing or contains no rows")
@@ -619,10 +711,12 @@ Public Class clsProfil
                                                 Try
                                                     Dim myproc As Process = New Process()
                                                     myproc.StartInfo.FileName = """" & oFileString & """"
-                                                        myproc.StartInfo.Verb = "printto"
+                                                    myproc.StartInfo.Verb = "printto" '"printto"
                                                     myproc.StartInfo.Arguments = oPrintername
                                                     myproc.StartInfo.UseShellExecute = True
+                                                    Logger.Debug($"Send2Printer [{ myproc.StartInfo.FileName} # Verb:{myproc.StartInfo.Verb} # Arguments: {myproc.StartInfo.Arguments}] ")
                                                     myproc.Start()
+                                                    System.Threading.Thread.Sleep(500)
                                                     Dim p As Process
                                                     p = Process.GetProcessById(myproc.Id)
                                                     Dim sw As Stopwatch = New Stopwatch()
@@ -636,15 +730,24 @@ Public Class clsProfil
                                                         End If
                                                     Loop
                                                     Logger.Debug("...process has exited: ")
-                                                        Logger.Info($"Send2Printer [{ myproc.StartInfo.FileName} # Verb:{myproc.StartInfo.Verb} # Arguments: {myproc.StartInfo.Arguments}]successfull! ")
                                                     FileJobSuccessful = True
                                                     sw.Stop()
-                                                        ' myproc.Kill()
+                                                    Logger.Info($"Send2Printer successfully [{ myproc.StartInfo.FileName} # Verb:{myproc.StartInfo.Verb} # Arguments: {myproc.StartInfo.Arguments}] ")
+
                                                     File.Delete(oFileString)
                                                     Logger.Debug($"Deleted oFileString [{oFileString}]!")
                                                 Catch ex As Exception
-                                                        Logger.Warn("Could not print (printto) file: " & oFileString)
+                                                    Dim omsg = "ERROR: Could not print (printto) file: " & oFileString
-                                                        Logger.Error(ex)
+                                                    omsg &= vbNewLine & ex.Message
+                                                    Logger.Info(omsg)
+                                                    Logger.Error(ex, omsg)
+                                                    FileJobSuccessful = False
+                                                    Try
+                                                        File.Delete(oFileString)
+                                                    Catch ex1 As Exception
+
+                                                    End Try
+
                                                 End Try
                                             Next
                                         Case "Send InfoMail with WM-Search".ToUpper
@@ -698,9 +801,7 @@ Public Class clsProfil
                 End If
 
             End If
-            Else
+
-                Logger.Info("Verarbeitung für JETZT NICHT konfiguriert")
-            End If
             'Abschluss des Profiles
             _database.Execute_non_Query("UPDATE TBWMRH_PROFIL SET Running = 0 WHERE GUID = " & _profGUID)
             Return True

app/ClassWMResulthandler/packages.config

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

app/DDWDResultHandler/App.config

@@ -9,7 +9,7 @@
   </configSections>
   <connectionStrings />
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   <applicationSettings>
     <DDWDResultHandler.My.MySettings>
@@ -41,6 +41,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

app/DDWDResultHandler/DDWDResultHandler.vb

@@ -167,10 +167,21 @@ Public Class DDWDResultHandler
                             _PROFIL_ID = CInt(DR.Item("GUID"))
                             _profil = New clsProfil(MyLogger, _PROFIL_ID)
                             'Und nun das Profil durchlaufen
-                            Dim initresult = _profil.Init(_PROFIL_ID)
+                            Dim initresult = _profil.Init(_PROFIL_ID, False)
                             If initresult = True Then
                                 '##### Profildurchlauf ########
                                 _profil.Profil_Durchlauf(False)
+                                For Each oFile As String In clsCURRENT.TEMP_FILES
+                                    If File.Exists(oFile) Then
+                                        Try
+                                            File.Delete(oFile)
+                                        Catch ex As Exception
+
+                                        End Try
+
+                                    End If
+                                Next
+
                             ElseIf initresult = False Then
                                 Logger.Warn("clsProfil konnte nicht initialisiert werden")
                                 notcompleted = True

app/DDWDResultHandler/My Project/AssemblyInfo.vb

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

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

app/DDWDResultHandler/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.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

app/DDWDResultHandler/MyDataset.Designer.vb

@@ -30,7 +30,7 @@ Partial Public Class MyDataset
     Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Public Sub New()
         MyBase.New
         Me.BeginInit
@@ -42,7 +42,7 @@ Partial Public Class MyDataset
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext)
         MyBase.New(info, context, false)
         If (Me.IsBinarySerialized(info, context) = true) Then
@@ -77,7 +77,7 @@ Partial Public Class MyDataset
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
      Global.System.ComponentModel.Browsable(false),  _
      Global.System.ComponentModel.DesignerSerializationVisibility(Global.System.ComponentModel.DesignerSerializationVisibility.Content)>  _
     Public ReadOnly Property TBVEKTOR_INDEX() As TBVEKTOR_INDEXDataTable
@@ -87,7 +87,7 @@ Partial Public Class MyDataset
     End Property
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
      Global.System.ComponentModel.BrowsableAttribute(true),  _
      Global.System.ComponentModel.DesignerSerializationVisibilityAttribute(Global.System.ComponentModel.DesignerSerializationVisibility.Visible)>  _
     Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode
@@ -100,7 +100,7 @@ Partial Public Class MyDataset
     End Property
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
      Global.System.ComponentModel.DesignerSerializationVisibilityAttribute(Global.System.ComponentModel.DesignerSerializationVisibility.Hidden)>  _
     Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection
         Get
@@ -109,7 +109,7 @@ Partial Public Class MyDataset
     End Property
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
      Global.System.ComponentModel.DesignerSerializationVisibilityAttribute(Global.System.ComponentModel.DesignerSerializationVisibility.Hidden)>  _
     Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection
         Get
@@ -118,7 +118,7 @@ Partial Public Class MyDataset
     End Property
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Protected Overrides Sub InitializeDerivedDataSet()
         Me.BeginInit
         Me.InitClass
@@ -126,7 +126,7 @@ Partial Public Class MyDataset
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Public Overrides Function Clone() As Global.System.Data.DataSet
         Dim cln As MyDataset = CType(MyBase.Clone,MyDataset)
         cln.InitVars
@@ -135,19 +135,19 @@ Partial Public Class MyDataset
     End Function
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Protected Overrides Function ShouldSerializeTables() As Boolean
         Return false
     End Function
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Protected Overrides Function ShouldSerializeRelations() As Boolean
         Return false
     End Function
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader)
         If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then
             Me.Reset
@@ -171,7 +171,7 @@ Partial Public Class MyDataset
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema
         Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream()
         Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing))
@@ -180,13 +180,13 @@ Partial Public Class MyDataset
     End Function
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Friend Overloads Sub InitVars()
         Me.InitVars(true)
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Friend Overloads Sub InitVars(ByVal initTable As Boolean)
         Me.tableTBVEKTOR_INDEX = CType(MyBase.Tables("TBVEKTOR_INDEX"),TBVEKTOR_INDEXDataTable)
         If (initTable = true) Then
@@ -197,7 +197,7 @@ Partial Public Class MyDataset
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Private Sub InitClass()
         Me.DataSetName = "MyDataset"
         Me.Prefix = ""
@@ -209,13 +209,13 @@ Partial Public Class MyDataset
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Private Function ShouldSerializeTBVEKTOR_INDEX() As Boolean
         Return false
     End Function
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs)
         If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then
             Me.InitVars
@@ -223,7 +223,7 @@ Partial Public Class MyDataset
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType
         Dim ds As MyDataset = New MyDataset()
         Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType()
@@ -272,7 +272,7 @@ Partial Public Class MyDataset
         Return type
     End Function
     
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Public Delegate Sub TBVEKTOR_INDEXRowChangeEventHandler(ByVal sender As Object, ByVal e As TBVEKTOR_INDEXRowChangeEvent)
     
     '''<summary>
@@ -288,7 +288,7 @@ Partial Public Class MyDataset
         Private columnValue As Global.System.Data.DataColumn
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Sub New()
             MyBase.New
             Me.TableName = "TBVEKTOR_INDEX"
@@ -298,7 +298,7 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Friend Sub New(ByVal table As Global.System.Data.DataTable)
             MyBase.New
             Me.TableName = table.TableName
@@ -316,14 +316,14 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext)
             MyBase.New(info, context)
             Me.InitVars
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public ReadOnly Property IndexnameColumn() As Global.System.Data.DataColumn
             Get
                 Return Me.columnIndexname
@@ -331,7 +331,7 @@ Partial Public Class MyDataset
         End Property
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public ReadOnly Property ValueColumn() As Global.System.Data.DataColumn
             Get
                 Return Me.columnValue
@@ -339,7 +339,7 @@ Partial Public Class MyDataset
         End Property
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"),  _
          Global.System.ComponentModel.Browsable(false)>  _
         Public ReadOnly Property Count() As Integer
             Get
@@ -348,33 +348,33 @@ Partial Public Class MyDataset
         End Property
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Default ReadOnly Property Item(ByVal index As Integer) As TBVEKTOR_INDEXRow
             Get
                 Return CType(Me.Rows(index),TBVEKTOR_INDEXRow)
             End Get
         End Property
         
-        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Event TBVEKTOR_INDEXRowChanging As TBVEKTOR_INDEXRowChangeEventHandler
         
-        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Event TBVEKTOR_INDEXRowChanged As TBVEKTOR_INDEXRowChangeEventHandler
         
-        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Event TBVEKTOR_INDEXRowDeleting As TBVEKTOR_INDEXRowChangeEventHandler
         
-        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Event TBVEKTOR_INDEXRowDeleted As TBVEKTOR_INDEXRowChangeEventHandler
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Overloads Sub AddTBVEKTOR_INDEXRow(ByVal row As TBVEKTOR_INDEXRow)
             Me.Rows.Add(row)
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Overloads Function AddTBVEKTOR_INDEXRow(ByVal Indexname As String, ByVal Value As String) As TBVEKTOR_INDEXRow
             Dim rowTBVEKTOR_INDEXRow As TBVEKTOR_INDEXRow = CType(Me.NewRow,TBVEKTOR_INDEXRow)
             Dim columnValuesArray() As Object = New Object() {Indexname, Value}
@@ -384,7 +384,7 @@ Partial Public Class MyDataset
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Overrides Function Clone() As Global.System.Data.DataTable
             Dim cln As TBVEKTOR_INDEXDataTable = CType(MyBase.Clone,TBVEKTOR_INDEXDataTable)
             cln.InitVars
@@ -392,20 +392,20 @@ Partial Public Class MyDataset
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Overrides Function CreateInstance() As Global.System.Data.DataTable
             Return New TBVEKTOR_INDEXDataTable()
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Friend Sub InitVars()
             Me.columnIndexname = MyBase.Columns("Indexname")
             Me.columnValue = MyBase.Columns("Value")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Private Sub InitClass()
             Me.columnIndexname = New Global.System.Data.DataColumn("Indexname", GetType(String), Nothing, Global.System.Data.MappingType.Element)
             MyBase.Columns.Add(Me.columnIndexname)
@@ -414,25 +414,25 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Function NewTBVEKTOR_INDEXRow() As TBVEKTOR_INDEXRow
             Return CType(Me.NewRow,TBVEKTOR_INDEXRow)
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow
             Return New TBVEKTOR_INDEXRow(builder)
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Overrides Function GetRowType() As Global.System.Type
             Return GetType(TBVEKTOR_INDEXRow)
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs)
             MyBase.OnRowChanged(e)
             If (Not (Me.TBVEKTOR_INDEXRowChangedEvent) Is Nothing) Then
@@ -441,7 +441,7 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs)
             MyBase.OnRowChanging(e)
             If (Not (Me.TBVEKTOR_INDEXRowChangingEvent) Is Nothing) Then
@@ -450,7 +450,7 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs)
             MyBase.OnRowDeleted(e)
             If (Not (Me.TBVEKTOR_INDEXRowDeletedEvent) Is Nothing) Then
@@ -459,7 +459,7 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs)
             MyBase.OnRowDeleting(e)
             If (Not (Me.TBVEKTOR_INDEXRowDeletingEvent) Is Nothing) Then
@@ -468,13 +468,13 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Sub RemoveTBVEKTOR_INDEXRow(ByVal row As TBVEKTOR_INDEXRow)
             Me.Rows.Remove(row)
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType
             Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType()
             Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence()
@@ -549,14 +549,14 @@ Partial Public Class MyDataset
         Private tableTBVEKTOR_INDEX As TBVEKTOR_INDEXDataTable
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder)
             MyBase.New(rb)
             Me.tableTBVEKTOR_INDEX = CType(Me.Table,TBVEKTOR_INDEXDataTable)
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Property Indexname() As String
             Get
                 Try 
@@ -571,7 +571,7 @@ Partial Public Class MyDataset
         End Property
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Property Value() As String
             Get
                 Try 
@@ -586,25 +586,25 @@ Partial Public Class MyDataset
         End Property
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Function IsIndexnameNull() As Boolean
             Return Me.IsNull(Me.tableTBVEKTOR_INDEX.IndexnameColumn)
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Sub SetIndexnameNull()
             Me(Me.tableTBVEKTOR_INDEX.IndexnameColumn) = Global.System.Convert.DBNull
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Function IsValueNull() As Boolean
             Return Me.IsNull(Me.tableTBVEKTOR_INDEX.ValueColumn)
         End Function
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Sub SetValueNull()
             Me(Me.tableTBVEKTOR_INDEX.ValueColumn) = Global.System.Convert.DBNull
         End Sub
@@ -613,7 +613,7 @@ Partial Public Class MyDataset
     '''<summary>
     '''Row event argument class
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
     Public Class TBVEKTOR_INDEXRowChangeEvent
         Inherits Global.System.EventArgs
         
@@ -622,7 +622,7 @@ Partial Public Class MyDataset
         Private eventAction As Global.System.Data.DataRowAction
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public Sub New(ByVal row As TBVEKTOR_INDEXRow, ByVal action As Global.System.Data.DataRowAction)
             MyBase.New
             Me.eventRow = row
@@ -630,7 +630,7 @@ Partial Public Class MyDataset
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public ReadOnly Property Row() As TBVEKTOR_INDEXRow
             Get
                 Return Me.eventRow
@@ -638,7 +638,7 @@ Partial Public Class MyDataset
         End Property
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")>  _
         Public ReadOnly Property Action() As Global.System.Data.DataRowAction
             Get
                 Return Me.eventAction

app/DDWDResultHandler/ServiceDDWDResultHandler.vbproj

@@ -12,7 +12,7 @@
     <AssemblyName>DDWDResultHandler</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Console</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -52,8 +52,7 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Logging">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -70,8 +69,8 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -106,6 +105,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="DDWDResultHandler.vb">
       <SubType>Component</SubType>

app/DDWDResultHandler/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>

app/ResultHandler_Konfig/App.config

@@ -8,10 +8,11 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <connectionStrings>
-    <add name="ResultHandler_Konfig.My.MySettings.SQLSERVER_CS" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
+    <add name="ResultHandler_Konfig.My.MySettings.SQLSERVER_CS" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
+      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   <userSettings>
     <ResultHandler_Konfig.My.MySettings>
@@ -58,6 +59,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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

app/ResultHandler_Konfig/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -54,17 +54,6 @@ Namespace My
             End Get
         End Property
         
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
-            "rity Info=True;User ID=sa;Password=dd")>  _
-        Public ReadOnly Property SQLSERVER_CS() As String
-            Get
-                Return CType(Me("SQLSERVER_CS"),String)
-            End Get
-        End Property
-        
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("")>  _
@@ -100,6 +89,17 @@ Namespace My
                 Me("Debug_Active") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
+            "rity Info=True;User ID=sa;Password=dd")>  _
+        Public ReadOnly Property SQLSERVER_CS() As String
+            Get
+                Return CType(Me("SQLSERVER_CS"),String)
+            End Get
+        End Property
     End Class
 End Namespace
 

app/ResultHandler_Konfig/My Project/Settings.settings

@@ -2,14 +2,6 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
   <Profiles />
   <Settings>
-    <Setting Name="SQLSERVER_CS" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
-    </Setting>
     <Setting Name="BNSAPI_HOST" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
@@ -19,5 +11,13 @@
     <Setting Name="Debug_Active" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="SQLSERVER_CS" Type="(Connection string)" Scope="Application">
+      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
+  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
+  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

app/ResultHandler_Konfig/My Project/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj

@@ -12,7 +12,7 @@
     <AssemblyName>ResultHandler_Konfig</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -68,11 +68,15 @@
     <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DigitalData.Modules.Base, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Messaging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
@@ -98,12 +102,15 @@
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Mail">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -149,6 +156,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>

app/ResultHandler_Konfig/frmMain.vb

@@ -4,6 +4,7 @@ Imports DigitalData.Modules.Messaging
 Imports DD_WMResulthandler
 Imports System.Net.Mail
 Imports System.Net
+Imports DigitalData.Modules.Messaging.Mail
 
 Public Class frmMain
     Private _windream As clsWindream_allgemein
@@ -732,7 +733,7 @@ Public Class frmMain
                         For Each DR As DataRow In DT.Rows
                             clsCURRENT._PROFIL_ID = CInt(DR.Item("GUID"))
                             'Und nun das Profil durchlaufen
-                            Dim initresult = _profil.Init(clsCURRENT._PROFIL_ID)
+                            Dim initresult = _profil.Init(clsCURRENT._PROFIL_ID, True)
                             If initresult = True Then
                                 _profil.Profil_Durchlauf(True)
                             ElseIf initresult = False Then
@@ -910,19 +911,39 @@ Public Class frmMain
 
     End Sub
     Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click
-        Dim _ss2email As New Email(MyLogger)
+        '   Dim _ss2email As New Email(MyLogger)
+        Dim oSender As New MailSender(MyLogger)
 
         If txtTestmailTo.Text <> String.Empty Then
             My.Settings.Save()
             Dim wrapper As New clsEncryption("!35452didalog=")
 
             Dim PWPlain = wrapper.DecryptData(EMAIL_PWTextBox.Text)
-            If _ss2email.NewEmail(txtTestmailTo.Text, "Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text,
+            Dim oSession = oSender.Connect(EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text)
-                                  PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "GUI WMRH - Test") = True Then
+            If oSession.Connected = True Then
-                MsgBox("Email(s) has/have been sent successfully.", MsgBoxStyle.Information)
+                Dim oSendto As New List(Of String)
+                oSendto.Add(txtTestmailTo.Text)
+                Dim oAttMt As New List(Of String)
+                If txtAttachment.Text <> String.Empty Then
+                    oAttMt.Add(txtAttachment.Text)
+                End If
+                If oSender.SendMail(oSendto, EMAIL_FROMTextBox.Text, "Testmail from GUI WMResultHandler", "TEST", Now, oAttMt, 1) = True Then
+                    MsgBox("Email has been sent successfully.", MsgBoxStyle.Information)
                 Else
                     MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
                 End If
+                oSender.Disconnect()
+            Else
+                MsgBox("Could not connect to server. Please check the log.", MsgBoxStyle.Exclamation)
+
+            End If
+            ' Dim oSMTP As SmtpClient = llmail.New_SMTPConnection(Nothing, EMAIL_SMTPTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, PORTTextBox.Text)
+            'If _ss2email.NewEmail(txtTestmailTo.Text, "Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text,
+            '                      PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "GUI WMRH - Test") = True Then
+            '        MsgBox("Email(s) has/have been sent successfully.", MsgBoxStyle.Information)
+            '    Else
+            '        MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
+            '    End If
         End If
 
     End Sub

app/ResultHandler_Konfig/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
-  <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
   <package id="System.Data.SQLite" version="1.0.94.1" targetFramework="net461" />
 </packages>