restructure Server.Apps

djacidfx · Dec 14, 2024 · 3719ba4 · 3719ba4
1 parent 0124fee
commit 3719ba4
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 35 deletions.
diff --git a/Src/Apps/Server.Net/AppSettings.cs b/Src/Apps/Server.Net/AppSettings.cs
@@ -4,7 +4,7 @@
 using VpnHood.Server.Access.Managers.FileAccessManagers;
 using VpnHood.Server.Access.Managers.HttpAccessManagers;
 
-namespace VpnHood.Server.App;
+namespace VpnHood.Apps.Server;
 
 public class AppSettings
 {

diff --git a/Src/Apps/Server.Net/FileAccessManagerCommand.cs b/Src/Apps/Server.Net/FileAccessManagerCommand.cs
@@ -3,7 +3,7 @@
 using VpnHood.Common.Utils;
 using VpnHood.Server.Access.Managers.FileAccessManagers;
 
-namespace VpnHood.Server.App;
+namespace VpnHood.Apps.Server;
 
 public class FileAccessManagerCommand(FileAccessManager fileAccessManager)
 {

diff --git a/Src/Apps/Server.Net/Program.cs b/Src/Apps/Server.Net/Program.cs
@@ -1,6 +1,6 @@
 using VpnHood.Common.Utils;
 
-namespace VpnHood.Server.App;
+namespace VpnHood.Apps.Server;
 
 internal class Program
 {

diff --git a/Src/Apps/Server.Net/Providers/Linux/LinuxNetConfigurationProvider.cs b/Src/Apps/Server.Net/Providers/Linux/LinuxNetConfigurationProvider.cs
@@ -4,7 +4,7 @@
 using VpnHood.Common.Net;
 using VpnHood.Server.Abstractions;
 
-namespace VpnHood.Server.App.Providers.Linux;
+namespace VpnHood.Apps.Server.Providers.Linux;
 
 
 // add & remove ip address for linux server

diff --git a/Src/Apps/Server.Net/Providers/Linux/LinuxSwapMemoryProvider.cs b/Src/Apps/Server.Net/Providers/Linux/LinuxSwapMemoryProvider.cs
@@ -1,9 +1,10 @@
 using Microsoft.Extensions.Logging;
 using VpnHood.Common.Utils;
 using VpnHood.Server.Abstractions;
+
 // ReSharper disable StringLiteralTypo
 
-namespace VpnHood.Server.App.Providers.Linux;
+namespace VpnHood.Apps.Server.Providers.Linux;
 
 public class LinuxSwapMemoryProvider(ILogger logger)
     : ISwapMemoryProvider

diff --git a/Src/Apps/Server.Net/Providers/Linux/LinuxSystemInfoProvider.cs b/Src/Apps/Server.Net/Providers/Linux/LinuxSystemInfoProvider.cs
@@ -3,7 +3,7 @@
 using VpnHood.Common.Logging;
 using VpnHood.Server.SystemInformation;
 
-namespace VpnHood.Server.App.Providers.Linux;
+namespace VpnHood.Apps.Server.Providers.Linux;
 
 public class LinuxSystemInfoProvider : ISystemInfoProvider
 {

diff --git a/Src/Apps/Server.Net/Providers/Linux/LinuxUtils.cs b/Src/Apps/Server.Net/Providers/Linux/LinuxUtils.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics;
-namespace VpnHood.Server.App.Providers.Linux;
+
+namespace VpnHood.Apps.Server.Providers.Linux;
 
 internal class LinuxUtils
 {

diff --git a/Src/Apps/Server.Net/Providers/Win/WinSystemInfoProvider.cs b/Src/Apps/Server.Net/Providers/Win/WinSystemInfoProvider.cs
@@ -9,7 +9,7 @@
 // ReSharper disable MemberCanBePrivate.Local
 // ReSharper disable StructCanBeMadeReadOnly
 
-namespace VpnHood.Server.App.Providers.Win;
+namespace VpnHood.Apps.Server.Providers.Win;
 
 public class WinSystemInfoProvider : ISystemInfoProvider
 {

diff --git a/Src/Apps/Server.Net/ServerApp.cs b/Src/Apps/Server.Net/ServerApp.cs
@@ -6,22 +6,23 @@
 using Microsoft.Extensions.Logging;
 using NLog;
 using NLog.Extensions.Logging;
+using VpnHood.Apps.Server.Providers.Linux;
+using VpnHood.Apps.Server.Providers.Win;
 using VpnHood.Common;
 using VpnHood.Common.Exceptions;
 using VpnHood.Common.Logging;
 using VpnHood.Common.Net;
 using VpnHood.Common.Utils;
+using VpnHood.Server;
 using VpnHood.Server.Abstractions;
 using VpnHood.Server.Access.Managers;
 using VpnHood.Server.Access.Managers.FileAccessManagers;
 using VpnHood.Server.Access.Managers.HttpAccessManagers;
-using VpnHood.Server.App.Providers.Linux;
-using VpnHood.Server.App.Providers.Win;
 using VpnHood.Server.SystemInformation;
 using VpnHood.Tunneling;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
-namespace VpnHood.Server.App;
+namespace VpnHood.Apps.Server;
 
 public class ServerApp : IDisposable
 {

diff --git a/.../Server.Net/VpnHood.Server.App.Net.csproj → ...Server.Net/VpnHood.Apps.Server.Net.csproj b/.../Server.Net/VpnHood.Server.App.Net.csproj → ...Server.Net/VpnHood.Apps.Server.Net.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk;Microsoft.NET.Sdk.Publish">
 	<PropertyGroup>
 		<Description>VpnHood Server App.</Description>
-		<RootNamespace>VpnHood.Server.App</RootNamespace>
+		<RootNamespace>VpnHood.Apps.Server</RootNamespace>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

diff --git a/VpnHood.sln b/VpnHood.sln
@@ -100,8 +100,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.AppFramework.Win.Co
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.AppFramework.Abstractions", "Src\AppFramework\VpnHood.AppFramework.Abstractions\VpnHood.AppFramework.Abstractions.csproj", "{8B43FFE3-A9C1-4C78-8AEF-D31B53094332}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Server.App.Net", "Src\Apps\Server.Net\VpnHood.Server.App.Net.csproj", "{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Apps.Client.Win.Web", "Src\Apps\Client.Win.Web\VpnHood.Apps.Client.Win.Web.csproj", "{D8E79521-95FF-4AB4-87C9-3EC0531209B1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Apps.Connect.Android.Google", "Src\Apps\Connect.Android.Google\VpnHood.Apps.Connect.Android.Google.csproj", "{66A70D5B-0E5C-41AB-821D-A37F49FD76DE}"
@@ -112,6 +110,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{E073E9E7-230
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.AppFramework", "Src\AppFramework\VpnHood.AppFramework\VpnHood.AppFramework.csproj", "{670BD4A2-EEEB-427E-9F83-47C3ED1DBA14}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Apps.Server.Net", "Src\Apps\Server.Net\VpnHood.Apps.Server.Net.csproj", "{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -666,26 +666,6 @@ Global
 		{8B43FFE3-A9C1-4C78-8AEF-D31B53094332}.Release|x64.Build.0 = Release|Any CPU
 		{8B43FFE3-A9C1-4C78-8AEF-D31B53094332}.Release|x86.ActiveCfg = Release|Any CPU
 		{8B43FFE3-A9C1-4C78-8AEF-D31B53094332}.Release|x86.Build.0 = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|x64.Build.0 = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Debug|x86.Build.0 = Debug|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|ARM.Build.0 = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|ARM64.Build.0 = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|x64.ActiveCfg = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|x64.Build.0 = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|x86.ActiveCfg = Release|Any CPU
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C}.Release|x86.Build.0 = Release|Any CPU
 		{D8E79521-95FF-4AB4-87C9-3EC0531209B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8E79521-95FF-4AB4-87C9-3EC0531209B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8E79521-95FF-4AB4-87C9-3EC0531209B1}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -786,6 +766,26 @@ Global
 		{670BD4A2-EEEB-427E-9F83-47C3ED1DBA14}.Release|x64.Build.0 = Release|Any CPU
 		{670BD4A2-EEEB-427E-9F83-47C3ED1DBA14}.Release|x86.ActiveCfg = Release|Any CPU
 		{670BD4A2-EEEB-427E-9F83-47C3ED1DBA14}.Release|x86.Build.0 = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|ARM.Build.0 = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|x64.Build.0 = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Debug|x86.Build.0 = Debug|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|ARM.ActiveCfg = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|ARM.Build.0 = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|ARM64.Build.0 = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|x64.ActiveCfg = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|x64.Build.0 = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -824,11 +824,11 @@ Global
 		{F1E6E171-BB5C-41CE-8E36-A18A6C518473} = {BD1C4F74-C48B-4302-90C3-0B7243C0DD20}
 		{9C761B01-2DEC-42C0-A1BF-83930CD42E38} = {BD1C4F74-C48B-4302-90C3-0B7243C0DD20}
 		{8B43FFE3-A9C1-4C78-8AEF-D31B53094332} = {B3EAE8F1-8ECF-4FC9-9941-28F65A2E7F3E}
-		{3DBA63B3-C2C8-4708-AEC7-AC40EF0BF49C} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}
 		{D8E79521-95FF-4AB4-87C9-3EC0531209B1} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}
 		{66A70D5B-0E5C-41AB-821D-A37F49FD76DE} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}
 		{E88F37AE-0672-464F-AF18-C29720054F3F} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}
 		{670BD4A2-EEEB-427E-9F83-47C3ED1DBA14} = {B3EAE8F1-8ECF-4FC9-9941-28F65A2E7F3E}
+		{FDCDD4D4-995F-4B48-A0D1-D9C92AAEE771} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {19BAEB35-FD38-4E41-9963-46313AF87C41}