Merge branch 'development'

vpnhood · Jan 28, 2023 · 3b8bf42 · 3b8bf42
2 parents c174fa2 + e2c05eb
commit 3b8bf42
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
 # v2.6.342
 ### Client
 * Fix: UDP port memory leak
-* Feature: Notify when new version is available
-* Update: Add build version on top right of screen
-* Update: Winodws: Switch to MSI package to prevent False positive virus detection
+* Feature: Notify when a new version is available
+* Update: Add the build version on the top right of the screen
+* Update: Windows: Switch to MSI package to prevent False positive virus detection
 
 ### Server
 * Fix: UDP port memory leak

diff --git a/Pub/Version.json b/Pub/Version.json
@@ -1,8 +1,8 @@
 {
   "Major": 2,
   "Minor": 6,
-  "Build": 342,
-  "BumpTime": "2023-01-27T18:07:28.8588504Z",
+  "Build": 344,
+  "BumpTime": "2023-01-28T00:07:43.7571315Z",
   "Prerelease": false,
   "DeprecatedVersion": "2.0.0"
 }
diff --git a/VpnHood.Client.App.Android/Assets/SPA.zip b/VpnHood.Client.App.Android/Assets/SPA.zip
diff --git a/VpnHood.Client.App.Android/Properties/AndroidManifest.xml b/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="342" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.6.342">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="344" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.6.344">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="33" />
   <uses-feature android:name="android.software.leanback" android:required="false" />
   <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

diff --git a/VpnHood.Client.App.Android/_publish.ps1 b/VpnHood.Client.App.Android/_publish.ps1
@@ -1,7 +1,7 @@
 . "$PSScriptRoot/../Pub/Common.ps1"
 
 Write-Host "";
-Write-Host "*** Creating Android Bundle AAB ..." -BackgroundColor Blue -ForegroundColor White;
+Write-Host "*** Publishing Android ..." -BackgroundColor Blue -ForegroundColor White;
 
 $projectDir = $PSScriptRoot
 $projectFile = (Get-ChildItem -path $projectDir -file -Filter "*.csproj").FullName;
@@ -33,11 +33,6 @@ $xmlDoc.save($manifestFile);
 $packageId = $xmlDoc.manifest.package;
 $signedApk= Join-Path $projectDir "bin/releaseApk/$packageId-Signed.apk"
 
-# bundle (aab)
-if (-not $noclean)  { & $msbuild $projectFile /p:Configuration=Release /t:Clean /verbosity:$msverbosity; }
-& $msbuild $projectFile /p:Configuration=Release /p:Version=$versionParam /t:SignAndroidPackage /p:ArchiveOnBuild=true /verbosity:$msverbosity `
-	/p:AndroidKeyStore=True /p:AndroidSigningKeyStore=$keystore /p:AndroidSigningKeyAlias=$keystoreAlias /p:AndroidSigningKeyPass=$keystorePass /p:AndroidSigningStorePass=$keystorePass 
-
 # apk
 Write-Host;
 Write-Host "*** Creating Android APK ..." -BackgroundColor Blue -ForegroundColor White;
@@ -46,6 +41,15 @@ if (-not $noclean)  { & $msbuild $projectFile /p:Configuration=Release /t:Clean
 & $msbuild $projectFile /p:Configuration=Release /t:SignAndroidPackage  /p:Version=$versionParam /p:OutputPath="bin/ReleaseApk" /p:AndroidPackageFormat="apk" /verbosity:$msverbosity `
 	/p:AndroidSigningKeyStore=$keystore /p:AndroidSigningKeyAlias=$keystoreAlias /p:AndroidSigningStorePass=$keystorePass /p:JarsignerTimestampAuthorityUrl="https://freetsa.org/tsr"
 
+# apk
+Write-Host;
+Write-Host "*** Creating Android AAB ..." -BackgroundColor Blue -ForegroundColor White;
+
+if (-not $noclean)  { & $msbuild $projectFile /p:Configuration=Release /t:Clean /verbosity:$msverbosity; }
+& $msbuild $projectFile /p:Configuration=Release /p:Version=$versionParam /t:SignAndroidPackage /p:ArchiveOnBuild=true /verbosity:$msverbosity `
+	/p:AndroidKeyStore=True /p:AndroidSigningKeyStore=$keystore /p:AndroidSigningKeyAlias=$keystoreAlias /p:AndroidSigningKeyPass=$keystorePass /p:AndroidSigningStorePass=$keystorePass 
+
+
 # publish info
 $json = @{
     Version = $versionParam; 

diff --git a/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj b/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj
@@ -12,8 +12,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Tiny internal webserver to server your single-page application (SPA). You need this only if you want to create a UI for your VpnHood client by single-page application (SPA).</Description>
     <PackageId>VpnHood.Client.App.UI</PackageId>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip b/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip
diff --git a/VpnHood.Client.App.Win/Resources/SPA.zip b/VpnHood.Client.App.Win/Resources/SPA.zip
diff --git a/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj b/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
@@ -19,8 +19,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <PackageId>VpnHood.Client.App.Win</PackageId>
     <StartupObject></StartupObject>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>

diff --git a/VpnHood.Client.App/VpnHood.Client.App.csproj b/VpnHood.Client.App/VpnHood.Client.App.csproj
@@ -11,8 +11,8 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <Description>Readymade Vpn App skeleton for VpnHood clients. You just need to create a UI on it.</Description>
     <PackageId>VpnHood.Client.App</PackageId>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj b/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj
@@ -9,10 +9,10 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood client device provider for Windows using WinDivert.</Description>
-    <Version>2.6.342</Version>
+    <Version>2.6.344</Version>
     <PackageId>VpnHood.Client.Device.WinDivert</PackageId>
     <Version>1.1.226</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj
@@ -14,8 +14,8 @@
     <RepositoryType></RepositoryType>
     <PackageId>VpnHood.Client.Device</PackageId>
     <RootNamespace>VpnHood.Client.Device</RootNamespace>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client/VpnHood.Client.csproj b/VpnHood.Client/VpnHood.Client.csproj
@@ -13,8 +13,8 @@
     <Copyright>2022 VpnHood</Copyright>
     <PackageId>VpnHood.Client</PackageId>
     <PackageTags>VPN VpnClient Proxy</PackageTags>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Common/VpnHood.Common.csproj b/VpnHood.Common/VpnHood.Common.csproj
@@ -12,8 +12,8 @@
     <PackageId>VpnHood.Common</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood Common Library is shared among all other VpnHood modules.</Description>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Server.Access/VpnHood.Server.Access.csproj b/VpnHood.Server.Access/VpnHood.Server.Access.csproj
@@ -12,8 +12,8 @@
     <PackageId>VpnHood.Server.Access</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Stores, and retrieves end users' access and usage. Provides required interfaces and classes to use or create an access server and accounting.</Description>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj b/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj
@@ -12,8 +12,8 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageIcon>VpnHood.png</PackageIcon>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Server/VpnHood.Server.csproj b/VpnHood.Server/VpnHood.Server.csproj
@@ -13,8 +13,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>The core of VpnHood server. It can listen and accept connections from VpnHood clients.</Description>
     <PackageId>VpnHood.Server</PackageId>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Tunneling/VpnHood.Tunneling.csproj b/VpnHood.Tunneling/VpnHood.Tunneling.csproj
@@ -15,8 +15,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Product>VpnHood.Tunneling</Product>
     <Description>Provides tunnelling classes and protocols shared between VpnHood.Client and VpnHood.Server.</Description>
-    <Version>2.6.342</Version>
-    <AssemblyVersion>2.6.342</AssemblyVersion>
+    <Version>2.6.344</Version>
+    <AssemblyVersion>2.6.344</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>