Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
trudyhood committed Apr 5, 2024
2 parents f5a8831 + 46ef51d commit eef275d
Show file tree
Hide file tree
Showing 338 changed files with 3,311 additions and 3,706 deletions.
21 changes: 19 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
# v3.3.470
# v4.3.485
### Client
* Feature: Accept DNS Servers from the connected Server
* Feature: Multi-language Support (Arabic, Chinese, English, Farsi, Portuguese, Russian, Spanish)
* Feature: Support Billing integration
* Feature: Implement Google Billing
* Feature: Support Interface for Account integration
* Feature: Implement VpnHood Store Account
* Update: Improve UDP performance
* Update: Prpare to migrate VpnHood public servers to VpnHood Connect

### Server
* Feature: Configure DNS Servers for the connected clients
* Update: Support multiple certificates
* Update: Configure timeout for HTTP-01 DNS challenge
* Update: Faster shutdown

# v3.3.475
### Client
* Feature: Update UI when the server does not support UDP tunnel
* Fix: Crash when pressing "Disconnect" while connecting
* Fix: Remove "No data has been received" message before connection is established
* Fix: Remove the "No data has been received" message before the connection is established
* Update: Protocol Changed: Server sends UdpPort instead of UdpEndPoints

### Server
Expand Down
2 changes: 1 addition & 1 deletion Pub/Core/PublishNuget.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Write-Host
Write-Host "*** $packageId > Packing..." -BackgroundColor Blue
rm "$publishDir" -ErrorAction Ignore -Recurse
$nugetVersion="$versionParam" + (&{if($prerelease) {"-prerelease"} else {""}});
dotnet pack "$projectDir" -c "Release" -o "$publishDir" --runtime any -p:Version=$nugetVersion -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
dotnet pack "$projectDir" -c "Release" -o "$publishDir" -p:Version=$nugetVersion -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
if ($LASTEXITCODE -gt 0) { Throw "The pack exited with error code: " + $lastexitcode; }

# publish nuget
Expand Down
6 changes: 3 additions & 3 deletions Pub/PubVersion.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Version": "3.3.470",
"BumpTime": "2024-02-16T20:19:54.5087389Z",
"Version": "4.3.485",
"BumpTime": "2024-04-05T10:24:47.0560586Z",
"Prerelease": false,
"DeprecatedVersion": "3.0.416"
"DeprecatedVersion": "4.0.416"
}
13 changes: 12 additions & 1 deletion Pub/PublishApps.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ param(
[Parameter(Mandatory=$true)][object]$winClient,
[Parameter(Mandatory=$true)][object]$android,
[Parameter(Mandatory=$true)][object]$server,
[Parameter(Mandatory=$true)][object]$distribute
[Parameter(Mandatory=$true)][object]$distribute,
[Parameter(Mandatory=$true)][object]$samples
);

$nugets = $nugets -eq "1";
Expand All @@ -13,6 +14,7 @@ $androidConnect = $androidConnect -eq "1";
$distribute = $distribute -eq "1";
$winClient = $winClient -eq "1";
$server = $server -eq "1";
$samples = $samples -eq "1";

. "$PSScriptRoot/Core/Common.ps1" -bump $bump

Expand All @@ -38,6 +40,8 @@ Remove-Item "$packagesRootDir/ReleaseNote.txt" -ErrorAction Ignore;
& "$solutionDir/VpnHood.Client.App.Android.Common/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Android.GooglePlay/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Android.GooglePlay.Core/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Win.Common/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Maui.Common/_publish.ps1";

& "$solutionDir/VpnHood.Server/_publish.ps1";
& "$solutionDir/VpnHood.Server.Access/_publish.ps1";
Expand Down Expand Up @@ -76,3 +80,10 @@ if ($distribute)
{
& "$PSScriptRoot/PublishToGitHub.ps1";
}


# update and push samples nugets
if ($samples)
{
& "$solutionDir/../VpnHood.Client.Samples/UpdateAndPush.ps1";
}
6 changes: 3 additions & 3 deletions Pub/PublishToGitHub.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
. "$PSScriptRoot/Core/Common.ps1"

# update maui nugets
Push-Location -Path "$solutionDir/VpnHood.Client.App.Maui.Common";

# update CHANGELOG
$text = Get-Content "$solutionDir/CHANGELOG.md" -Raw;

Expand All @@ -23,9 +26,6 @@ if ($isLatest)
$releaseNote | Out-File -FilePath "$packagesRootDirLatest/ReleaseNote.txt" -Encoding utf8 -Force -NoNewline;
}

# replace all final version to current repo
UpdateRepoVersionInFile;

# Publishing to GitHub
Push-Location -Path "$solutionDir";

Expand Down
23 changes: 0 additions & 23 deletions Samples/VpnHood.Samples.SimpleClient.Droid/AndroidManifest.xml

This file was deleted.

100 changes: 0 additions & 100 deletions Samples/VpnHood.Samples.SimpleClient.Droid/MainActivity.cs

This file was deleted.

Loading

0 comments on commit eef275d

Please sign in to comment.