GitHubProUser67 · wardjm · May 11, 2025 · May 12, 2025 · May 12, 2025 · May 12, 2025
diff --git a/.gitignore b/.gitignore
@@ -396,3 +396,6 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 *.sln.iml
+
+# Docker
+.env
diff --git a/README.docker b/README.docker
@@ -0,0 +1,30 @@
+# Docker
+
+To use docker, you must have docker/docker-compose installed on your machine. From within the directory (with the docker-compose.yml file):
+
+```
+$ docker compose up -d
+```
+
+This will build all the images locally and run them. To stop (from within the same directoy as docker-compose.yml file):
+
+```
+$ docker compose down
+```
+
+You can use these same commands from Windows shell or Linux shell (on Linux you may need to do something special to allow access to port 53 if a DNS application is already running).
+
+Configuration options can be set by using a .env file. Right now it basically contains nothing. But it can be used in the future when images are saved remotely.
+
+```
+$ cp example.env .env
+$ docker compose up -d
+```
+
+The docker compose command knows how to find and read a file named .env automatically. This file is added to .gitignore since it can contain personal info if you edit it to point to your own stuff.
+
+# TODO
+
+* Figure out where we want to publish the images
+* Add Registry back to docker-compose.yml
+* Add Registry to example.env
diff --git a/Servers/ApacheNet/ApacheNet.csproj b/Servers/ApacheNet/ApacheNet.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>
diff --git a/Servers/ApacheNet/Dockerfile b/Servers/ApacheNet/Dockerfile
@@ -5,16 +5,26 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["WebServers/MultiHTTP/MultiHTTP.csproj", "MultiHTTP/"]
-RUN dotnet restore "WebServers/MultiHTTP/MultiHTTP.csproj"
+COPY ["Servers/ApacheNet/ApacheNet.csproj", "Servers/ApacheNet/"]
+COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+COPY ["BackendServices/DNSLibrary/DNSLibrary.csproj", "BackendServices/DNSLibrary/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+COPY ["BackendServices/WatsonWebserver/WatsonWebserver.csproj", "BackendServices/WatsonWebserver/"]
+COPY ["BackendServices/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj", "BackendServices/SpaceWizards.HttpListener/"]
+RUN dotnet restore "Servers/ApacheNet/ApacheNet.csproj"
 COPY . .
-WORKDIR "/src/MultiHTTP"
-RUN dotnet build "MultiHTTP.csproj" -c Release -o /app/build
+WORKDIR "/src/Servers/ApacheNet"
+RUN dotnet build "ApacheNet.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "MultiHTTP.csproj" -c Release -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "ApacheNet.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "MultiHTTP.dll"]
+ENTRYPOINT ["dotnet", "ApacheNet.dll"]
diff --git a/Servers/Horizon/Dockerfile b/Servers/Horizon/Dockerfile
@@ -5,10 +5,21 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["SpecializedServers/Horizon/Horizon.csproj", "Horizon/"]
-RUN dotnet restore "SpecializedServers/Horizon/Horizon.csproj"
+COPY ["Servers/Horizon/Horizon.csproj", "Servers/Horizon/"]
+COPY ["AuxiliaryServices/HorizonService/HorizonService.csproj", "AuxiliaryServices/HorizonService/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"]
+COPY ["BackendServices/PS2FloatLibrary/PS2FloatLibrary.csproj", "BackendServices/PS2FloatLibrary/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+COPY ["BackendServices/WatsonWebserver/WatsonWebserver.csproj", "BackendServices/WatsonWebserver/"]
+COPY ["BackendServices/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj", "BackendServices/SpaceWizards.HttpListener/"]
+RUN dotnet restore "Servers/Horizon/Horizon.csproj"
 COPY . .
-WORKDIR "/src/Horizon"
+WORKDIR "/src/Servers/Horizon"
 RUN dotnet build "Horizon.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/Servers/Horizon/Horizon.csproj b/Servers/Horizon/Horizon.csproj
@@ -40,7 +40,7 @@
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
     <!-- Path to the JSON file you want to modify -->
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>
diff --git a/Servers/MitmDNS/Dockerfile b/Servers/MitmDNS/Dockerfile
@@ -5,10 +5,17 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["WebServers/MitmDNS/MitmDNS.csproj", "MitmDNS/"]
-RUN dotnet restore "WebServers/MitmDNS/MitmDNS.csproj"
+COPY ["Servers/MitmDNS/MitmDNS.csproj", "Servers/MitmDNS/"]
+COPY ["BackendServices/DNSLibrary/DNSLibrary.csproj", "BackendServices/DNSLibrary/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+RUN dotnet restore "Servers/MitmDNS/MitmDNS.csproj"
 COPY . .
-WORKDIR "/src/MitmDNS"
+WORKDIR "/src/Servers/MitmDNS"
 RUN dotnet build "MitmDNS.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/Servers/MitmDNS/MitmDNS.csproj b/Servers/MitmDNS/MitmDNS.csproj
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>
diff --git a/Servers/MultiSocks/Dockerfile b/Servers/MultiSocks/Dockerfile
@@ -5,10 +5,20 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["SpecializedServers/MultiSocks/MultiSocks.csproj", "MultiSocks/"]
-RUN dotnet restore "SpecializedServers/MultiSocks/MultiSocks.csproj"
+COPY ["Servers/MultiSocks/MultiSocks.csproj", "Servers/MultiSocks/"]
+COPY ["BlazeSDK/Blaze2SDK/Blaze2SDK.csproj", "BlazeSDK/Blaze2SDK/"]
+COPY ["BlazeSDK/BlazeCommon/BlazeCommon.csproj", "BlazeSDK/BlazeCommon/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BlazeSDK/Tdf/Tdf.csproj", "BlazeSDK/Tdf/"]
+COPY ["BlazeSDK/Blaze3SDK/Blaze3SDK.csproj", "BlazeSDK/Blaze3SDK/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+RUN dotnet restore "Servers/MultiSocks/MultiSocks.csproj"
 COPY . .
-WORKDIR "/src/MultiSocks"
+WORKDIR "/src/Servers/MultiSocks"
 RUN dotnet build "MultiSocks.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/Servers/MultiSocks/MultiSocks.csproj b/Servers/MultiSocks/MultiSocks.csproj
@@ -40,7 +40,7 @@
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
     <!-- Path to the JSON file you want to modify -->
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>
diff --git a/Servers/MultiSpy/Dockerfile b/Servers/MultiSpy/Dockerfile
@@ -5,10 +5,17 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["SpecializedServers/MultiSpy/MultiSpy.csproj", "MultiSpy/"]
-RUN dotnet restore "SpecializedServers/MultiSpy/MultiSpy.csproj"
+COPY ["Servers/MultiSpy/MultiSpy.csproj", "Servers/MultiSpy/"]
+COPY ["AuxiliaryServices/MultiSpyService/MultiSpyService.csproj", "AuxiliaryServices/MultiSpyService/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+RUN dotnet restore "Servers/MultiSpy/MultiSpy.csproj"
 COPY . .
-WORKDIR "/src/MultiSpy"
+WORKDIR "/src/Servers/MultiSpy"
 RUN dotnet build "MultiSpy.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/Servers/MultiSpy/MultiSpy.csproj b/Servers/MultiSpy/MultiSpy.csproj
@@ -56,7 +56,7 @@
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
     <!-- Path to the JSON file you want to modify -->
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>
diff --git a/Servers/QuazalServer/Dockerfile b/Servers/QuazalServer/Dockerfile
@@ -5,10 +5,17 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["SpecializedServers/QuazalServer/QuazalServer.csproj", "QuazalServer/"]
-RUN dotnet restore "SpecializedServers/QuazalServer/QuazalServer.csproj"
+COPY ["Servers/QuazalServer/QuazalServer.csproj", "Servers/QuazalServer/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+COPY ["AuxiliaryServices/AlcatrazService/AlcatrazService.csproj", "AuxiliaryServices/AlcatrazService/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+RUN dotnet restore "Servers/QuazalServer/QuazalServer.csproj"
 COPY . .
-WORKDIR "/src/QuazalServer"
+WORKDIR "/src/Servers/QuazalServer"
 RUN dotnet build "QuazalServer.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/Servers/QuazalServer/QuazalServer.csproj b/Servers/QuazalServer/QuazalServer.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-	<DockerfileRunArguments>-p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535</DockerfileRunArguments>
+	<DockerfileRunArguments>-p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30550:30550 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535</DockerfileRunArguments>
 	<ApplicationIcon>QuazalServer.ico</ApplicationIcon>
 	<ServerGarbageCollection>true</ServerGarbageCollection>
 	<DockerfileContext>..\..</DockerfileContext>
@@ -37,7 +37,7 @@
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
     <!-- Path to the JSON file you want to modify -->
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>
diff --git a/Servers/SSFWServer/Dockerfile b/Servers/SSFWServer/Dockerfile
@@ -5,10 +5,19 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["SpecializedServers/SSFWServer/SSFWServer.csproj", "SSFWServer/"]
-RUN dotnet restore "SpecializedServers/SSFWServer/SSFWServer.csproj"
+COPY ["Servers/SSFWServer/SSFWServer.csproj", "Servers/SSFWServer/"]
+COPY ["AuxiliaryServices/HomeTools/HomeTools.csproj", "AuxiliaryServices/HomeTools/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"]
+COPY ["BackendServices/NetCoreServer/NetCoreServer.csproj", "BackendServices/NetCoreServer/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+RUN dotnet restore "Servers/SSFWServer/SSFWServer.csproj"
 COPY . .
-WORKDIR "/src/SSFWServer"
+WORKDIR "/src/Servers/SSFWServer"
 RUN dotnet build "SSFWServer.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/Servers/SSFWServer/SSFWServer.csproj b/Servers/SSFWServer/SSFWServer.csproj
@@ -39,7 +39,7 @@
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
     <!-- Path to the JSON file you want to modify -->
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>
diff --git a/Servers/SVO/Dockerfile b/Servers/SVO/Dockerfile
@@ -5,10 +5,20 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["SpecializedServers/SVO/SVO.csproj", "SVO/"]
-RUN dotnet restore "SpecializedServers/SVO/SVO.csproj"
+COPY ["Servers/SVO/SVO.csproj", "Servers/SVO/"]
+COPY ["AuxiliaryServices/HorizonService/HorizonService.csproj", "AuxiliaryServices/HorizonService/"]
+COPY ["BackendServices/NetworkLibrary/NetworkLibrary.csproj", "BackendServices/NetworkLibrary/"]
+COPY ["BackendServices/CastleLibrary/CastleLibrary.csproj", "BackendServices/CastleLibrary/"]
+COPY ["BackendServices/CustomLogger/CustomLogger.csproj", "BackendServices/CustomLogger/"]
+COPY ["BackendServices/EndianTools/EndianTools.csproj", "BackendServices/EndianTools/"]
+COPY ["BackendServices/CompressionLibrary/CompressionLibrary.csproj", "BackendServices/CompressionLibrary/"]
+COPY ["AuxiliaryServices/WebAPIService/WebAPIService.csproj", "AuxiliaryServices/WebAPIService/"]
+COPY ["BackendServices/TechnitiumLibrary.Net.Firewall/TechnitiumLibrary.Net.Firewall.csproj", "BackendServices/TechnitiumLibrary.Net.Firewall/"]
+COPY ["BackendServices/WatsonWebserver/WatsonWebserver.csproj", "BackendServices/WatsonWebserver/"]
+COPY ["BackendServices/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj", "BackendServices/SpaceWizards.HttpListener/"]
+RUN dotnet restore "Servers/SVO/SVO.csproj"
 COPY . .
-WORKDIR "/src/SVO"
+WORKDIR "/src/Servers/SVO"
 RUN dotnet build "SVO.csproj" -c Release -o /app/build
 
 FROM build AS publish

diff --git a/Servers/SVO/SVO.csproj b/Servers/SVO/SVO.csproj
@@ -38,7 +38,7 @@
 
   <Target Name="ModifyDepsFile" AfterTargets="AfterBuild">
     <!-- Path to the JSON file you want to modify -->
-    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)DepsFixer.ps1&quot; -jsonFilePath $(OutDir)$(ProjectName).deps.json -targetFramework $(TargetFramework)" />
   </Target>
 
 </Project>