Merge branch 'development'

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.3.289
+### Client
+* Update: Add Logging Policy Warning
+* Update: Create Private Server Link
+
+### Server
+* Update: Linux: Some issue in installation
+* Fix: Maintenance mode detection
+
 # v2.3.287
 ### Client
 * Update: Upgrade to .NET 6
@@ -301,3 +310,4 @@
 * Initial Release
 
 
+

Pub/PublishApp.ps1

@@ -80,16 +80,18 @@ if ($LASTEXITCODE -gt 0) { Throw "The publish exited with error code: " + $laste
 # create zip package and zip updater
 if ($withLauncher)
 {
-    $publishPackFileName = "$packageName.zip";
-    $publishPackFilePath = Join-Path $publishPackDir $publishPackFileName;
+    $publishPackFilePath = Join-Path $publishPackDir "$packageName.zip";
+    $publishPackFilePathTar = Join-Path $publishPackDir "$packageName.tar.gz";
     $publishPackInfoFilePath = Join-Path $publishPackDir "$packageName.json";
 
     Write-Host;
-    Write-Host "*** Packing $publishPackFilePath..." -BackgroundColor Blue -ForegroundColor White;
+    Write-Host "*** Packing (ZIP) $publishPackFilePath..." -BackgroundColor Blue -ForegroundColor White;
 
     New-Item -ItemType Directory -Force -Path $publishPackDir
     Remove-Item "$publishPackDir\*" -ErrorAction Ignore -Recurse;
     Compress-Archive -Path "$publishDir\*" -DestinationPath $publishPackFilePath;
+    tar -czvf $publishPackFilePathTar -C "$publishDir\" *
+
     $json | ConvertTo-Json -depth 100 | Out-File $publishPackInfoFilePath -Encoding utf8;
 
     #####

Pub/PublishApps.ps1

@@ -1,6 +1,7 @@
 param( 
 	[Parameter(Mandatory=$true)][object]$bump,
 	[Parameter(Mandatory=$true)][object]$nugets,
+	[Parameter(Mandatory=$true)][object]$client,
 	[Parameter(Mandatory=$true)][object]$android, 
 	[Parameter(Mandatory=$true)][object]$server,
 	[Parameter(Mandatory=$true)][object]$distribute
@@ -10,6 +11,7 @@ $bump = $bump -eq "1";
 $nugets = $nugets -eq "1";
 $android = $android -eq "1";
 $distribute = $distribute -eq "1";
+$client = $client -eq "1";
 $server = $server -eq "1";
 
 . "$PSScriptRoot/Common.ps1" -bump:$bump;
@@ -20,34 +22,37 @@ $noclean = $true;
 $noPushNuget = !$nugets
 
 Remove-Item "$packagesRootDir/ReleaseNote.txt" -ErrorAction Ignore;
-Remove-Item $packagesClientDir -ErrorAction Ignore -Recurse;
 
 # rebuild libraries
 & "$solutionDir\VpnHood.Common\_publish.ps1"
 & "$solutionDir\VpnHood.Tunneling\_publish.ps1"
 
 & "$solutionDir\VpnHood.Client\_publish.ps1"
+& "$solutionDir\VpnHood.Client.Device.Android\_publish.ps1"
 & "$solutionDir\VpnHood.Client.Device\_publish.ps1"
 & "$solutionDir\VpnHood.Client.Device.WinDivert\_publish.ps1"
-& "$solutionDir\VpnHood.Client.Device.Android\_publish.ps1"
-
 & "$solutionDir\VpnHood.Client.App\_publish.ps1"
 & "$solutionDir\VpnHood.Client.App.UI\_publish.ps1"
 
 & "$solutionDir\VpnHood.Server\_publish.ps1"
 & "$solutionDir\VpnHood.Server.Access\_publish.ps1"
 
+# publish client
+if ($client)
+{
+	Remove-Item $packagesClientDir -ErrorAction Ignore -Recurse;
+	& "$solutionDir/VpnHood.Client.App.Win/_publish.ps1";
+	& "$solutionDir/VpnHood.Client.App.Win.Setup/_publish.ps1";
+}
+
 # publish server
 if ($server)
 {	
 	Remove-Item $packagesServerDir -ErrorAction Ignore -Recurse;
 	& "$solutionDir/VpnHood.Server.App.Net/_publish.ps1" -ftp:$false;
 }
 
-# publish client
-& "$solutionDir/VpnHood.Client.App.Win/_publish.ps1";
-& "$solutionDir/VpnHood.Client.App.Win.Setup/_publish.ps1";
-
+# publish android
 if ($android)
 {	
 	& "$solutionDir/VpnHood.Client.App.Android/_publish.ps1";

Pub/PublishToGitHub.ps1

@@ -35,6 +35,7 @@ gh release create "$versionTag"`
 	$packagesClientDir/VpnHoodClient-win.txt  `
 	$packagesServerDir/VpnHoodServer.json `
 	$packagesServerDir/VpnHoodServer.zip `
+	$packagesServerDir/VpnHoodServer.tar.gz `
 	$packagesServerDir/install-linux.sh;
 Pop-Location
 

Pub/Version.json

@@ -1,6 +1,6 @@
 {
   "Major": 2,
   "Minor": 3,
-  "Build": 287,
-  "BumpTime": "2021-11-26T09:19:12.6689153Z"
+  "Build": 289,
+  "BumpTime": "2021-12-08T01:09:37.4870559Z"
 }

Samples/VpnHood.Samples.SimpleClient.Win/Program.cs

@@ -26,6 +26,10 @@ private static void Main()
             // connect to VpnHood server
             vpnHoodClient.Connect().Wait();
 
+            Console.ForegroundColor = ConsoleColor.Yellow;
+            Console.WriteLine("\nIP logging is enabled on these servers. Please follow United States law, especially if using torrent. Read privacy policy before use: https://github.com/vpnhood/VpnHood/blob/main/PRIVACY.md\n");
+            Console.ResetColor();
+
             Console.WriteLine("VpnHood Client Is Running! Open your browser and browse the Internet! Press Ctrl+C to stop.");
             while (vpnHoodClient.State != ClientState.Disposed)
                 Thread.Sleep(1000);

VpnHood.App.Launcher/VpnHood.App.Launcher.csproj

@@ -14,9 +14,9 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Product>VpnHood.App.Launcher</Product>
     <ApplicationIcon>Resources\VpnHood.ico</ApplicationIcon>
-    <Version>2.3.287</Version>
-    <AssemblyVersion>2.3.287</AssemblyVersion>
-    <FileVersion>2.3.287</FileVersion>
+    <Version>2.3.289</Version>
+    <AssemblyVersion>2.3.289</AssemblyVersion>
+    <FileVersion>2.3.289</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

VpnHood.Client.App.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="287" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.3.287">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="289" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.3.289">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="31" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />