Restructure

djacidfx · Dec 14, 2024 · 885746a · 885746a
1 parent de53455
commit 885746a
Show file tree

Hide file tree

Showing 570 changed files with 1,468 additions and 1,492 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -535,7 +535,7 @@
 * Update: Improve Session Management
 
 ### Developer
-* Update: Move VpnHood.Client.WebUI to a standalone repo
+* Update: Move VpnHood.Core.Client.WebUI to a standalone repo
 
 # v2.4.299
 ### Client
@@ -882,7 +882,7 @@
 
 ### Developer
 * Change: Update TcpDatagramHeader from binary to TcpDatagramChannelRequest json
-* Change: Move IDevice and IPacketCapture to VpnHood.Client.Device module
+* Change: Move IDevice and IPacketCapture to VpnHood.Core.Client.Device module
 * Developer: Add Simple Sample for Windows Client usage
 * Developer: Fix PublishApps.ps1 scripts to create publish folder when it does not exist
 
@@ -898,7 +898,7 @@
 ### Client
 * Update: Add client prefix to Bug Report File Name
 * Update: Close Bug Report bottom page after sending report
-* Update: Separate SPA from VpnHood.AppFramework.UI. Make it easier for developers to use custom SPA
+* Update: Separate SPA from VpnHood.AppLibs.UI. Make it easier for developers to use custom SPA
 * Update: Change Anonymous IP masking from *.*.x.x to "*.x.x.*"
 * Update: Diagnose set Last error to "Diagnose has been finished" if there is not other error
 * Fix: Dark Icon

diff --git a/Pub/PublishApps.ps1 b/Pub/PublishApps.ps1
@@ -32,62 +32,62 @@ Remove-Item "$packagesRootDir/ReleaseNote.txt" -ErrorAction Ignore;
 
 # rebuild libraries
 if ($nugets) {
-	& "$solutionDir/Core/VpnHood.Common/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Tunneling/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Client/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Client.Device.Android/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Client.Device/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Client.Device.WinDivert/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Server/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Server.Access/_publish.ps1";
-	& "$solutionDir/Core/VpnHood.Server.Access.FileAccessManager/_publish.ps1";
-
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Abstractions/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Resources/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.WebServer/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Store/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.Common/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.GooglePlay/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.GooglePlay.Core/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.Ads.AdMob/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Win.Common/_publish.ps1";
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Win.Common.WpfSpa/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Common/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Tunneling/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Client/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Client.Device.Android/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Client.Device/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Client.Device.WinDivert/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Server/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Server.Access/_publish.ps1";
+	& "$solutionDir/Core/VpnHood.Core.Server.Access.FileAccessManager/_publish.ps1";
+
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Abstractions/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Resources/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.WebServer/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Store/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Android.Common/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Android.GooglePlay/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Android.GooglePlay.Core/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Android.Ads.AdMob/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Win.Common/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Win.Common.WpfSpa/_publish.ps1";
 }
 
 # publish MAUI nugets
 if ($maui) {
-	& "$solutionDir/AppFramework/VpnHood.AppFramework.Maui.Common/_publish.ps1";
+	& "$solutionDir/AppLibs/VpnHood.AppLibs.Maui.Common/_publish.ps1";
 }
 
 # publish win client
 if ($clientWin) {
-	& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Win.Client/_publish.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.AppLibs.Win.Client/_publish.ps1";
 }
 
 # publish win client
 if ($connectWin) {
-	& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Win.Connect/_publish.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.AppLibs.Win.Connect/_publish.ps1";
 }
 
 # publish server
 if ($server) {	
-	& "$solutionDir/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_win.ps1";
-	& "$solutionDir/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_linux_x64.ps1";
-	& "$solutionDir/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_linux_arm64.ps1";
-	& "$solutionDir/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_docker.ps1" -distribute $distribute;
+	& "$solutionDir/VpnHood.Apps/VpnHood.Core.Server.App.Net/Pub/publish_win.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.Core.Server.App.Net/Pub/publish_linux_x64.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.Core.Server.App.Net/Pub/publish_linux_arm64.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.Core.Server.App.Net/Pub/publish_docker.ps1" -distribute $distribute;
 }
 
 # publish android
 if ($clientAndroid) {	
-	& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Client.Google/_publish.ps1";
-	& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Client.Web/_publish.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.AppLibs.Android.Client.Google/_publish.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.AppLibs.Android.Client.Web/_publish.ps1";
 }
 
 # publish android
 if ($connectAndroid) {	
-	& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Connect.Google/_publish.ps1";
-	& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Connect.Web/_publish.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.AppLibs.Android.Connect.Google/_publish.ps1";
+	& "$solutionDir/VpnHood.Apps/VpnHood.AppLibs.Android.Connect.Web/_publish.ps1";
 }
 
 
