Refactor PublishApps.ps1

vpnhood · Dec 28, 2024 · a8abf22 · a8abf22
1 parent f77893b
commit a8abf22
Show file tree

Hide file tree

Showing 34 changed files with 55 additions and 58 deletions.
diff --git a/Pub/PublishApps.ps1 b/Pub/PublishApps.ps1
@@ -6,7 +6,6 @@ param(
 	[Parameter(Mandatory=$true)][object]$connectWin,
 	[Parameter(Mandatory=$true)][object]$connectAndroid,
 	[Parameter(Mandatory=$true)][object]$maui,
-	[Parameter(Mandatory=$true)][object]$server,
 	[Parameter(Mandatory=$true)][object]$distribute,
 	[Parameter(Mandatory=$true)][object]$samples
 	);
@@ -17,7 +16,6 @@ $connectAndroid = $connectAndroid -eq "1";
 $clientWin = $clientWin -eq "1";
 $clientAndroid = $clientAndroid -eq "1";
 $distribute = $distribute -eq "1";
-$server = $server -eq "1";
 $samples = $samples -eq "1";
 $maui = $maui -eq "1";
 
@@ -69,14 +67,6 @@ if ($clientWin) {
 	& "$solutionDir/Src/Apps/Client.Win.Web/_publish.ps1";
 }
 
-# publish server
-if ($server) {	
-	& "$solutionDir/Src/Apps/Server.Net/Pub/publish_win.ps1";
-	& "$solutionDir/Src/Apps/Server.Net/Pub/publish_linux_x64.ps1";
-	& "$solutionDir/Src/Apps/Server.Net/Pub/publish_linux_arm64.ps1";
-	& "$solutionDir/Src/Apps/Server.Net/Pub/publish_docker.ps1" -distribute $distribute;
-}
-
 # publish android
 if ($clientAndroid) {	
 	& "$solutionDir/Src/Apps/Client.Android.Google/_publish.ps1";
@@ -93,7 +83,7 @@ if ($connectAndroid) {
 # distribute
 if ($distribute) {
     & "$PSScriptRoot/PublishToGitHub.ps1" `
-		-mainRepo ($clientWin -or $clientAndroid -or $server) `
+		-mainRepo ($clientWin -or $clientAndroid) `
 		-connectRepo ($connectWin -or $connectAndroid);
 }
 

diff --git a/Src/AppLib/VpnHood.AppLib.Abstractions/VpnHood.AppLib.Abstractions.csproj b/Src/AppLib/VpnHood.AppLib.Abstractions/VpnHood.AppLib.Abstractions.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/AppLib/VpnHood.AppLib.Android.Ads.AdMob/VpnHood.AppLib.Android.Ads.AdMob.csproj b/Src/AppLib/VpnHood.AppLib.Android.Ads.AdMob/VpnHood.AppLib.Android.Ads.AdMob.csproj
@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

diff --git a/Src/AppLib/VpnHood.AppLib.Android.Common/VpnHood.AppLib.Android.Common.csproj b/Src/AppLib/VpnHood.AppLib.Android.Common/VpnHood.AppLib.Android.Common.csproj
@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

diff --git a/...pLib/VpnHood.AppLib.Android.GooglePlay.Core/VpnHood.AppLib.Android.GooglePlay.Core.csproj b/...pLib/VpnHood.AppLib.Android.GooglePlay.Core/VpnHood.AppLib.Android.GooglePlay.Core.csproj
@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

diff --git a/Src/AppLib/VpnHood.AppLib.Android.GooglePlay/VpnHood.AppLib.Android.GooglePlay.csproj b/Src/AppLib/VpnHood.AppLib.Android.GooglePlay/VpnHood.AppLib.Android.GooglePlay.csproj
@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

diff --git a/Src/AppLib/VpnHood.AppLib.App/VpnHood.AppLib.App.csproj b/Src/AppLib/VpnHood.AppLib.App/VpnHood.AppLib.App.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/AppLib/VpnHood.AppLib.Maui.Common/VpnHood.AppLib.Maui.Common.csproj b/Src/AppLib/VpnHood.AppLib.Maui.Common/VpnHood.AppLib.Maui.Common.csproj
@@ -26,7 +26,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseOutputPath></BaseOutputPath>
 		<BaseIntermediateOutputPath />

diff --git a/Src/AppLib/VpnHood.AppLib.Resources/VpnHood.AppLib.Resources.csproj b/Src/AppLib/VpnHood.AppLib.Resources/VpnHood.AppLib.Resources.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/AppLib/VpnHood.AppLib.Store/VpnHood.AppLib.Store.csproj b/Src/AppLib/VpnHood.AppLib.Store/VpnHood.AppLib.Store.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/AppLib/VpnHood.AppLib.WebServer/VpnHood.AppLib.WebServer.csproj b/Src/AppLib/VpnHood.AppLib.WebServer/VpnHood.AppLib.WebServer.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/AppLib/VpnHood.AppLib.Win.Common.WpfSpa/VpnHood.AppLib.Win.Common.WpfSpa.csproj b/Src/AppLib/VpnHood.AppLib.Win.Common.WpfSpa/VpnHood.AppLib.Win.Common.WpfSpa.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/AppLib/VpnHood.AppLib.Win.Common/VpnHood.AppLib.Win.Common.csproj b/Src/AppLib/VpnHood.AppLib.Win.Common/VpnHood.AppLib.Win.Common.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Apps/Client.Android.Google/VpnHood.App.Client.Android.Google.csproj b/Src/Apps/Client.Android.Google/VpnHood.App.Client.Android.Google.csproj
@@ -5,8 +5,8 @@
 		<RootNamespace>VpnHood.App.Client.Droid.Google</RootNamespace>
 		<OutputType>Exe</OutputType>
 		<ApplicationId>com.vpnhood.client.android.debug</ApplicationId>
-		<ApplicationVersion>621</ApplicationVersion>
-		<ApplicationDisplayVersion>5.0.621</ApplicationDisplayVersion>
+		<ApplicationVersion>629</ApplicationVersion>
+		<ApplicationDisplayVersion>5.0.629</ApplicationDisplayVersion>
 		<SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
@@ -32,7 +32,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

diff --git a/Src/Apps/Client.Android.Web/VpnHood.App.Client.Android.Web.csproj b/Src/Apps/Client.Android.Web/VpnHood.App.Client.Android.Web.csproj
@@ -5,8 +5,8 @@
 		<RootNamespace>VpnHood.App.Client.Droid.Web</RootNamespace>
 		<OutputType>Exe</OutputType>
 		<ApplicationId>com.vpnhood.connect.android.web.debug</ApplicationId>
-		<ApplicationVersion>621</ApplicationVersion>
-		<ApplicationDisplayVersion>5.0.621</ApplicationDisplayVersion>
+		<ApplicationVersion>629</ApplicationVersion>
+		<ApplicationDisplayVersion>5.0.629</ApplicationDisplayVersion>
 		<SupportedOSPlatformVersion>23.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
@@ -32,7 +32,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

diff --git a/Src/Apps/Client.Win.Web/VpnHood.App.Client.Win.Web.csproj b/Src/Apps/Client.Win.Web/VpnHood.App.Client.Win.Web.csproj
@@ -28,7 +28,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Apps/Connect.Android.Google/VpnHood.App.Connect.Android.Google.csproj b/Src/Apps/Connect.Android.Google/VpnHood.App.Connect.Android.Google.csproj
@@ -5,8 +5,8 @@
 		<RootNamespace>VpnHood.App.Client.Droid.Google</RootNamespace>
 		<OutputType>Exe</OutputType>
 		<ApplicationId>com.vpnhood.connect.android</ApplicationId>
-		<ApplicationVersion>626</ApplicationVersion>
-		<ApplicationDisplayVersion>5.0.626</ApplicationDisplayVersion>
+		<ApplicationVersion>629</ApplicationVersion>
+		<ApplicationDisplayVersion>5.0.629</ApplicationDisplayVersion>
 		<SupportedOSPlatformVersion>24.0</SupportedOSPlatformVersion>
 		<DebugSymbols>True</DebugSymbols>
 	</PropertyGroup>
@@ -36,7 +36,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.626</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<BaseIntermediateOutputPath />
 	</PropertyGroup>

diff --git a/Src/Apps/Connect.Win.Web/VpnHood.App.Connect.Win.Web.csproj b/Src/Apps/Connect.Win.Web/VpnHood.App.Connect.Win.Web.csproj
@@ -28,7 +28,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.622</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 		<StartupObject></StartupObject>
 	</PropertyGroup>

diff --git a/Src/Core/VpnHood.Core.Client.Device.Android/AndroidDevice.cs b/Src/Core/VpnHood.Core.Client.Device.Android/AndroidDevice.cs
@@ -133,7 +133,7 @@ await Task.WhenAny(_grantPermissionTaskSource.Task, Task.Delay(TimeSpan.FromMinu
             if (!_grantPermissionTaskSource.Task.IsCompletedSuccessfully)
                 throw new Exception("Could not grant VPN permission in the given time.");
 
-            if (!_grantPermissionTaskSource.Task.Result)
+            if (!await _grantPermissionTaskSource.Task)
                 throw new Exception("VPN permission has been rejected.");
         }
         finally {

diff --git a/Src/Core/VpnHood.Core.Client.Device.Android/VpnHood.Core.Client.Device.Android.csproj b/Src/Core/VpnHood.Core.Client.Device.Android/VpnHood.Core.Client.Device.Android.csproj
@@ -21,7 +21,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Core/VpnHood.Core.Client.Device.WinDivert/VpnHood.Core.Client.Device.WinDivert.csproj b/Src/Core/VpnHood.Core.Client.Device.WinDivert/VpnHood.Core.Client.Device.WinDivert.csproj
@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Core/VpnHood.Core.Client.Device/VpnHood.Core.Client.Device.csproj b/Src/Core/VpnHood.Core.Client.Device/VpnHood.Core.Client.Device.csproj
@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Core/VpnHood.Core.Client/Diagnosing/DiagnoseUtil.cs b/Src/Core/VpnHood.Core.Client/Diagnosing/DiagnoseUtil.cs
@@ -33,8 +33,9 @@ public class DiagnoseUtil
         while (tasks.Length > 0) {
             var task = await Task.WhenAny(tasks).VhConfigureAwait();
             exception = task.Result;
-            if (task.Result == null)
+            if (exception == null)
                 return null; //at least one task is success
+
             tasks = tasks.Where(x => x != task).ToArray();
         }
 

diff --git a/Src/Core/VpnHood.Core.Client/Diagnosing/DnsResolver.cs b/Src/Core/VpnHood.Core.Client/Diagnosing/DnsResolver.cs
@@ -34,14 +34,16 @@ public static async Task<IPHostEntry> GetHostEntry(string host, IPEndPoint dnsEn
         // Send the DNS query
         await udpClient
             .SendAsync(query, query.Length)
-            .VhWait(timeout, cancellationToken);
+            .VhWait(timeout, cancellationToken)
+            .VhConfigureAwait();
 
         // Wait for response with a timeout
-        var task = udpClient
+        var task = await udpClient
             .ReceiveAsync()
-            .VhWait(timeout, cancellationToken);
+            .VhWait(timeout, cancellationToken)
+            .VhConfigureAwait();
 
-        var response = task.Result.Buffer;
+        var response = task.Buffer;
 
         // Parse the DNS response
         var hostEntry = ParseDnsResponse(response, queryId);

diff --git a/Src/Core/VpnHood.Core.Client/VpnHood.Core.Client.csproj b/Src/Core/VpnHood.Core.Client/VpnHood.Core.Client.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Core/VpnHood.Core.Common/Utils/VhTaskExtensions.cs b/Src/Core/VpnHood.Core.Common/Utils/VhTaskExtensions.cs
@@ -37,7 +37,7 @@ public static async Task<T> VhWait<T>(this Task<T> task, int timeout, Cancellati
     public static async Task<T> VhWait<T>(this Task<T> task, TimeSpan timeout, CancellationToken cancellationToken)
     {
         var timeoutTask = Task.Delay(timeout, cancellationToken);
-        await Task.WhenAny(task, timeoutTask);
+        await Task.WhenAny(task, timeoutTask).VhConfigureAwait();
 
         // check if the task is canceled
         cancellationToken.ThrowIfCancellationRequested();

diff --git a/Src/Core/VpnHood.Core.Common/VpnHood.Core.Common.csproj b/Src/Core/VpnHood.Core.Common/VpnHood.Core.Common.csproj
@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/....Core.Server.Access.FileAccessManager/VpnHood.Core.Server.Access.FileAccessManager.csproj b/....Core.Server.Access.FileAccessManager/VpnHood.Core.Server.Access.FileAccessManager.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Core/VpnHood.Core.Server.Access/VpnHood.Core.Server.Access.csproj b/Src/Core/VpnHood.Core.Server.Access/VpnHood.Core.Server.Access.csproj
@@ -20,7 +20,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Core/VpnHood.Core.Server/VpnHood.Core.Server.csproj b/Src/Core/VpnHood.Core.Server/VpnHood.Core.Server.csproj
@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Src/Core/VpnHood.Core.Tunneling/VpnHood.Core.Tunneling.csproj b/Src/Core/VpnHood.Core.Tunneling/VpnHood.Core.Tunneling.csproj
@@ -19,7 +19,7 @@
 		<PackageIcon>VpnHood.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
-		<Version>5.0.621</Version>
+		<Version>5.0.629</Version>
 		<FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
 	</PropertyGroup>
 

diff --git a/Tests/VpnHood.NetTester/Testers/QuicTesters/QuicTesterClient.cs b/Tests/VpnHood.NetTester/Testers/QuicTesters/QuicTesterClient.cs
@@ -42,8 +42,11 @@ public async Task Start(long upSize, long downSize, int connectionCount,
         }
 
         // dispose streams
-        foreach (var uploadTask in uploadTasks.Where(x => x.IsCompletedSuccessfully))
-            uploadTask.Result?.DisposeAsync();
+        foreach (var uploadTask in uploadTasks.Where(x => x.IsCompletedSuccessfully)) {
+            var connectionStream = await uploadTask;
+            if (connectionStream != null)
+                await connectionStream.DisposeAsync();
+        }
     }
 
     private async Task<ConnectionStream?> StartUpload(long upSize, long downSize,

diff --git a/Tests/VpnHood.NetTester/Testers/TcpTesters/TcpTesterClient.cs b/Tests/VpnHood.NetTester/Testers/TcpTesters/TcpTesterClient.cs
@@ -30,15 +30,16 @@ public async Task Start(long upSize, long downSize, int connectionCount, Cancell
         using (var speedometer = new Speedometer("Down")) {
             var downloadTasks = new Task[connectionCount];
             for (var i = 0; i < connectionCount; i++)
-                if (uploadTasks[i].Result.Connected)
-                    downloadTasks[i] = StartDownload(uploadTasks[i].Result.GetStream(), downSize / connectionCount, speedometer,
+                if ((await uploadTasks[i]).Connected)
+                    downloadTasks[i] = StartDownload((await uploadTasks[i]).GetStream(), downSize / connectionCount, speedometer,
                     cancellationToken);
 
             await Task.WhenAll(downloadTasks);
         }
 
         // dispose streams
-        foreach (var uploadTask in uploadTasks.Where(x => x.IsCompletedSuccessfully)) uploadTask.Result.Dispose();
+        foreach (var uploadTask in uploadTasks.Where(x => x.IsCompletedSuccessfully)) 
+            (await uploadTask).Dispose();
     }
 
     private static async Task<TcpClient> StartUpload(IPEndPoint serverEp, long upSize, long downSize,