diff --git a/CHANGELOG.md b/CHANGELOG.md index e2dd561bd..81503f5cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ -#Upcoming +# v1.1.212 +* New: Updater has completely changed + ### Server * New: Add stop command to stop all server instance -* New: Add win2linux that push VpnHoodServer to remove linux via SSH -* Update: Add /nowait command to allow autoupdate +* New: linux: Add installation script +* New: linux: Run server as service # v1.1.202 ### Client @@ -117,3 +119,4 @@ + diff --git a/Pub/PublishToGitHub.ps1 b/Pub/PublishToGitHub.ps1 index bced7eaee..51a0404af 100644 --- a/Pub/PublishToGitHub.ps1 +++ b/Pub/PublishToGitHub.ps1 @@ -7,7 +7,7 @@ $linuxScript | Out-File -FilePath "$packagesServerDir/install-linux.sh" -Encodi # update CHANGELOG $text = Get-Content "$solutionDir/CHANGELOG.md" -Raw; -if ( $text.IndexOf("# Upcoming") -eq -1) { throw "Could not find #Upcoming phrase in CHANGELOG" }; +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; diff --git a/Pub/Version.json b/Pub/Version.json index 247626b8e..0f67951fd 100644 Binary files a/Pub/Version.json and b/Pub/Version.json differ diff --git a/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj b/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj index 9b8d091a0..69de8176a 100644 --- a/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj +++ b/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj @@ -110,10 +110,10 @@ - 1.1.186 + 1.1.202 - 1.1.186 + 1.1.202 diff --git a/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj b/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj index 886be2c2b..49b615139 100644 --- a/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj +++ b/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/VpnHood.Client.App.Android/Properties/AndroidManifest.xml b/VpnHood.Client.App.Android/Properties/AndroidManifest.xml index 419f2d59d..5a9d99a36 100644 --- a/VpnHood.Client.App.Android/Properties/AndroidManifest.xml +++ b/VpnHood.Client.App.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + 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 index 5458f3a13..8901c3e5a 100644 --- a/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip +++ b/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip @@ -24,10 +24,10 @@ - + - + @@ -49,62 +49,63 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - + + + + + + @@ -123,51 +124,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -371,42 +373,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VpnHood.Client.Device.Android/VpnHood.Client.Device.Android.csproj b/VpnHood.Client.Device.Android/VpnHood.Client.Device.Android.csproj index aca3b05c1..23fa55623 100644 --- a/VpnHood.Client.Device.Android/VpnHood.Client.Device.Android.csproj +++ b/VpnHood.Client.Device.Android/VpnHood.Client.Device.Android.csproj @@ -59,7 +59,7 @@ 5.0.0 - 1.1.2 + 1.2.0 diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj index 562d714b6..8019c4014 100644 --- a/VpnHood.Client.Device/VpnHood.Client.Device.csproj +++ b/VpnHood.Client.Device/VpnHood.Client.Device.csproj @@ -28,7 +28,7 @@ - + diff --git a/VpnHood.Server.App.Net/_publish.ps1 b/VpnHood.Server.App.Net/_publish.ps1 index 42e4ee997..6ad9d08af 100644 --- a/VpnHood.Server.App.Net/_publish.ps1 +++ b/VpnHood.Server.App.Net/_publish.ps1 @@ -2,11 +2,11 @@ param([switch]$ftp) $packageName = "VpnHoodServer"; -#. "$PSScriptRoot/../Pub/PublishApp.ps1" ` -# $PSScriptRoot ` -# -withLauncher ` -# -ftp:$ftp ` -# -packagesDir $packagesServerDir ` -# -packageName $packageName ` -# -updateUrl "https://github.com/vpnhood/VpnHood/releases/latest/download/$packageName.json" ` -# -packageDownloadUrl "https://github.com/vpnhood/VpnHood/releases/latest/download/$packageName.zip" +. "$PSScriptRoot/../Pub/PublishApp.ps1" ` + $PSScriptRoot ` + -withLauncher ` + -ftp:$ftp ` + -packagesDir $packagesServerDir ` + -packageName $packageName ` + -updateUrl "https://github.com/vpnhood/VpnHood/releases/latest/download/$packageName.json" ` + -packageDownloadUrl "https://github.com/vpnhood/VpnHood/releases/latest/download/$packageName.zip" diff --git a/VpnHood.Server/VpnHood.Server.csproj b/VpnHood.Server/VpnHood.Server.csproj index e399079a8..0c6cc7f8a 100644 --- a/VpnHood.Server/VpnHood.Server.csproj +++ b/VpnHood.Server/VpnHood.Server.csproj @@ -17,7 +17,7 @@ - + diff --git a/VpnHood.Tunneling/VpnHood.Tunneling.csproj b/VpnHood.Tunneling/VpnHood.Tunneling.csproj index abd5a8f90..eda238c36 100644 --- a/VpnHood.Tunneling/VpnHood.Tunneling.csproj +++ b/VpnHood.Tunneling/VpnHood.Tunneling.csproj @@ -22,7 +22,7 @@ - +