@@ -101,5 +101,5 @@ if ($distribute) {
 
 # update and push samples nugets
 if ($samples) {
-	& "$solutionDir/../VpnHood.Client.Samples/UpdateAndPush.ps1";
+	& "$solutionDir/../VpnHood.Core.Client.Samples/UpdateAndPush.ps1";
 }
diff --git a/Pub/PublishToGitHub.ps1 b/Pub/PublishToGitHub.ps1
@@ -91,7 +91,7 @@ if ($connectRepo) {
 	Write-Host "*** Publish MainRepo releases" -BackgroundColor Blue
 
 	# set Connect Variables
-	$connectRepoDir = Join-Path $vhDir "VpnHood.AppFramework.Connect";
+	$connectRepoDir = Join-Path $vhDir "VpnHood.AppLibs.Connect";
 	$androidGoogleLatestDir = Join-Path $connectRepoDir "pub/Android.GooglePlay/apk/latest";
 
 	# Publishing to GitHub

diff --git a/Src/AppFramework/VpnHood.AppFramework.Resources/IpLocations.zip b/Src/AppFramework/VpnHood.AppFramework.Resources/IpLocations.zip
diff --git a/Src/AppFramework/VpnHood.AppFramework/VpnHood.AppFramework.csproj b/Src/AppFramework/VpnHood.AppFramework/VpnHood.AppFramework.csproj
diff --git a/Src/AppLibs/New Text Document.ps1 b/Src/AppLibs/New Text Document.ps1
@@ -0,0 +1,20 @@
+# Set the root directory
+$rootDir = "VpnHood.AppFramework.Android.Common"
+
+# Rename folders
+Get-ChildItem -Path $rootDir -Recurse -Directory -Force | ForEach-Object {
+    if ($_.Name -like "*AppFramework*") {
+        $newName = $_.Name -replace "AppFramework", "AppLibs"
+        Rename-Item -Path $_.FullName -NewName $newName
+    }
+}
+
+# Rename files
+Get-ChildItem -Path $rootDir -Recurse -File -Force | ForEach-Object {
+    if ($_.Name -like "*AppFramework*") {
+        $newName = $_.Name -replace "AppFramework", "AppLibs"
+        Rename-Item -Path $_.FullName -NewName $newName
+    }
+}
+
+Write-Host "Renaming completed!"
diff --git a/...d.AppFramework.Abstractions/AppAccount.cs → ...pnHood.AppLibs.Abstractions/AppAccount.cs b/...d.AppFramework.Abstractions/AppAccount.cs → ...pnHood.AppLibs.Abstractions/AppAccount.cs
@@ -1,4 +1,4 @@
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public class AppAccount
 {

diff --git a/...od.AppFramework.Abstractions/AppAdType.cs → ...VpnHood.AppLibs.Abstractions/AppAdType.cs b/...od.AppFramework.Abstractions/AppAdType.cs → ...VpnHood.AppLibs.Abstractions/AppAdType.cs
@@ -1,4 +1,4 @@
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public enum AppAdType
 {

diff --git a/...work.Abstractions/BillingPurchaseState.cs → ...Libs.Abstractions/BillingPurchaseState.cs b/...work.Abstractions/BillingPurchaseState.cs → ...Libs.Abstractions/BillingPurchaseState.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 //todo: remove
 [JsonConverter(typeof(JsonStringEnumConverter))]

diff --git a/...ework.Abstractions/IAppAccountProvider.cs → ...pLibs.Abstractions/IAppAccountProvider.cs b/...ework.Abstractions/IAppAccountProvider.cs → ...pLibs.Abstractions/IAppAccountProvider.cs
@@ -1,4 +1,4 @@
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppAccountProvider
 {

diff --git a/...pFramework.Abstractions/IAppAdProvider.cs → ...od.AppLibs.Abstractions/IAppAdProvider.cs b/...pFramework.Abstractions/IAppAdProvider.cs → ...od.AppLibs.Abstractions/IAppAdProvider.cs
@@ -1,6 +1,6 @@
-using VpnHood.Client.Device;
+using VpnHood.Core.Client.Device;
 
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppAdProvider : IDisposable
 {

diff --git a/...ons/IAppAuthenticationExternalProvider.cs → ...ons/IAppAuthenticationExternalProvider.cs b/...ons/IAppAuthenticationExternalProvider.cs → ...ons/IAppAuthenticationExternalProvider.cs
@@ -1,6 +1,6 @@
-using VpnHood.Client.Device;
+using VpnHood.Core.Client.Device;
 
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppAuthenticationExternalProvider : IDisposable
 {

diff --git a/...bstractions/IAppAuthenticationProvider.cs → ...bstractions/IAppAuthenticationProvider.cs b/...bstractions/IAppAuthenticationProvider.cs → ...bstractions/IAppAuthenticationProvider.cs
@@ -1,6 +1,6 @@
-using VpnHood.Client.Device;
+using VpnHood.Core.Client.Device;
 
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppAuthenticationProvider : IDisposable
 {

diff --git a/...ework.Abstractions/IAppBillingProvider.cs → ...pLibs.Abstractions/IAppBillingProvider.cs b/...ework.Abstractions/IAppBillingProvider.cs → ...pLibs.Abstractions/IAppBillingProvider.cs
@@ -1,6 +1,6 @@
-using VpnHood.Client.Device;
+using VpnHood.Core.Client.Device;
 
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppBillingProvider : IDisposable
 {

diff --git a/...ework.Abstractions/IAppCultureProvider.cs → ...pLibs.Abstractions/IAppCultureProvider.cs b/...ework.Abstractions/IAppCultureProvider.cs → ...pLibs.Abstractions/IAppCultureProvider.cs
@@ -1,4 +1,4 @@
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppCultureProvider
 {

diff --git a/...pFramework.Abstractions/IAppUiProvider.cs → ...od.AppLibs.Abstractions/IAppUiProvider.cs b/...pFramework.Abstractions/IAppUiProvider.cs → ...od.AppLibs.Abstractions/IAppUiProvider.cs
@@ -1,6 +1,6 @@
-using VpnHood.Client.Device;
+using VpnHood.Core.Client.Device;
 
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppUiProvider
 {

diff --git a/...ework.Abstractions/IAppUpdaterProvider.cs → ...pLibs.Abstractions/IAppUpdaterProvider.cs b/...ework.Abstractions/IAppUpdaterProvider.cs → ...pLibs.Abstractions/IAppUpdaterProvider.cs
@@ -1,6 +1,6 @@
-using VpnHood.Client.Device;
+using VpnHood.Core.Client.Device;
 
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public interface IAppUpdaterProvider
 {

diff --git a/...ramework.Abstractions/SubscriptionPlan.cs → ....AppLibs.Abstractions/SubscriptionPlan.cs b/...ramework.Abstractions/SubscriptionPlan.cs → ....AppLibs.Abstractions/SubscriptionPlan.cs
@@ -1,4 +1,4 @@
-namespace VpnHood.AppFramework.Abstractions;
+namespace VpnHood.AppLibs.Abstractions;
 
 public class SubscriptionPlan
 {

diff --git a/.../VpnHood.AppFramework.Abstractions.csproj → ...tions/VpnHood.AppLibs.Abstractions.csproj b/.../VpnHood.AppFramework.Abstractions.csproj → ...tions/VpnHood.AppLibs.Abstractions.csproj
@@ -24,7 +24,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\Core\VpnHood.Client.Device\VpnHood.Client.Device.csproj" />
+		<ProjectReference Include="..\..\Core\VpnHood.Core.Client.Device\VpnHood.Core.Client.Device.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...od.AppFramework.Abstractions/_publish.ps1 → ...VpnHood.AppLibs.Abstractions/_publish.ps1 b/...od.AppFramework.Abstractions/_publish.ps1 → ...VpnHood.AppLibs.Abstractions/_publish.ps1
diff --git a/...droid.Ads.AdMob/AdMobAppOpenAdProvider.cs → ...droid.Ads.AdMob/AdMobAppOpenAdProvider.cs b/...droid.Ads.AdMob/AdMobAppOpenAdProvider.cs → ...droid.Ads.AdMob/AdMobAppOpenAdProvider.cs
@@ -1,14 +1,14 @@
 using Android.Gms.Ads;
 using Android.Gms.Ads.AppOpen;
-using VpnHood.AppFramework.Abstractions;
-using VpnHood.AppFramework.Exceptions;
-using VpnHood.AppFramework.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
-using VpnHood.Client.Device;
-using VpnHood.Client.Device.Droid;
-using VpnHood.Client.Device.Droid.Utils;
-using VpnHood.Common.Exceptions;
-
-namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;
+using VpnHood.AppLibs.Abstractions;
+using VpnHood.AppLibs.Exceptions;
+using VpnHood.AppLibs.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
+using VpnHood.Core.Client.Device;
+using VpnHood.Core.Client.Device.Droid;
+using VpnHood.Core.Client.Device.Droid.Utils;
+using VpnHood.Core.Common.Exceptions;
+
+namespace VpnHood.AppLibs.Droid.Ads.VhAdMob;
 
 public class AdMobAppOpenAdProvider(string adUnitId) : IAppAdProvider
 {

diff --git a/....Ads.AdMob/AdMobInterstitialAdProvider.cs → ....Ads.AdMob/AdMobInterstitialAdProvider.cs b/....Ads.AdMob/AdMobInterstitialAdProvider.cs → ....Ads.AdMob/AdMobInterstitialAdProvider.cs
@@ -1,13 +1,13 @@
 using Android.Gms.Ads;
 using Android.Gms.Ads.Interstitial;
-using VpnHood.AppFramework.Abstractions;
-using VpnHood.AppFramework.Exceptions;
-using VpnHood.Client.Device;
-using VpnHood.Client.Device.Droid;
-using VpnHood.Client.Device.Droid.Utils;
-using VpnHood.Common.Exceptions;
-
-namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;
+using VpnHood.AppLibs.Abstractions;
+using VpnHood.AppLibs.Exceptions;
+using VpnHood.Core.Client.Device;
+using VpnHood.Core.Client.Device.Droid;
+using VpnHood.Core.Client.Device.Droid.Utils;
+using VpnHood.Core.Common.Exceptions;
+
+namespace VpnHood.AppLibs.Droid.Ads.VhAdMob;
 
 public class AdMobInterstitialAdProvider(string adUnitId) : IAppAdProvider
 {

diff --git a/...roid.Ads.AdMob/AdMobRewardedAdProvider.cs → ...roid.Ads.AdMob/AdMobRewardedAdProvider.cs b/...roid.Ads.AdMob/AdMobRewardedAdProvider.cs → ...roid.Ads.AdMob/AdMobRewardedAdProvider.cs
@@ -1,13 +1,13 @@
 using Android.Gms.Ads;
 using Android.Gms.Ads.Rewarded;
-using VpnHood.AppFramework.Abstractions;
-using VpnHood.AppFramework.Exceptions;
-using VpnHood.Client.Device;
-using VpnHood.Client.Device.Droid;
-using VpnHood.Client.Device.Droid.Utils;
-using VpnHood.Common.Exceptions;
-
-namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;
+using VpnHood.AppLibs.Abstractions;
+using VpnHood.AppLibs.Exceptions;
+using VpnHood.Core.Client.Device;
+using VpnHood.Core.Client.Device.Droid;
+using VpnHood.Core.Client.Device.Droid.Utils;
+using VpnHood.Core.Common.Exceptions;
+
+namespace VpnHood.AppLibs.Droid.Ads.VhAdMob;
 
 public class AdMobRewardedAdProvider(string adUnitId) : IAppAdProvider
 {

diff --git a/...pFramework.Android.Ads.AdMob/AdMobUtil.cs → ...od.AppLibs.Android.Ads.AdMob/AdMobUtil.cs b/...pFramework.Android.Ads.AdMob/AdMobUtil.cs → ...od.AppLibs.Android.Ads.AdMob/AdMobUtil.cs
@@ -1,10 +1,10 @@
 using Android.Content;
 using Android.Gms.Ads;
 using Android.Gms.Ads.Initialization;
-using VpnHood.Common.Exceptions;
-using VpnHood.Common.Utils;
+using VpnHood.Core.Common.Exceptions;
+using VpnHood.Core.Common.Utils;
 
-namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;
+namespace VpnHood.AppLibs.Droid.Ads.VhAdMob;
 
 public class AdMobUtil
 {