diff --git a/BeWo.sln b/BeWo.sln
index 5896d25d3..6f5aa1aad 100644
--- a/BeWo.sln
+++ b/BeWo.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30523.141
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35707.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
@@ -601,6 +601,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MalteserJohanniterJohannesh
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{7C7F1E62-B72D-419B-98A5-26A307456638}"
+ ProjectSection(SolutionItems) = preProject
+ Server\Components\README.txt = Server\Components\README.txt
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerUtils", "Server\Components\ServerUtils\ServerUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AICore", "Server\Components\AICore\AICore.csproj", "{69D70CA9-0DF9-419E-BFAF-F4539F129BD9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -4796,6 +4805,38 @@ Global
{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.ActiveCfg = Release|Any CPU
{47331732-DD96-4075-869F-83AA9F3F9937}.Release|x86.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|.NET.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|x86.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|.NET.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|.NET.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|x86.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|x86.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|.NET.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|x86.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|.NET.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|.NET.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|x86.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -5092,6 +5133,9 @@ Global
{AD3876F3-40C0-47CF-BA36-687139903F87} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{28331CB1-17FD-4B58-A837-E0249CAAC535} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+ {7C7F1E62-B72D-419B-98A5-26A307456638} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {7C7F1E62-B72D-419B-98A5-26A307456638}
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9} = {7C7F1E62-B72D-419B-98A5-26A307456638}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln
index 9dc3518ed..f5774309c 100644
--- a/BeWoAllReports.sln
+++ b/BeWoAllReports.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31424.327
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35707.178 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
@@ -932,6 +932,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AwoIntegrationsGGmbH", "Rep
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OwnSoftTestSchmitzi", "ReportImp\OwnSoftTestSchmitzi\OwnSoftTestSchmitzi.csproj", "{D357755F-6B30-4CA4-88B9-44F624030AAA}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{C9BAF7C5-797E-4693-8B31-544F90EC0B1C}"
+ ProjectSection(SolutionItems) = preProject
+ Server\Components\README.txt = Server\Components\README.txt
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AICore", "Server\Components\AICore\AICore.csproj", "{69D70CA9-0DF9-419E-BFAF-F4539F129BD9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerUtils", "Server\Components\ServerUtils\ServerUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -11455,6 +11464,54 @@ Global
{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|x86.ActiveCfg = Release|Any CPU
{D357755F-6B30-4CA4-88B9-44F624030AAA}.Release|x86.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|.NET.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|x86.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.DebugRemote|x86.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|.NET.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|.NET.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|x86.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|x86.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|.NET.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|x86.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.DebugRemote|x86.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|.NET.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|.NET.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|x86.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -11917,6 +11974,9 @@ Global
{25577D25-B655-45FD-983D-189A52159CF6} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{3D0ED6C8-21D3-46E3-B581-40EEDA98DE12} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{D357755F-6B30-4CA4-88B9-44F624030AAA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+ {C9BAF7C5-797E-4693-8B31-544F90EC0B1C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9} = {C9BAF7C5-797E-4693-8B31-544F90EC0B1C}
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {C9BAF7C5-797E-4693-8B31-544F90EC0B1C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
diff --git a/BeWoDakota.sln b/BeWoDakota.sln
index 9e69c4821..96e409519 100644
--- a/BeWoDakota.sln
+++ b/BeWoDakota.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.33927.289
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35707.178 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
@@ -47,6 +47,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo.Styles", "BeWo.Styles\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KTDReaderGUI", "Tools\KTDReaderGUI\KTDReaderGUI\KTDReaderGUI.csproj", "{F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{9BF8C7F1-4DCC-4C7F-8AD9-112A2640CA90}"
+ ProjectSection(SolutionItems) = preProject
+ Server\Components\README.txt = Server\Components\README.txt
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AICore", "Server\Components\AICore\AICore.csproj", "{69D70CA9-0DF9-419E-BFAF-F4539F129BD9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerUtils", "Server\Components\ServerUtils\ServerUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -229,6 +238,30 @@ Global
{F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.Release|Any CPU.Build.0 = Release|Any CPU
{F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|.NET.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|.NET.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|.NET.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|.NET.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|.NET.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|.NET.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -243,11 +276,14 @@ Global
{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
- {A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+ {A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A} = {BF0F7058-96E7-492B-8224-7976A32A751C}
{B1FF561D-1677-4B06-9168-E7B024084B69} = {2AA59C1D-5537-4C49-9F9D-6E7CF827F687}
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5} = {2AA59C1D-5537-4C49-9F9D-6E7CF827F687}
{9BAB16DE-E284-4B57-BD09-763FC5CE521A} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{F8EE2279-EDEA-4D4A-9D0F-89B7DA7E6AC2} = {BF0F7058-96E7-492B-8224-7976A32A751C}
+ {9BF8C7F1-4DCC-4C7F-8AD9-112A2640CA90} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9} = {9BF8C7F1-4DCC-4C7F-8AD9-112A2640CA90}
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {9BF8C7F1-4DCC-4C7F-8AD9-112A2640CA90}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}
diff --git a/Server/Components/AICore/AICore.csproj b/Server/Components/AICore/AICore.csproj
index 4a8faea84..f6b0692d3 100644
--- a/Server/Components/AICore/AICore.csproj
+++ b/Server/Components/AICore/AICore.csproj
@@ -119,6 +119,10 @@
{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}
Shared
+
+ {ec2349fb-7fe0-4ad1-b28b-a7a27af80a57}
+ ServerUtils
+
diff --git a/Server/Components/AICore/Context/Core/AiContextSummaryFactory.cs b/Server/Components/AICore/Context/Core/AiContextSummaryFactory.cs
index b92ad31e2..fb07c693a 100644
--- a/Server/Components/AICore/Context/Core/AiContextSummaryFactory.cs
+++ b/Server/Components/AICore/Context/Core/AiContextSummaryFactory.cs
@@ -1,6 +1,4 @@
using AICore.Context.Core;
-using AICore.Context.Entry;
-using AICore.Context.Entry.Navigation;
using AICore.Context.Summary;
using AICore.Context.Summary.Detail;
using AICore.Context.Summary.Navigation;
@@ -9,7 +7,7 @@ using BS.Shared.DataContracts.Compact;
using BS.Shared.Exceptions;
using System.Collections.Generic;
-namespace AICore.Context.SummaryMapper
+namespace AICore.Context.Core
{
///
/// Reine Erstellung der Objekte
diff --git a/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs
index 8d5008b55..ea491a294 100644
--- a/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs
+++ b/Server/Components/AICore/Context/Entry/Detail/CustomerDetailContextEntry.cs
@@ -2,7 +2,7 @@
using System;
using System.Text.Json.Serialization;
-namespace AICore.Context.Entry
+namespace AICore.Context.Entry.Detail
{
internal class CustomerDetailContextEntry : DetailContextEntry
{
diff --git a/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs
index 099b68a38..fa1b066f2 100644
--- a/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs
+++ b/Server/Components/AICore/Context/Entry/Detail/DetailContextEntry.cs
@@ -1,6 +1,6 @@
using BS.Shared.DataContracts;
-namespace AICore.Context.Entry
+namespace AICore.Context.Entry.Detail
{
internal abstract class DetailContextEntry : BaseContextEntry
{
diff --git a/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs
index 517fa1fda..0ce2725e9 100644
--- a/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs
+++ b/Server/Components/AICore/Context/Entry/Detail/EmployeeDetailContextEntry.cs
@@ -1,6 +1,6 @@
using BS.Shared.DataContracts;
-namespace AICore.Context.Entry
+namespace AICore.Context.Entry.Detail
{
internal class EmployeeDetailContextEntry : DetailContextEntry
{
diff --git a/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs
index 0afda6a67..2c19fb116 100644
--- a/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs
+++ b/Server/Components/AICore/Context/Entry/Detail/OrganisationDetailContextEntry.cs
@@ -1,6 +1,6 @@
using BS.Shared.DataContracts;
-namespace AICore.Context.Entry
+namespace AICore.Context.Entry.Detail
{
internal class OrganisationDetailContextEntry : DetailContextEntry
{
diff --git a/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs
index 2df01ad50..b8ed1a667 100644
--- a/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs
+++ b/Server/Components/AICore/Context/Entry/Detail/PersonDetailContextEntry.cs
@@ -1,6 +1,6 @@
using BS.Shared.DataContracts;
-namespace AICore.Context.Entry
+namespace AICore.Context.Entry.Detail
{
internal class PersonDetailContextEntry : DetailContextEntry
{
diff --git a/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs b/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs
index ae51e6870..214d05596 100644
--- a/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs
+++ b/Server/Components/AICore/Context/Entry/Detail/SupportConceptDetailContextEntry.cs
@@ -1,6 +1,6 @@
using BS.Shared.DataContracts;
-namespace AICore.Context.Entry
+namespace AICore.Context.Entry.Detail
{
internal class SupportConceptDetailContextEntry : DetailContextEntry
{
diff --git a/Server/Components/AICore/Context/EntryMapper/Detail/CustomerContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Detail/CustomerContextEntryMapper.cs
index 8c04ecd11..23b4a7b65 100644
--- a/Server/Components/AICore/Context/EntryMapper/Detail/CustomerContextEntryMapper.cs
+++ b/Server/Components/AICore/Context/EntryMapper/Detail/CustomerContextEntryMapper.cs
@@ -1,4 +1,4 @@
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/Server/Components/AICore/Context/EntryMapper/Detail/EmployeeContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Detail/EmployeeContextEntryMapper.cs
index f423bb244..6b9f2fd45 100644
--- a/Server/Components/AICore/Context/EntryMapper/Detail/EmployeeContextEntryMapper.cs
+++ b/Server/Components/AICore/Context/EntryMapper/Detail/EmployeeContextEntryMapper.cs
@@ -1,6 +1,6 @@
using System;
using System.Linq;
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.EntryMapper.Detail
diff --git a/Server/Components/AICore/Context/EntryMapper/Detail/OrganisationContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Detail/OrganisationContextEntryMapper.cs
index 2eb54e19a..a63fe112c 100644
--- a/Server/Components/AICore/Context/EntryMapper/Detail/OrganisationContextEntryMapper.cs
+++ b/Server/Components/AICore/Context/EntryMapper/Detail/OrganisationContextEntryMapper.cs
@@ -1,6 +1,6 @@
using System;
using System.Linq;
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.EntryMapper.Detail
diff --git a/Server/Components/AICore/Context/EntryMapper/Detail/PersonContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Detail/PersonContextEntryMapper.cs
index 0f8e2a95c..3ef52f61b 100644
--- a/Server/Components/AICore/Context/EntryMapper/Detail/PersonContextEntryMapper.cs
+++ b/Server/Components/AICore/Context/EntryMapper/Detail/PersonContextEntryMapper.cs
@@ -1,6 +1,6 @@
using System;
using System.Linq;
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.EntryMapper.Detail
diff --git a/Server/Components/AICore/Context/EntryMapper/Detail/SupportConceptContextEntryMapper.cs b/Server/Components/AICore/Context/EntryMapper/Detail/SupportConceptContextEntryMapper.cs
index 4c1c2353e..50d603e03 100644
--- a/Server/Components/AICore/Context/EntryMapper/Detail/SupportConceptContextEntryMapper.cs
+++ b/Server/Components/AICore/Context/EntryMapper/Detail/SupportConceptContextEntryMapper.cs
@@ -1,6 +1,6 @@
using System;
using System.Linq;
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.EntryMapper.Detail
diff --git a/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs
index 11addbdd5..6f23f0607 100644
--- a/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs
+++ b/Server/Components/AICore/Context/Summary/Detail/CustomerDetailContextSummary.cs
@@ -1,4 +1,4 @@
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.Summary.Detail
diff --git a/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs
index 2ec4caad7..8a99b41eb 100644
--- a/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs
+++ b/Server/Components/AICore/Context/Summary/Detail/DetailContextSummary.cs
@@ -1,4 +1,4 @@
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.Summary.Detail
diff --git a/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs
index 09674a866..a4f1f8334 100644
--- a/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs
+++ b/Server/Components/AICore/Context/Summary/Detail/EmployeeDetailContextSummary.cs
@@ -1,4 +1,4 @@
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.Summary.Detail
diff --git a/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs
index 6144af444..b55176c1e 100644
--- a/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs
+++ b/Server/Components/AICore/Context/Summary/Detail/OrganisationDetailContextSummary.cs
@@ -1,4 +1,4 @@
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.Summary.Detail
diff --git a/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs
index ad844f1f0..2c95c40d6 100644
--- a/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs
+++ b/Server/Components/AICore/Context/Summary/Detail/PersonDetailContextSummary.cs
@@ -1,4 +1,4 @@
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.Summary.Detail
diff --git a/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs b/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs
index 0e3efef5f..028c1a5c4 100644
--- a/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs
+++ b/Server/Components/AICore/Context/Summary/Detail/SupportConceptDetailContextSummary.cs
@@ -1,4 +1,4 @@
-using AICore.Context.Entry;
+using AICore.Context.Entry.Detail;
using BS.Shared.DataContracts;
namespace AICore.Context.Summary.Detail
diff --git a/Server/Components/AICore/Facade/LLM/BaseLLMApiClient.cs b/Server/Components/AICore/Facade/LLM/BaseLLMApiClient.cs
index 19daaded8..4e016d020 100644
--- a/Server/Components/AICore/Facade/LLM/BaseLLMApiClient.cs
+++ b/Server/Components/AICore/Facade/LLM/BaseLLMApiClient.cs
@@ -1,5 +1,4 @@
-using BeWo.ServiceUtils.Core;
-using BS.Shared.DataContracts.Feature.AI;
+using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
diff --git a/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs b/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs
index 8e2a0beff..dc2cc9960 100644
--- a/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs
+++ b/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs
@@ -6,8 +6,8 @@ using System.Collections.Generic;
using System;
using System.Linq;
using System.Net.Sockets;
-using BeWo.ServiceUtils.ApiFacade;
using System.Net;
+using BeWo.ServerUtils.ApiFacade;
namespace AICore.Facade.LLM
{
diff --git a/Server/Components/AICore/Facade/LLM/OpenWebApiClient.cs b/Server/Components/AICore/Facade/LLM/OpenWebApiClient.cs
index 3e51e29d7..9ef7bc061 100644
--- a/Server/Components/AICore/Facade/LLM/OpenWebApiClient.cs
+++ b/Server/Components/AICore/Facade/LLM/OpenWebApiClient.cs
@@ -1,4 +1,5 @@
-using BS.Shared.DataContracts;
+using BeWo.ServerUtils.ApiFacade;
+using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
using BS.Shared.Interface;
@@ -7,7 +8,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.Json;
-using BeWo.ServiceUtils.ApiFacade;
namespace AICore.Facade.LLM
{
diff --git a/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs b/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs
index ce51120b0..8af2c09e9 100644
--- a/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs
+++ b/Server/Components/AICore/Prompt/Core/AiPromptBuilder.cs
@@ -1,9 +1,6 @@
-using AICore.Context.Entry;
-using AICore.Context.Entry.Navigation;
-using AICore.Context.Summary;
-using AICore.Context.SummaryMapper;
+using AICore.Context.Summary;
using AICore.Context.SummaryParser;
-using BeWo.ServiceUtils.Core;
+using BeWo.ServerUtils.Core;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
diff --git a/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs b/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs
index 6fc4a4169..81d343add 100644
--- a/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs
+++ b/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs
@@ -17,7 +17,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
-namespace BeWo.ServiceUtils.ApiFacade
+namespace BeWo.ServerUtils.ApiFacade
{
public class HttpClientFacade
{
diff --git a/Server/Components/ServerUtils/ApiFacade/JsonHttpClientFacade.cs b/Server/Components/ServerUtils/ApiFacade/JsonHttpClientFacade.cs
index 25c6dd52e..4d934ebd8 100644
--- a/Server/Components/ServerUtils/ApiFacade/JsonHttpClientFacade.cs
+++ b/Server/Components/ServerUtils/ApiFacade/JsonHttpClientFacade.cs
@@ -2,7 +2,7 @@
using System.Net.Http;
using System.Threading.Tasks;
-namespace BeWo.ServiceUtils.ApiFacade
+namespace BeWo.ServerUtils.ApiFacade
{
public class JsonHttpClientFacade : HttpClientFacade
{
diff --git a/Server/Components/ServerUtils/ApiFacade/WebClientFacade.cs b/Server/Components/ServerUtils/ApiFacade/WebClientFacade.cs
index d12aa9f46..8c87776b2 100644
--- a/Server/Components/ServerUtils/ApiFacade/WebClientFacade.cs
+++ b/Server/Components/ServerUtils/ApiFacade/WebClientFacade.cs
@@ -9,7 +9,7 @@ using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
-namespace BeWo.ServiceUtils.ApiFacade
+namespace BeWo.ServerUtils.ApiFacade
{
public class WebClientFacade
{
diff --git a/Server/Components/ServerUtils/Core/MergedConfig.cs b/Server/Components/ServerUtils/Core/MergedConfig.cs
index a43636cbf..fa0b53c47 100644
--- a/Server/Components/ServerUtils/Core/MergedConfig.cs
+++ b/Server/Components/ServerUtils/Core/MergedConfig.cs
@@ -3,7 +3,7 @@ using System.Configuration;
using System.IO;
using System.Xml;
-namespace BeWo.ServiceUtils.Core
+namespace BeWo.ServerUtils.Core
{
public static class MergedConfig
{
diff --git a/Service/Plugins/AiService2.cs b/Service/Plugins/AiService2.cs
index 250056fea..eccf35c59 100644
--- a/Service/Plugins/AiService2.cs
+++ b/Service/Plugins/AiService2.cs
@@ -8,7 +8,6 @@ using System.Net;
using System.ServiceModel;
using System.Text;
using System.Web.Hosting;
-using AICore.Context.SummaryMapper;
using AICore.Prompt.Core;
using BeWo.Data.Access;
using BeWo.Data.Entities;
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 811716fef..90585785d 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -585,6 +585,10 @@
{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}
Data
+
+ {69D70CA9-0DF9-419E-BFAF-F4539F129BD9}
+ AICore
+
{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}
Shared
diff --git a/Service/ServiceUtils/AiContextLoader.cs b/Service/ServiceUtils/AiContextLoader.cs
index 99292497a..09534ab48 100644
--- a/Service/ServiceUtils/AiContextLoader.cs
+++ b/Service/ServiceUtils/AiContextLoader.cs
@@ -1,5 +1,4 @@
using AICore.Context.Summary;
-using AICore.Context.SummaryMapper;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
@@ -12,6 +11,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using AICore.Context.Core;
namespace BeWo.Service.ServiceUtils
{