From d9f9755d2a1571eca36227bcee24657f8cc2f03e Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 15 Apr 2026 11:06:18 +0200 Subject: [PATCH 1/8] Modules.Config: Test-Code entfernt. Ich hoffe es war nur Test-Code!!! --- Config/ConfigDbFunct.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Config/ConfigDbFunct.vb b/Config/ConfigDbFunct.vb index ac3809d0..90980c48 100644 --- a/Config/ConfigDbFunct.vb +++ b/Config/ConfigDbFunct.vb @@ -37,9 +37,8 @@ Public Class ConfigDbFunct Dim oSql As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = '" + pProductName + "' AND ACTIVE = 1 AND VERSION = '" + pVersion + "'" oLogger.Debug(String.Format("oSql in GetProductLicense: {0}", oSql)) - Return String.Empty - Dim oLicenseString As String = oDatabase.GetScalarValue(oSql) + Dim oLicenseString As String = oDatabase.GetScalarValue(oSql) Return oLicenseString Catch ex As Exception From d631f0e0ff4fbf2b18d9501c78d191f52e24d0f8 Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 15 Apr 2026 11:07:40 +0200 Subject: [PATCH 2/8] Modules.Config: Version 1.4.0.0 --- Config/My Project/AssemblyInfo.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Config/My Project/AssemblyInfo.vb b/Config/My Project/AssemblyInfo.vb index 09d25984..33c5a40e 100644 --- a/Config/My Project/AssemblyInfo.vb +++ b/Config/My Project/AssemblyInfo.vb @@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices - - + + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From e8982d1c65861b742b6c6e97fb6390d4cf0e7dc7 Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 28 Apr 2026 13:13:31 +0200 Subject: [PATCH 3/8] Modules.Interfaces: En16931-Code fehlte in manchen Ablehnungen. --- Interfaces/ZUGFeRDInterface/PropertyValues.vb | 1 + Jobs/Jobs.vbproj | 19 +++---------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Interfaces/ZUGFeRDInterface/PropertyValues.vb b/Interfaces/ZUGFeRDInterface/PropertyValues.vb index 1a2ee215..129b2069 100644 --- a/Interfaces/ZUGFeRDInterface/PropertyValues.vb +++ b/Interfaces/ZUGFeRDInterface/PropertyValues.vb @@ -234,6 +234,7 @@ Public Class PropertyValues _logger.Warn("Specification [{0}] is empty, but marked as required! Skipping.", oTableColumn) Dim oMissingProperty = New MissingProperty With { + .EN16931_ID = oEN16931_ID, .Description = oPropertyDescription, .XMLPath = oPropertyPath } diff --git a/Jobs/Jobs.vbproj b/Jobs/Jobs.vbproj index 90c9a98b..30b3c16e 100644 --- a/Jobs/Jobs.vbproj +++ b/Jobs/Jobs.vbproj @@ -66,16 +66,6 @@ - - - {ab6f09bf-e794-4f6a-94bb-c97c0ba84d64} - Interfaces - - - {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Logging - - @@ -122,6 +112,9 @@ ..\Database\bin\Debug\DigitalData.Modules.Database.dll + + ..\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll @@ -202,12 +195,6 @@ ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll - - - ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll From ff11ae963d10eec549553d1bba7d04b6af960b7d Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 28 Apr 2026 13:14:00 +0200 Subject: [PATCH 4/8] Modules.Interfaces: Version 2.4.2.0 --- Interfaces/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Interfaces/My Project/AssemblyInfo.vb b/Interfaces/My Project/AssemblyInfo.vb index 66ada376..fd5cc356 100644 --- a/Interfaces/My Project/AssemblyInfo.vb +++ b/Interfaces/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 65bb0fce584b88e1f23c4086c0c64d9efd5171f6 Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 28 Apr 2026 14:35:09 +0200 Subject: [PATCH 5/8] =?UTF-8?q?Modules.Jobs&Intefaces:=20GDPicture=20zur?= =?UTF-8?q?=C3=BCvk=20auf=20Version=2014.3.3=20(master)=20gestellt!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/Interfaces.vbproj | 86 +++++++++++++++++----------------- Interfaces/packages.config | 4 +- Jobs/App.config | 6 ++- Jobs/Jobs.vbproj | 89 +++++++++++++++++++----------------- Jobs/packages.config | 6 ++- 5 files changed, 100 insertions(+), 91 deletions(-) diff --git a/Interfaces/Interfaces.vbproj b/Interfaces/Interfaces.vbproj index 79776bfd..be56545f 100644 --- a/Interfaces/Interfaces.vbproj +++ b/Interfaces/Interfaces.vbproj @@ -64,68 +64,68 @@ ..\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.3\lib\net462\GdPicture.NET.14.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + ..\packages\GdPicture.14.3.3\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.3\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.3\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Document.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Email.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.HTML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + ..\packages\GdPicture.14.3.3\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.3\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.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenDocument.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.PDF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.RTF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.SVG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.wia.gateway.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll True @@ -304,11 +304,11 @@ powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" - + 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/Interfaces/packages.config b/Interfaces/packages.config index 65fdd9b8..18dc42d5 100644 --- a/Interfaces/packages.config +++ b/Interfaces/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/Jobs/App.config b/Jobs/App.config index c6e56df2..81d84861 100644 --- a/Jobs/App.config +++ b/Jobs/App.config @@ -49,7 +49,11 @@ - + + + + + diff --git a/Jobs/Jobs.vbproj b/Jobs/Jobs.vbproj index 30b3c16e..3fa579c5 100644 --- a/Jobs/Jobs.vbproj +++ b/Jobs/Jobs.vbproj @@ -127,68 +127,68 @@ ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + ..\packages\GdPicture.14.3.3\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.3\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.3\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Document.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Email.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.HTML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + ..\packages\GdPicture.14.3.3\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.3\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.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenDocument.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.PDF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.RTF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll - - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.SVG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll - ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.wia.gateway.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll True @@ -220,6 +220,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 @@ -272,11 +275,11 @@ powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" - + 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/Jobs/packages.config b/Jobs/packages.config index cd4b8e35..0a2fbf7f 100644 --- a/Jobs/packages.config +++ b/Jobs/packages.config @@ -4,8 +4,8 @@ - - + + @@ -18,8 +18,10 @@ + + From 801bb9c5b3767ac8f6182526321e6d9d9d5bc10b Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 28 Apr 2026 14:35:52 +0200 Subject: [PATCH 6/8] Modules.Interfaces: Version 2.4.3.0 --- Interfaces/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Interfaces/My Project/AssemblyInfo.vb b/Interfaces/My Project/AssemblyInfo.vb index fd5cc356..9f88e710 100644 --- a/Interfaces/My Project/AssemblyInfo.vb +++ b/Interfaces/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From f3b7a6725cfefb57f2f7d4f80b9741f0b3e9e0eb Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 28 Apr 2026 14:36:34 +0200 Subject: [PATCH 7/8] Modules.Jobs: Version 3.5.1.0 --- Jobs/My Project/AssemblyInfo.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jobs/My Project/AssemblyInfo.vb b/Jobs/My Project/AssemblyInfo.vb index e853141d..7ec2b194 100644 --- a/Jobs/My Project/AssemblyInfo.vb +++ b/Jobs/My Project/AssemblyInfo.vb @@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices - - + + @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' übernehmen, indem Sie "*" eingeben: - - + + From 4213121b6788adeb203d310b5394872e7e92d8ac Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 28 Apr 2026 15:26:12 +0200 Subject: [PATCH 8/8] Update project references and migrate to NuGet packages Refactored project references to use new DDModules paths and updated third-party DLL locations. Migrated GUIs.Test.EDMIBenchmark to NuGet-based dependency management, adding packages.config and binding redirects for key assemblies. Replaced Office COM interop with direct assembly references. Integrated GdPicture via NuGet and removed redundant hardcoded references. These changes improve maintainability, portability, and project structure. --- Patterns/Patterns.vbproj | 2 +- Windows/Windows.vbproj | 26 ++++++++------------------ Windream/Windream.vbproj | 13 +++++++------ 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/Patterns/Patterns.vbproj b/Patterns/Patterns.vbproj index c3dc5057..48c0ce5e 100644 --- a/Patterns/Patterns.vbproj +++ b/Patterns/Patterns.vbproj @@ -57,7 +57,7 @@ ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll True diff --git a/Windows/Windows.vbproj b/Windows/Windows.vbproj index eaa73b43..9631cc62 100644 --- a/Windows/Windows.vbproj +++ b/Windows/Windows.vbproj @@ -48,9 +48,17 @@ ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + + M:\Bibliotheken\3rdParty\Office\Microsoft.Office.Interop.Outlook.dll + True + ..\packages\NLog.5.0.5\lib\net46\NLog.dll + + M:\Bibliotheken\3rdParty\Office\OFFICE.DLL + True + @@ -143,24 +151,6 @@ - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 8 - 0 - primary - False - True - - - {00062FFF-0000-0000-C000-000000000046} - 9 - 6 - 0 - primary - False - True - {00020430-0000-0000-C000-000000000046} 2 diff --git a/Windream/Windream.vbproj b/Windream/Windream.vbproj index aeac5eca..05d37e4b 100644 --- a/Windream/Windream.vbproj +++ b/Windream/Windream.vbproj @@ -47,20 +47,21 @@ ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll - - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll - False + + False + True + M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMCNNCTDLLLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WMCNNCTDLLLib.dll True - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll True - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll True