diff --git a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj index 1db86a9..63529ea 100644 --- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj +++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj @@ -53,22 +53,22 @@ ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll - ..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - ..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + ..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll - ..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll @@ -76,70 +76,76 @@ ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Markdown.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.RTF.dll + + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.SVG.dll - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.wia.gateway.dll True + + ..\packages\Google.Protobuf.3.33.2\lib\net45\Google.Protobuf.dll + M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll False @@ -159,10 +165,25 @@ M:\Bibliotheken\3rdParty\Limilabs\Mail.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.5\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Microsoft.Bcl.Cryptography.10.0.5\lib\net462\Microsoft.Bcl.Cryptography.dll + + + ..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll + + ..\packages\GdPicture.14.4.4\lib\net462\NativeSDK.Exceptions.dll + + + ..\packages\GdPicture.14.4.4\lib\net462\NativeSDK.Settings.dll + + + ..\packages\GdPicture.14.4.4\lib\net462\NativeSDK.Settings.Edition.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -172,8 +193,8 @@ ..\packages\NLog.5.0.5\lib\net46\NLog.dll - - ..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll + + ..\packages\OpenMcdf.3.1.4\lib\netstandard2.0\OpenMcdf.dll ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll @@ -185,53 +206,62 @@ ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll - - ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll ..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll - - ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.10.0.5\lib\net462\System.Collections.Immutable.dll + + ..\packages\System.Formats.Asn1.10.0.5\lib\net462\System.Formats.Asn1.dll + - - ..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.10.0.5\lib\net462\System.IO.Packaging.dll + + + ..\packages\System.IO.Pipelines.10.0.5\lib\net462\System.IO.Pipelines.dll - - ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll + + ..\packages\System.Security.Cryptography.Pkcs.10.0.5\lib\net462\System.Security.Cryptography.Pkcs.dll - - ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.10.0.5\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.10.0.5\lib\net462\System.Text.Json.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Channels.10.0.5\lib\net462\System.Threading.Channels.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + ..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll @@ -304,11 +334,11 @@ - + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + \ No newline at end of file diff --git a/App/EmailProfiler.Common/app.config b/App/EmailProfiler.Common/app.config index 1f57f79..4577b73 100644 --- a/App/EmailProfiler.Common/app.config +++ b/App/EmailProfiler.Common/app.config @@ -34,19 +34,19 @@ - + - + - + - + @@ -54,15 +54,27 @@ - + - + - + + + + + + + + + + + + + diff --git a/App/EmailProfiler.Common/packages.config b/App/EmailProfiler.Common/packages.config index 3f3790f..8e6cc64 100644 --- a/App/EmailProfiler.Common/packages.config +++ b/App/EmailProfiler.Common/packages.config @@ -4,30 +4,36 @@ - - + + + - + + + - + - + - - + + + + - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/App/EmailProfiler.Form/My Project/AssemblyInfo.vb b/App/EmailProfiler.Form/My Project/AssemblyInfo.vb index 54227dd..3ca9ed2 100644 --- a/App/EmailProfiler.Form/My Project/AssemblyInfo.vb +++ b/App/EmailProfiler.Form/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/App/EmailProfiler.Form/frmMain.Designer.vb b/App/EmailProfiler.Form/frmMain.Designer.vb index 782f968..64864d5 100644 --- a/App/EmailProfiler.Form/frmMain.Designer.vb +++ b/App/EmailProfiler.Form/frmMain.Designer.vb @@ -2945,8 +2945,8 @@ Partial Class frmMain 'BindingNavigatorCountItem1 ' Me.BindingNavigatorCountItem1.Name = "BindingNavigatorCountItem1" - Me.BindingNavigatorCountItem1.Size = New System.Drawing.Size(35, 22) - Me.BindingNavigatorCountItem1.Text = "of {0}" + Me.BindingNavigatorCountItem1.Size = New System.Drawing.Size(44, 22) + Me.BindingNavigatorCountItem1.Text = "von {0}" Me.BindingNavigatorCountItem1.ToolTipText = "Die Gesamtanzahl der Elemente." ' 'BindingNavigatorDeleteItem1 diff --git a/App/EmailProfiler.Form/frmMain.resx b/App/EmailProfiler.Form/frmMain.resx index 09aa3ba..fe8f42d 100644 --- a/App/EmailProfiler.Form/frmMain.resx +++ b/App/EmailProfiler.Form/frmMain.resx @@ -120,183 +120,384 @@ False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + False + + True + + + True + + + True + + + True + + + True + 1271, 17 + + True + + + True + + + True + + + True + 290, 56 180, 56 + + True + + + True + + + True + 623, 134 985, 56 + + True + @@ -362,12 +563,117 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC + + True + + + True + + + True + + + True + 17, 95 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 1139, 56 + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -432,6 +738,9 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC + + True + @@ -457,12 +766,33 @@ LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + True + + + True + 537, 95 + + True + + + True + + + True + + + True + 1021, 95 + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -527,6 +857,24 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC + + True + + + True + + + True + + + True + + + True + + + True + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -547,12 +895,48 @@ IC8+DQogIDwvZz4NCjwvc3ZnPgs= + + True + + + True + 17, 134 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 1175, 95 + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -617,6 +1001,9 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC + + True + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -643,12 +1030,123 @@ TDI0LDIzLjh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 1162, 173 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 851, 173 + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -713,9 +1211,117 @@ uVf+q3hMAGN0uYEFAL7Rv7NmXVYYAAAAAElFTkSuQmCC + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 239, 173 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 1297, 134 @@ -752,8 +1358,11 @@ 1005, 173 + + True + - 108 + 201 diff --git a/App/EmailProfiler.Form/frmMain.vb b/App/EmailProfiler.Form/frmMain.vb index 3ce6790..f1cc54c 100644 --- a/App/EmailProfiler.Form/frmMain.vb +++ b/App/EmailProfiler.Form/frmMain.vb @@ -782,6 +782,7 @@ Public Class frmMain .EnableTls1_2 = CheckBoxEnableTls1_2.Checked, .EnableDefault = oDefault } + Logger.Debug($"oOptions: oOptions.EnableTls1_1: {oOptions.EnableTls1_1}, oOptions.EnableTls1_2: {oOptions.EnableTls1_2}, oOptions.EnableDefault: {oOptions.EnableDefault}") Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, oOptions) If oResult.Connected = False Then diff --git a/App/EmailProfiler.sln b/App/EmailProfiler.sln index c4216c1..d73638f 100644 --- a/App/EmailProfiler.sln +++ b/App/EmailProfiler.sln @@ -9,11 +9,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Form", "Email EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Common", "EmailProfiler.Common\EmailProfiler.Common.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "wisag_check_Att", "wisag_check_Att\wisag_check_Att.vbproj", "{CD67B0B9-A7DE-447D-9982-E7AC43481DDC}" - ProjectSection(ProjectDependencies) = postProject - {9F748DCD-952E-40A0-9DAD-65BF8A39B231} = {9F748DCD-952E-40A0-9DAD-65BF8A39B231} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -32,10 +27,6 @@ Global {9F748DCD-952E-40A0-9DAD-65BF8A39B231}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F748DCD-952E-40A0-9DAD-65BF8A39B231}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F748DCD-952E-40A0-9DAD-65BF8A39B231}.Release|Any CPU.Build.0 = Release|Any CPU - {CD67B0B9-A7DE-447D-9982-E7AC43481DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CD67B0B9-A7DE-447D-9982-E7AC43481DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD67B0B9-A7DE-447D-9982-E7AC43481DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CD67B0B9-A7DE-447D-9982-E7AC43481DDC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE