diff --git a/AICore/AICore.csproj b/AICore/AICore.csproj
index d24e4bab3..1a2576420 100644
--- a/AICore/AICore.csproj
+++ b/AICore/AICore.csproj
@@ -34,12 +34,14 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
..\packages\System.IO.Pipelines.9.0.2\lib\net462\System.IO.Pipelines.dll
+
..\packages\System.Text.Encodings.Web.9.0.2\lib\net462\System.Text.Encodings.Web.dll
@@ -113,9 +115,9 @@
-
+
{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}
- ServiceUtils
+ ServerUtils
{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}
diff --git a/AICore/Facade/LLM/OllamaApiClient.cs b/AICore/Facade/LLM/OllamaApiClient.cs
index d7299f913..8e2a0beff 100644
--- a/AICore/Facade/LLM/OllamaApiClient.cs
+++ b/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 BS.Shared.ApiFacade;
namespace AICore.Facade.LLM
{
diff --git a/AICore/Facade/LLM/OpenWebApiClient.cs b/AICore/Facade/LLM/OpenWebApiClient.cs
index 8b73517fe..3e51e29d7 100644
--- a/AICore/Facade/LLM/OpenWebApiClient.cs
+++ b/AICore/Facade/LLM/OpenWebApiClient.cs
@@ -1,5 +1,4 @@
-using BS.Shared.ApiFacade;
-using BS.Shared.DataContracts;
+using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
using BS.Shared.Interface;
@@ -8,6 +7,7 @@ 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/BeWoAI.sln b/BeWoAI.sln
index 5bfbfe32a..d83c0dba8 100644
--- a/BeWoAI.sln
+++ b/BeWoAI.sln
@@ -47,7 +47,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{83
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AICore", "AICore\AICore.csproj", "{69D70CA9-0DF9-419E-BFAF-F4539F129BD9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceUtils", "ServiceUtils\ServiceUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerUtils", "ServiceUtils\ServerUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AI", "AI", "{084C391D-FCE1-4984-87FA-F8F9CFCC6A4F}"
EndProject
@@ -255,7 +255,7 @@ Global
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5} = {B331128C-7E9F-4BDC-B509-A8DAE1B94E5C}
{830D2912-108B-4946-A3BE-CE4ECD50819F} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{69D70CA9-0DF9-419E-BFAF-F4539F129BD9} = {830D2912-108B-4946-A3BE-CE4ECD50819F}
- {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {B6039E62-D43E-477A-BE82-EADB1057A3A2}
+ {EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{084C391D-FCE1-4984-87FA-F8F9CFCC6A4F} = {CCD6B644-49E7-4A11-BD8F-607088A4AC83}
{68C1F8EA-7828-4E46-8F04-91105C55860E} = {084C391D-FCE1-4984-87FA-F8F9CFCC6A4F}
EndGlobalSection
diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj
index d755a340c..615be4556 100644
--- a/Controls/Controls.csproj
+++ b/Controls/Controls.csproj
@@ -10,7 +10,7 @@
Properties
BeWo.Controls
BeWo.Controls
- v4.7.2
+ v4.5.2
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 17baa06ee..bb1fdf534 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -611,7 +611,6 @@
-
diff --git a/Shared/ApiFacade/HttpClientFacade.cs b/ServiceUtils/ApiFacade/HttpClientFacade.cs
similarity index 99%
rename from Shared/ApiFacade/HttpClientFacade.cs
rename to ServiceUtils/ApiFacade/HttpClientFacade.cs
index 73d94aea5..6fc4a4169 100644
--- a/Shared/ApiFacade/HttpClientFacade.cs
+++ b/ServiceUtils/ApiFacade/HttpClientFacade.cs
@@ -17,7 +17,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
-namespace BS.Shared.ApiFacade
+namespace BeWo.ServiceUtils.ApiFacade
{
public class HttpClientFacade
{
diff --git a/Shared/ApiFacade/JsonHttpClientFacade.cs b/ServiceUtils/ApiFacade/JsonHttpClientFacade.cs
similarity index 88%
rename from Shared/ApiFacade/JsonHttpClientFacade.cs
rename to ServiceUtils/ApiFacade/JsonHttpClientFacade.cs
index 13fbff7a5..25c6dd52e 100644
--- a/Shared/ApiFacade/JsonHttpClientFacade.cs
+++ b/ServiceUtils/ApiFacade/JsonHttpClientFacade.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using Newtonsoft.Json;
using System.Net.Http;
-using System.Text;
using System.Threading.Tasks;
-using System.IO;
-using Newtonsoft.Json;
-namespace BS.Shared.ApiFacade
+namespace BeWo.ServiceUtils.ApiFacade
{
public class JsonHttpClientFacade : HttpClientFacade
{
diff --git a/Shared/ApiFacade/WebClientFacade.cs b/ServiceUtils/ApiFacade/WebClientFacade.cs
similarity index 99%
rename from Shared/ApiFacade/WebClientFacade.cs
rename to ServiceUtils/ApiFacade/WebClientFacade.cs
index 1fd2bb2ab..d12aa9f46 100644
--- a/Shared/ApiFacade/WebClientFacade.cs
+++ b/ServiceUtils/ApiFacade/WebClientFacade.cs
@@ -9,7 +9,7 @@ using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
-namespace BS.Shared.ApiFacade
+namespace BeWo.ServiceUtils.ApiFacade
{
public class WebClientFacade
{
diff --git a/ServiceUtils/README.txt b/ServiceUtils/README.txt
new file mode 100644
index 000000000..9e89b12e8
--- /dev/null
+++ b/ServiceUtils/README.txt
@@ -0,0 +1,3 @@
+Dient als Shared Ersatz auf der Server Ebene für Objekte, die eins der folgenden Eigenschaften erfüllt:
+- Benötigt .NET 4.7.2 (ApiFacade)
+- MergedConfig (Wird an mehreren Stellen gebraucht, kann auch über Parameter übergeben werden theoretisch)
\ No newline at end of file
diff --git a/ServiceUtils/ServiceUtils.csproj b/ServiceUtils/ServerUtils.csproj
similarity index 92%
rename from ServiceUtils/ServiceUtils.csproj
rename to ServiceUtils/ServerUtils.csproj
index a7c327bc7..4916d26cb 100644
--- a/ServiceUtils/ServiceUtils.csproj
+++ b/ServiceUtils/ServerUtils.csproj
@@ -36,6 +36,7 @@
+
@@ -43,6 +44,9 @@
+
+
+
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 050f6897e..500607460 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Wohnhilfe;
using BS.Shared.Exceptions;
@@ -8,1177 +9,1161 @@ using BS.Shared.Translation;
namespace BS.Shared.Core
{
- public static class EnumTranslations
- {
+ public static class EnumTranslations
+ {
- public static Dictionary