From 9a0235e94130d98fac4da38408140df54164cf46 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 6 Apr 2020 14:11:16 +0200 Subject: [PATCH] fix remaining EDMI.API reference errors --- DDMonorepo.sln | 23 ++++++++++++------- GUIs.ClientSuite/ClientSuite.vbproj | 2 +- GUIs.ClientSuite/_TEST/frmFileTest.vb | 2 +- ...ServiceReference.DocumentResult.datasource | 10 -------- ...erviceReference.DocumentResult2.datasource | 10 -------- ...IDBServiceReference.IndexResult.datasource | 10 -------- ...ServiceReference.NonQueryResult.datasource | 10 -------- ...DBServiceReference.ScalarResult.datasource | 10 -------- ...IDBServiceReference.TableResult.datasource | 10 -------- Modules.EDMIAPI/Document.vb | 2 +- Modules.EDMIAPI/EDMI.API.vbproj | 2 +- .../My Project/Settings.Designer.vb | 8 +++---- .../DDEDM_NetworkService/IDBService.vbproj | 4 ---- 13 files changed, 23 insertions(+), 80 deletions(-) delete mode 100644 Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource delete mode 100644 Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2.datasource delete mode 100644 Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource delete mode 100644 Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource delete mode 100644 Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource delete mode 100644 Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 14eaac25..5a05efbb 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -92,8 +92,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClipboardWatcher", "GUIs.Cl EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem", "Modules.Filesystem\Filesystem.vbproj", "{991D0231-4623-496D-8BD0-9CA906029CBC}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIAPI", "Modules.EDMIAPI\EDMIAPI.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "Modules.Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem.Test", "Modules\Filesystem.Test\Filesystem.Test.vbproj", "{B29ED6D4-839B-413A-A485-B10F4A4788EA}" @@ -106,7 +104,11 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "DDEmailSe EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebServices", "WebServices", "{D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File", "EDMI.File\EDMI.File.vbproj", "{1477032D-7A02-4C5F-B026-A7117DA4BC6B}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.API", "Modules.EDMIAPI\EDMI.API.vbproj", "{25017513-0D97-49D3-98D7-BA76D9B251B0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -250,10 +252,6 @@ Global {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 {991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.Build.0 = Release|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.Build.0 = Release|Any CPU {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -278,6 +276,14 @@ Global {FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.ActiveCfg = Release|Any CPU {FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.Build.0 = Release|Any CPU + {1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Release|Any CPU.Build.0 = Release|Any CPU + {25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -317,13 +323,14 @@ Global {AF664D85-0A4B-4BAB-A2F8-83110C06553A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {991D0231-4623-496D-8BD0-9CA906029CBC} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} - {5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {B29ED6D4-839B-413A-A485-B10F4A4788EA} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {609B09B4-AD1E-40F7-8899-A6685924621C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {FD50590A-59C1-4798-AD90-419A588DCE76} = {D3BAE68E-406E-493D-A4E5-DB6EDDFFB371} + {1477032D-7A02-4C5F-B026-A7117DA4BC6B} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} + {25017513-0D97-49D3-98D7-BA76D9B251B0} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index e2049f93..661fe84b 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -497,7 +497,7 @@ Config - {5b1171dc-fffe-4813-a20d-786aae47b320} + {25017513-0d97-49d3-98d7-ba76d9b251b0} EDMI.API diff --git a/GUIs.ClientSuite/_TEST/frmFileTest.vb b/GUIs.ClientSuite/_TEST/frmFileTest.vb index c09d1395..a9c0a296 100644 --- a/GUIs.ClientSuite/_TEST/frmFileTest.vb +++ b/GUIs.ClientSuite/_TEST/frmFileTest.vb @@ -1,6 +1,6 @@ Imports System.IO -Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.EDMI.API Public Class frmFileTest Private _fileOp As Document diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource deleted file mode 100644 index dcabd2b0..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2.datasource deleted file mode 100644 index 28e14490..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource deleted file mode 100644 index 73dd7f06..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource deleted file mode 100644 index b7e71b2c..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource deleted file mode 100644 index 3ed2b399..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource deleted file mode 100644 index 5f67f205..00000000 --- a/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/Modules.EDMIAPI/Document.vb b/Modules.EDMIAPI/Document.vb index d4926c21..0c1fce60 100644 --- a/Modules.EDMIAPI/Document.vb +++ b/Modules.EDMIAPI/Document.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.EDMIAPI.IDBServiceReference +Imports DigitalData.Modules.EDMI.API.IDBServiceReference Imports System.ServiceModel Imports System.IO diff --git a/Modules.EDMIAPI/EDMI.API.vbproj b/Modules.EDMIAPI/EDMI.API.vbproj index f3e02b07..57fb97eb 100644 --- a/Modules.EDMIAPI/EDMI.API.vbproj +++ b/Modules.EDMIAPI/EDMI.API.vbproj @@ -4,7 +4,7 @@ Debug AnyCPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320} + {25017513-0D97-49D3-98D7-BA76D9B251B0} Library DigitalData.Modules.EDMI.API DigitalData.Modules.EDMI.API diff --git a/Modules.EDMIAPI/My Project/Settings.Designer.vb b/Modules.EDMIAPI/My Project/Settings.Designer.vb index 9950efab..931627f3 100644 --- a/Modules.EDMIAPI/My Project/Settings.Designer.vb +++ b/Modules.EDMIAPI/My Project/Settings.Designer.vb @@ -62,11 +62,11 @@ Namespace My Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _ Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMIAPI.My.MySettings + + + Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMI.API.My.MySettings Get - Return Global.DigitalData.Modules.EDMIAPI.My.MySettings.Default + Return Global.DigitalData.Modules.EDMI.API.My.MySettings.Default End Get End Property End Module diff --git a/SERVICES/DDEDM_NetworkService/IDBService.vbproj b/SERVICES/DDEDM_NetworkService/IDBService.vbproj index e12c5c86..2c462137 100644 --- a/SERVICES/DDEDM_NetworkService/IDBService.vbproj +++ b/SERVICES/DDEDM_NetworkService/IDBService.vbproj @@ -149,10 +149,6 @@ {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Database - - {5B1171DC-FFFE-4813-A20D-786AAE47B320} - EDMIAPI - {991D0231-4623-496D-8BD0-9CA906029CBC} Filesystem