Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
trudyhood committed Dec 15, 2022
2 parents af1d204 + f119c7a commit 204b14c
Show file tree
Hide file tree
Showing 57 changed files with 1,868 additions and 452 deletions.
32 changes: 22 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,38 @@
# v2.5.324
### Client
* Fix: Hold some TCP connection
* Update: Restore auto reconnect
# v2.6.326
### Client
* Feature: Windows: Compile as Win-x64. NET runtime is not required anymore.
* Feature: Windows: WebView2 is optional. Run UI in the default web browser if WebView2 was not installed
* Fix: Unable to connect to IpV6 supported site on chrome when server IpV6 is not configured
* Fix: Hold some TCP connections
* Fix: The client tries to connect to the IPv6 endpoint regardless of its connectivity
* Fix: Show Blank screen
* Update: Restore auto-reconnect
* Update: Improve performance and memory usage
* Update: Windows x86 (32-bit) is not supported anymore

### Server
* Fix: Hold some TCP connection
* Feature: Report IPv6 support to client
* Feature: Add -domain to File AccessServer to set access-key endpoint will set to certificate domain
* Fix: Update Script doesn't work
* Fix: Hold some TCP connections
* Fix: Delay in showing command-line helps for File Access Server
* Fix: "Sequence contains no elements" Error when could not find any Public IP
* Update: Improve performance and memory usage
* Update: Improve Logging
* Update: Change config JSON property name for SessionOptions and TrackingOptions

# v2.5.323
### Client
* Update: Imporve messages of disconnection reason
* Feature: Repelace Always ON with auto reconnect
* Update: Improve messages of disconnection reason
* Feature: Replace Always ON with auto-reconnect
* Fix: Anonymize VpnHood Server IP in diagnose
* Fix: Windows Installer

### Server
* Update: Improve Log for AccessServer API CALL
* Update: Port Tracker
* Update: Improve session recovery
* Fix: Critial bug that cosnume much resources
* Fix: Critical bug that consume much resources

# v2.4.321
### Server
Expand All @@ -34,13 +46,13 @@
* Feature: Compile as a self-contained; No need for .Net Framework Runtime
* Update: Upgrade to .NET 7
* Update: New Installation For Linux
* Update: New Installation For Winddows Server
* Update: New Installation For Windows Server
* Update: New Installation For Docker
* Update: Improve logging
* Update: Removing App Launcher project
* Fix: Error on Windows Server. unsupported option or level was specified in a getsockopt or setsockopt call
* Fix: Archiving the log file when another instance of the server is already running
* Fix: Preventing running multiple instance from once location
* Fix: Preventing running multiple instances from once location

# v2.4.318
### Client
Expand Down
11 changes: 6 additions & 5 deletions Pub/PublishToGitHub.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
$text = Get-Content "$solutionDir/CHANGELOG.md" -Raw;
# if ( $text.IndexOf("# Upcoming") -eq -1) { throw "Could not find # Upcoming phrase in CHANGELOG" };
$changeLog = $text -replace "# Upcoming", "# v$versionParam";
$changeLog | Out-File -FilePath "$solutionDir/CHANGELOG.md" -Encoding utf8 -Force;
$changeLog | Out-File -FilePath "$solutionDir/CHANGELOG.md" -Encoding utf8 -Force -NoNewline;

# create release note
$releaseNote = $text -replace "# Upcoming", "$versionTag`n";
$releaseNote = $releaseNote -replace "# $versionTag", "$versionTag"; # remove version hash
$releaseNote = $releaseNote.SubString(0, $releaseNote.IndexOf("`n# "));
# $releaseNote += "To see a list of all changes visit: [Changelog](https://github.com/vpnhood/VpnHood/blob/main/CHANGELOG.md)";
$releaseNote | Out-File -FilePath "$packagesRootDir/ReleaseNote.txt" -Encoding utf8 -Force;
$releaseNote | Out-File -FilePath "$packagesRootDir/ReleaseNote.txt" -Encoding utf8 -Force -NoNewline;
if ($isLatest)
{
$releaseNote | Out-File -FilePath "$packagesRootDirLatest/ReleaseNote.txt" -Encoding utf8 -Force;
$releaseNote | Out-File -FilePath "$packagesRootDirLatest/ReleaseNote.txt" -Encoding utf8 -Force -NoNewline;
}

Push-Location -Path "$solutionDir";
Expand Down Expand Up @@ -47,8 +47,9 @@ gh release create "$versionTag" `
(&{if($prerelease) {"--prerelease"} else {"--latest"}}) `
-F $releaseRootDir/ReleaseNote.txt `
$releaseClientDir/android/VpnHoodClient-Android.apk `
$releaseClientDir/windows/VpnHoodClient-win.exe `
$releaseClientDir/windows/VpnHoodClient-win.txt `
$releaseClientDir/windows/VpnHoodClient-win-x64.exe `
$releaseClientDir/windows/VpnHoodClient-win.txt `
$releaseClientDir/windows/VpnHoodClient-win-x64.txt `
$releaseServerDir/linux-x64/VpnHoodServer-linux-x64.json `
$releaseServerDir/linux-x64/VpnHoodServer-linux-x64.sh `
$releaseServerDir/linux-x64/VpnHoodServer-linux-x64.tar.gz `
Expand Down
6 changes: 3 additions & 3 deletions Pub/Version.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Major": 2,
"Minor": 5,
"Build": 324,
"BumpTime": "2022-12-12T21:22:57.0386200Z",
"Minor": 6,
"Build": 326,
"BumpTime": "2022-12-15T04:41:17.2014844Z",
"Prerelease": false
}
25 changes: 0 additions & 25 deletions Pub/run.vbs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="VpnHood.Client">
<Version>2.5.323</Version>
<Version>2.5.324</Version>
</PackageReference>
<PackageReference Include="VpnHood.Client.Device.Android">
<Version>2.5.323</Version>
<Version>2.5.324</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.4" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="VpnHood.Client" Version="2.5.323" />
<PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.5.323" />
<PackageReference Include="VpnHood.Client" Version="2.5.324" />
<PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.5.324" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion VpnHood.Client.App.Android/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="324" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.5.324">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="326" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.6.326">
<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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.4" />
</ItemGroup>
<ItemGroup>
<None Include="Ads\VpnHoodAdActivity.cs" />
Expand Down
6 changes: 3 additions & 3 deletions VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<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.5.324</Version>
<AssemblyVersion>2.5.324</AssemblyVersion>
<FileVersion>2.5.324</FileVersion>
<Version>2.6.326</Version>
<AssemblyVersion>2.6.326</AssemblyVersion>
<FileVersion>2.6.326</FileVersion>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 204b14c

Please sign in to comment.