From 904c4a7f2e1aaee8e2d49019dcdcefa76a1eec4b Mon Sep 17 00:00:00 2001 From: Developer01 Date: Mon, 8 Dec 2025 10:09:18 +0100 Subject: [PATCH] GD Picture 14.3.18 --- .../EmailProfiler.Common.vbproj | 167 +++++++++++++++--- App/EmailProfiler.Common/app.config | 50 +++++- App/EmailProfiler.Common/clsWorkEmail.vb | 3 - App/EmailProfiler.Common/packages.config | 28 ++- .../EmailProfiler.Form.vbproj | 4 - App/EmailProfiler.Form/frmMain.Designer.vb | 12 +- App/EmailProfiler.Form/frmMain.resx | 21 --- 7 files changed, 219 insertions(+), 66 deletions(-) diff --git a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj index d354b21..eb70588 100644 --- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj +++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj @@ -49,35 +49,96 @@ ..\packages\AE.Net.Mail.1.7.10.0\lib\net45\AE.Net.Mail.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\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\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\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + + ..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + + ..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + + + ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.CAD.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Common.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Document.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Email.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.HTML.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenDocument.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.PDF.dll - - False - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\GDPicture\14.3.3\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.RTF.dll - - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\GDPicture\14.3.3\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.SVG.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.wia.gateway.dll + True P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll @@ -94,22 +155,82 @@ P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll + ..\packages\NLog.5.0.5\lib\net46\NLog.dll + + ..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll + + + ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll + + + ..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll + + + ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll + + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll + + + ..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll + + + ..\packages\System.Memory.4.6.0\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.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Security.Cryptography.Pkcs.8.0.1\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.Json.8.0.6\lib\net462\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + @@ -175,11 +296,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 dc0bb7e..1f57f79 100644 --- a/App/EmailProfiler.Common/app.config +++ b/App/EmailProfiler.Common/app.config @@ -1,4 +1,4 @@ - + @@ -7,17 +7,17 @@ - + - + - + @@ -25,9 +25,45 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/App/EmailProfiler.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb index 6b2ba38..9d4d3ed 100644 --- a/App/EmailProfiler.Common/clsWorkEmail.vb +++ b/App/EmailProfiler.Common/clsWorkEmail.vb @@ -546,7 +546,6 @@ Public Class clsWorkEmail Dim TEMP_PROCESS_PROFILE_DT As DataTable = DT_POLL_PROCESS Dim PM_ROW As DataRow() = TEMP_PROCESS_PROFILE_DT.Select(oExpression) For Each row As DataRow In PM_ROW - Try WM_REFERENCE_INDEX = row("WM_REFERENCE_INDEX") Catch ex As Exception @@ -563,8 +562,6 @@ Public Class clsWorkEmail If Copy2HDD(pCurrentMail, row("COPY_2_HDD"), row("PATH_ORIGINAL"), row("PATH_EMAIL_ERRORS"), False) = True Then ExtractBody(pCurrentMail) End If - - Next If CURRENT_MAIL_SUBJECT.Contains("[PROCESSMANAGER][EA]") Then diff --git a/App/EmailProfiler.Common/packages.config b/App/EmailProfiler.Common/packages.config index 047a6c0..78da87f 100644 --- a/App/EmailProfiler.Common/packages.config +++ b/App/EmailProfiler.Common/packages.config @@ -1,7 +1,31 @@  - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj index 50eb20e..a2221f8 100644 --- a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj +++ b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj @@ -82,10 +82,6 @@ False ..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll - - False - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\GDPicture\14.3.3\GdPicture.NET.14.dll - ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll diff --git a/App/EmailProfiler.Form/frmMain.Designer.vb b/App/EmailProfiler.Form/frmMain.Designer.vb index a633e00..8cbf873 100644 --- a/App/EmailProfiler.Form/frmMain.Designer.vb +++ b/App/EmailProfiler.Form/frmMain.Designer.vb @@ -2574,7 +2574,7 @@ Partial Class frmMain Me.tabEmail.Location = New System.Drawing.Point(4, 22) Me.tabEmail.Name = "tabEmail" Me.tabEmail.Padding = New System.Windows.Forms.Padding(3) - Me.tabEmail.Size = New System.Drawing.Size(1227, 567) + Me.tabEmail.Size = New System.Drawing.Size(1227, 568) Me.tabEmail.TabIndex = 3 Me.tabEmail.Text = "EMail-Konto Konfiguration" Me.tabEmail.UseVisualStyleBackColor = True @@ -2853,7 +2853,7 @@ Partial Class frmMain Me.GridControl6.Location = New System.Drawing.Point(3, 28) Me.GridControl6.MainView = Me.GridView6 Me.GridControl6.Name = "GridControl6" - Me.GridControl6.Size = New System.Drawing.Size(301, 536) + Me.GridControl6.Size = New System.Drawing.Size(301, 537) Me.GridControl6.TabIndex = 34 Me.GridControl6.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView6}) ' @@ -3030,7 +3030,7 @@ Partial Class frmMain Me.tabConfig.Location = New System.Drawing.Point(4, 22) Me.tabConfig.Name = "tabConfig" Me.tabConfig.Padding = New System.Windows.Forms.Padding(3) - Me.tabConfig.Size = New System.Drawing.Size(1227, 567) + Me.tabConfig.Size = New System.Drawing.Size(1227, 568) Me.tabConfig.TabIndex = 1 Me.tabConfig.Text = "Grundeinstellungen" Me.tabConfig.UseVisualStyleBackColor = True @@ -3046,7 +3046,7 @@ Partial Class frmMain Me.GroupBox4.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox4.Location = New System.Drawing.Point(3, 358) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(1221, 206) + Me.GroupBox4.Size = New System.Drawing.Size(1221, 207) Me.GroupBox4.TabIndex = 69 Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Test RegEx" @@ -3088,7 +3088,7 @@ Partial Class frmMain Me.txtResultRegEx.Location = New System.Drawing.Point(659, 49) Me.txtResultRegEx.Multiline = True Me.txtResultRegEx.Name = "txtResultRegEx" - Me.txtResultRegEx.Size = New System.Drawing.Size(538, 151) + Me.txtResultRegEx.Size = New System.Drawing.Size(538, 187) Me.txtResultRegEx.TabIndex = 69 ' 'txthtmlEmail @@ -3100,7 +3100,7 @@ Partial Class frmMain Me.txthtmlEmail.Location = New System.Drawing.Point(9, 49) Me.txthtmlEmail.Multiline = True Me.txthtmlEmail.Name = "txthtmlEmail" - Me.txthtmlEmail.Size = New System.Drawing.Size(538, 151) + Me.txthtmlEmail.Size = New System.Drawing.Size(538, 187) Me.txthtmlEmail.TabIndex = 67 Me.txthtmlEmail.Text = Global.EmailProfiler.Form.My.MySettings.Default.MyTestHTML ' diff --git a/App/EmailProfiler.Form/frmMain.resx b/App/EmailProfiler.Form/frmMain.resx index 06e7b76..09aa3ba 100644 --- a/App/EmailProfiler.Form/frmMain.resx +++ b/App/EmailProfiler.Form/frmMain.resx @@ -380,9 +380,6 @@ nlwVm9EAAAAASUVORK5CYII= - - 17, 95 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -478,9 +475,6 @@ nlwVm9EAAAAASUVORK5CYII= - - 537, 95 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -571,9 +565,6 @@ nlwVm9EAAAAASUVORK5CYII= - - 17, 134 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -652,15 +643,6 @@ TDI0LDIzLjh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - 851, 173 - - - 180, 56 - - - 623, 134 - 1162, 173 @@ -734,9 +716,6 @@ 239, 173 - - 239, 173 - 1297, 134