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 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: ' - - + + 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/My Project/AssemblyInfo.vb b/Interfaces/My Project/AssemblyInfo.vb index 66ada376..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: ' - - + + 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/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 90c9a98b..3fa579c5 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 @@ -134,80 +127,74 @@ ..\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 ..\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 @@ -233,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 @@ -285,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/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: - - + + 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 @@ + + 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 a5cb909e..05d37e4b 100644 --- a/Windream/Windream.vbproj +++ b/Windream/Windream.vbproj @@ -47,18 +47,15 @@ ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll - - M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll + + False True + M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll M:\Bibliotheken\3rdParty\windream\Interop.WMCNNCTDLLLib.dll True - - M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll - True - M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll True