Publish v1.1.212

ClubNation · Feb 18, 2021 · a6f8d65 · a6f8d65
1 parent 1e7ab7b
commit a6f8d65
Show file tree

Hide file tree

Showing 12 changed files with 157 additions and 151 deletions.
diff --git 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
@@ -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
diff --git 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 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="VpnHood.Client">
-      <Version>1.1.186</Version>
+      <Version>1.1.202</Version>
     </PackageReference>
     <PackageReference Include="VpnHood.Client.Device.Android">
-      <Version>1.1.186</Version>
+      <Version>1.1.202</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>

diff --git 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 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="VpnHood.Client" Version="1.1.186" />
-    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="1.1.186" />
+    <PackageReference Include="VpnHood.Client" Version="1.1.202" />
+    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="1.1.202" />
   </ItemGroup>
 
 </Project>
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="202" android:versionName="Beta" package="com.vpnhood.client.android" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="211" android:versionName="Beta" package="com.vpnhood.client.android" android:installLocation="auto">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="30" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

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.Device.Android/VpnHood.Client.Device.Android.csproj b/VpnHood.Client.Device.Android/VpnHood.Client.Device.Android.csproj
@@ -59,7 +59,7 @@
       <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="PacketDotNet">
-      <Version>1.1.2</Version>
+      <Version>1.2.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PacketDotNet" Version="1.1.2" />
+    <PackageReference Include="PacketDotNet" Version="1.2.0" />
   </ItemGroup>
 
 </Project>
diff --git 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
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="PacketDotNet" Version="1.1.2" />
+    <PackageReference Include="PacketDotNet" Version="1.2.0" />
     <PackageReference Include="System.Text.Json" Version="5.0.1" />
   </ItemGroup>
 

diff --git a/VpnHood.Tunneling/VpnHood.Tunneling.csproj b/VpnHood.Tunneling/VpnHood.Tunneling.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="PacketDotNet" Version="1.1.2" />
+    <PackageReference Include="PacketDotNet" Version="1.2.0" />
     <PackageReference Include="System.Text.Json" Version="5.0.1" />
   </ItemGroup>