diff --git a/Base/Base.vbproj b/Base/Base.vbproj index a83e34ad..dd8a0bcd 100644 --- a/Base/Base.vbproj +++ b/Base/Base.vbproj @@ -45,8 +45,8 @@ On - - ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Base/packages.config b/Base/packages.config index e25334c4..59415cc4 100644 --- a/Base/packages.config +++ b/Base/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/Config/Config.vbproj b/Config/Config.vbproj index 941e4f55..312e1095 100644 --- a/Config/Config.vbproj +++ b/Config/Config.vbproj @@ -48,16 +48,16 @@ - ..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll + False + ..\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll - - - ..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll + False + ..\Database\bin\Debug\DigitalData.Modules.Database.dll - ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + False + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -148,9 +148,6 @@ - - - powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" diff --git a/Config/README.txt b/Config/README.txt deleted file mode 100644 index 58cbced4..00000000 --- a/Config/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -BASE MODULE -=========== - -This module is intended for often used constants and datastructures. -Therefor it is important that this module does not have any dependencies on other modules!! \ No newline at end of file diff --git a/Config/packages.config b/Config/packages.config index e38bd11b..f5db64f3 100644 --- a/Config/packages.config +++ b/Config/packages.config @@ -1,9 +1,5 @@  - - - - diff --git a/Database/Database.vbproj b/Database/Database.vbproj index 337e1f2d..d6ae2808 100644 --- a/Database/Database.vbproj +++ b/Database/Database.vbproj @@ -47,11 +47,11 @@ On - - ..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll + + ..\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll - - ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll diff --git a/EDMIAPI/EDMI.API.vbproj b/EDMIAPI/EDMI.API.vbproj index 262ecaaa..86ddca6a 100644 --- a/EDMIAPI/EDMI.API.vbproj +++ b/EDMIAPI/EDMI.API.vbproj @@ -44,6 +44,15 @@ On + + ..\Base\bin\Debug\DigitalData.Modules.Base.dll + + + ..\Database\bin\Debug\DigitalData.Modules.Database.dll + + + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\packages\NLog.5.0.5\lib\net46\NLog.dll @@ -295,24 +304,6 @@ Reference.vb - - - {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} - Base - - - {44982f9b-6116-44e2-85d0-f39650b1ef99} - Config - - - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} - Database - - - {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Logging - - powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" diff --git a/Encryption/Encryption.vbproj b/Encryption/Encryption.vbproj index de7bccd1..89d779f0 100644 --- a/Encryption/Encryption.vbproj +++ b/Encryption/Encryption.vbproj @@ -46,7 +46,8 @@ - ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + False + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Encryption/packages.config b/Encryption/packages.config index b610ae85..37cb9210 100644 --- a/Encryption/packages.config +++ b/Encryption/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/Messaging/Messaging.vbproj b/Messaging/Messaging.vbproj index 6eab8641..462abdf1 100644 --- a/Messaging/Messaging.vbproj +++ b/Messaging/Messaging.vbproj @@ -49,7 +49,8 @@ ..\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + False + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll diff --git a/Messaging/packages.config b/Messaging/packages.config index 60a25ecb..957b4e14 100644 --- a/Messaging/packages.config +++ b/Messaging/packages.config @@ -1,6 +1,5 @@  - diff --git a/Modules.sln b/Modules.sln index a39b3c42..0bbc0558 100644 --- a/Modules.sln +++ b/Modules.sln @@ -33,8 +33,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZooFlow", "ZooFlow\ZooFlow. EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Messaging", "Messaging\Messaging.vbproj", "{AF664D85-0A4B-4BAB-A2F8-83110C06553A}" EndProject -Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Database.Test", "Database.Test\Database.Test.vbproj", "{91B4DFC0-543C-43A7-A9E0-6817DCA277EC}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem", "Filesystem\Filesystem.vbproj", "{991D0231-4623-496D-8BD0-9CA906029CBC}" EndProject Global @@ -103,10 +101,6 @@ Global {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.ActiveCfg = Release|Any CPU {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.Build.0 = Release|Any CPU - {91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91B4DFC0-543C-43A7-A9E0-6817DCA277EC}.Release|Any CPU.Build.0 = Release|Any CPU {991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Windream/Windream.vbproj b/Windream/Windream.vbproj index 594b6839..66a8605f 100644 --- a/Windream/Windream.vbproj +++ b/Windream/Windream.vbproj @@ -49,7 +49,8 @@ ..\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + False + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll diff --git a/Windream/packages.config b/Windream/packages.config index b610ae85..37cb9210 100644 --- a/Windream/packages.config +++ b/Windream/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/ZooFlow/ZooFlow.vbproj b/ZooFlow/ZooFlow.vbproj index 76ca9968..77d4ec80 100644 --- a/ZooFlow/ZooFlow.vbproj +++ b/ZooFlow/ZooFlow.vbproj @@ -44,6 +44,18 @@ On + + False + ..\Database\bin\Debug\DigitalData.Modules.Database.dll + + + False + ..\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll + + + False + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\packages\NLog.5.0.5\lib\net46\NLog.dll @@ -124,18 +136,6 @@ - - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} - Database - - - {25017513-0d97-49d3-98d7-ba76d9b251b0} - EDMI.API - - - {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Logging - {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} Windows