diff --git a/App/EmailProfiler.Common/ClassCurrent.vb b/App/EmailProfiler.Common/ClassCurrent.vb
index 0b142a4..098127c 100644
--- a/App/EmailProfiler.Common/ClassCurrent.vb
+++ b/App/EmailProfiler.Common/ClassCurrent.vb
@@ -46,7 +46,7 @@ Public Class ClassCurrent
Public Shared Property TEMP_FILES As List(Of String) = New List(Of String)
Public Shared Property TEMP_WORK_FILES As List(Of String) = New List(Of String)
- Public Shared Property GDPictureLicense As String = "None"
+ Public Shared Property GDPictureLicense As String = ""
Public Shared Property EmailAttachments As List(Of EmailAttachment) = New List(Of EmailAttachment)
End Class
diff --git a/App/EmailProfiler.Common/Data/Config.vb b/App/EmailProfiler.Common/Data/Config.vb
index 120df15..8aaeec8 100644
--- a/App/EmailProfiler.Common/Data/Config.vb
+++ b/App/EmailProfiler.Common/Data/Config.vb
@@ -40,5 +40,5 @@ Public Class Config
''' Enthält die Lizenznummer des GDPicture Modules.
''' Nur wenn nicht über die Datenbank zu holen!!.
'''
- Public Property GDPictureLicenseString As String = ""
+ Public Property GDPictureLicenseAsString As String = ""
End Class
diff --git a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
index eb70588..5b68a9b 100644
--- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
+++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
@@ -76,68 +76,71 @@
..\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.21\lib\net462\GdPicture.NET.14.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll
+
+ ..\packages\GdPicture.14.3.21\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.21\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.21\lib\net462\GdPicture.NET.14.CAD.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.CAD.DWG.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.CAD.DWG.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Common.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Common.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Document.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Document.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Email.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Email.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.HTML.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.HTML.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Formats.dll
+
+ ..\packages\GdPicture.14.3.21\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.21\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.21\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Markdown.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenDocument.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenDocument.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenXML.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.PDF.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.RTF.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.PDF.dll
-
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.SVG.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.RTF.dll
+
+
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.SVG.dll
- ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.wia.gateway.dll
+ ..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.wia.gateway.dll
True
@@ -159,6 +162,15 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Exceptions.dll
+
+
+ ..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Settings.dll
+
+
+ ..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Settings.Edition.dll
+
..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -184,6 +196,9 @@
..\packages\System.Buffers.4.6.0\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
@@ -193,6 +208,7 @@
..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll
+
..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll
@@ -296,11 +312,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/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb
index 47e55b7..b259f37 100644
--- a/App/EmailProfiler.Common/clsWorkEmail.vb
+++ b/App/EmailProfiler.Common/clsWorkEmail.vb
@@ -77,17 +77,20 @@ Public Class clsWorkEmail
_windream_index = New clsWindream_Index(LogConf)
_windreamConnectionString = WmConStr
End If
- If pConfigData.GDPictureLicenseString = String.Empty Then
+ If pConfigData.GDPictureLicenseAsString = String.Empty Then
_Logger.Debug("clsWorkEmail - GDPicture local is empty ..switching to db-getting ...")
GDPictureLicense = ConfigDbFunct.GetProductLicense("GDPICTURE", pConfigData.GDPictureVersion, _LogConfig, ConStr)
Else
- _Logger.Debug("clsWorkEmail - GDPicture License from local config!")
+ _Logger.Debug("")
+ _Logger.Debug(String.Format("clsWorkEmail - GDPicture License from local config [{0}]", pConfigData.GDPictureLicenseAsString))
+ _Logger.Debug("")
+ GDPictureLicense = pConfigData.GDPictureLicenseAsString
End If
If String.IsNullOrEmpty(GDPictureLicense) = False Then
_LicenseManager.RegisterKEY(GDPictureLicense)
Else
- _Logger.Error("clsWorkEmail() No value for GDPictureLicense found!")
+ _Logger.Error("clsWorkEmail() - No value for GDPictureLicense found")
End If
_EmailAccountID = pConfigData.EmailAccountId
diff --git a/App/EmailProfiler.Common/packages.config b/App/EmailProfiler.Common/packages.config
index 78da87f..681d11f 100644
--- a/App/EmailProfiler.Common/packages.config
+++ b/App/EmailProfiler.Common/packages.config
@@ -4,8 +4,8 @@
-
-
+
+
@@ -18,8 +18,10 @@
+
+