diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj
index 61ee5a40..bc124fe1 100644
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -92,8 +92,8 @@
D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config
index 63f3075e..37cb9210 100644
--- a/Controls.DocumentViewer/packages.config
+++ b/Controls.DocumentViewer/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/DDMonorepo.sln b/DDMonorepo.sln
index e98fd03a..a0e54c47 100644
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33103.184
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GUIs", "GUIs", "{8FFE925E-8B84-45F1-93CB-32B1C96F41EB}"
EndProject
diff --git a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
index a64fb03f..3e716ad6 100644
--- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
+++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
@@ -90,8 +90,8 @@
..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
diff --git a/GUIs.ClipboardWatcher/app.config b/GUIs.ClipboardWatcher/app.config
index a35f8999..c942cb81 100644
--- a/GUIs.ClipboardWatcher/app.config
+++ b/GUIs.ClipboardWatcher/app.config
@@ -51,6 +51,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/GUIs.ClipboardWatcher/packages.config b/GUIs.ClipboardWatcher/packages.config
index 63f3075e..37cb9210 100644
--- a/GUIs.ClipboardWatcher/packages.config
+++ b/GUIs.ClipboardWatcher/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj
index de823af7..2c99722c 100644
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@@ -98,8 +98,8 @@
D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
diff --git a/GUIs.Common/packages.config b/GUIs.Common/packages.config
index 63f3075e..37cb9210 100644
--- a/GUIs.Common/packages.config
+++ b/GUIs.Common/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/GUIs.GlobalIndexer/GlobalIndexer.vbproj b/GUIs.GlobalIndexer/GlobalIndexer.vbproj
index 60aa8c82..63012606 100644
--- a/GUIs.GlobalIndexer/GlobalIndexer.vbproj
+++ b/GUIs.GlobalIndexer/GlobalIndexer.vbproj
@@ -62,8 +62,8 @@
..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
diff --git a/GUIs.GlobalIndexer/packages.config b/GUIs.GlobalIndexer/packages.config
index 63f3075e..37cb9210 100644
--- a/GUIs.GlobalIndexer/packages.config
+++ b/GUIs.GlobalIndexer/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj
index bf9f35fc..66208b76 100644
--- a/GUIs.Test.TestGUI/TestGUI.vbproj
+++ b/GUIs.Test.TestGUI/TestGUI.vbproj
@@ -105,11 +105,11 @@
..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
-
- ..\packages\Quartz.3.3.2\lib\net472\Quartz.dll
+
+ ..\packages\Quartz.3.5.0\lib\net472\Quartz.dll
diff --git a/GUIs.Test.TestGUI/packages.config b/GUIs.Test.TestGUI/packages.config
index 22ea4667..bf432ae4 100644
--- a/GUIs.Test.TestGUI/packages.config
+++ b/GUIs.Test.TestGUI/packages.config
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/Service.EDMIService/App.config b/Service.EDMIService/App.config
index 0860ee11..4d0338b6 100644
--- a/Service.EDMIService/App.config
+++ b/Service.EDMIService/App.config
@@ -33,6 +33,6 @@
-
+
diff --git a/Service.EDMIService/BaseMethod.vb b/Service.EDMIService/BaseMethod.vb
index 7e4d85a2..42a0ad21 100644
--- a/Service.EDMIService/BaseMethod.vb
+++ b/Service.EDMIService/BaseMethod.vb
@@ -7,14 +7,14 @@ Public MustInherit Class BaseMethod
Friend ReadOnly DatabaseIDB As MSSQLServer
Friend ReadOnly DatabaseECM As MSSQLServer
- Friend ReadOnly Helpers As Helpers
+ Friend ReadOnly Helpers As IDB.Helpers
Friend ReadOnly GlobalState As GlobalState
Public Sub New(pLogConfig As LogConfig, pDatabaseIDB As MSSQLServer, pDatabaseECM As MSSQLServer, pGlobalState As GlobalState)
MyBase.New(pLogConfig)
DatabaseIDB = pDatabaseIDB
DatabaseECM = pDatabaseECM
- Helpers = New Helpers(pLogConfig, pDatabaseIDB)
+ Helpers = New IDB.Helpers(pLogConfig, pDatabaseIDB)
GlobalState = pGlobalState
End Sub
End Class
diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj
index 933ca6f3..2cd77fc8 100644
--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@@ -11,7 +11,7 @@
EDMIService
512
Console
- v4.7.2
+ v4.6.2
true
false
@@ -100,11 +100,11 @@
..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
-
- ..\packages\Quartz.3.3.2\lib\net472\Quartz.dll
+
+ ..\packages\Quartz.3.5.0\lib\net462\Quartz.dll
@@ -235,6 +235,7 @@
True
Application.myapp
+ True
True
diff --git a/Service.EDMIService/My Project/Resources.Designer.vb b/Service.EDMIService/My Project/Resources.Designer.vb
index 3cd07b10..e94ec25a 100644
--- a/Service.EDMIService/My Project/Resources.Designer.vb
+++ b/Service.EDMIService/My Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
'''
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
'''
- _
diff --git a/Service.EDMIService/My Project/Settings.Designer.vb b/Service.EDMIService/My Project/Settings.Designer.vb
index 63f0e69c..7596224c 100644
--- a/Service.EDMIService/My Project/Settings.Designer.vb
+++ b/Service.EDMIService/My Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
_
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
diff --git a/Service.EDMIService/packages.config b/Service.EDMIService/packages.config
index 8571a474..b27d6005 100644
--- a/Service.EDMIService/packages.config
+++ b/Service.EDMIService/packages.config
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/Services.EmailService/DDEmailService.vbproj b/Services.EmailService/DDEmailService.vbproj
index b81143e8..f584eba2 100644
--- a/Services.EmailService/DDEmailService.vbproj
+++ b/Services.EmailService/DDEmailService.vbproj
@@ -81,8 +81,8 @@
..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
diff --git a/Services.EmailService/packages.config b/Services.EmailService/packages.config
index f5252b7d..52c707c3 100644
--- a/Services.EmailService/packages.config
+++ b/Services.EmailService/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Services.LicenseService/DDEDMLicenseService.vbproj b/Services.LicenseService/DDEDMLicenseService.vbproj
index e39e4787..cc26af94 100644
--- a/Services.LicenseService/DDEDMLicenseService.vbproj
+++ b/Services.LicenseService/DDEDMLicenseService.vbproj
@@ -56,8 +56,8 @@
..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
diff --git a/Services.LicenseService/packages.config b/Services.LicenseService/packages.config
index 63f3075e..37cb9210 100644
--- a/Services.LicenseService/packages.config
+++ b/Services.LicenseService/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
index 06f4b385..30c5138a 100644
--- a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
+++ b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
@@ -71,8 +71,8 @@
..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll
-
- ..\packages\NLog.4.7.10\lib\net45\NLog.dll
+
+ ..\packages\NLog.5.0.5\lib\net46\NLog.dll
diff --git a/Services.ZUGFeRDService/packages.config b/Services.ZUGFeRDService/packages.config
index f5252b7d..52c707c3 100644
--- a/Services.ZUGFeRDService/packages.config
+++ b/Services.ZUGFeRDService/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj b/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj
index 888619ca..311cfff2 100644
--- a/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj
+++ b/WEBSERVICES/ZUGFeRDRESTService/ZUGFeRDRESTService.csproj
@@ -9,9 +9,9 @@
-
+
-
+