Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
trudyhood committed May 19, 2022
2 parents 0750b5c + 32a8a8a commit 119280e
Show file tree
Hide file tree
Showing 343 changed files with 599 additions and 43,786 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# v2.4.302

### Server
* Update: Improve Session Management


### Developer
* Update: Move VpnHood.Client.WebUI to a standalone repo

# v2.4.299
### Client
* Fix: Windows: Installation Package
Expand Down Expand Up @@ -380,3 +389,4 @@




4 changes: 2 additions & 2 deletions Pub/Version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Major": 2,
"Minor": 4,
"Build": 299,
"BumpTime": "2022-03-26T10:03:29.9179612Z"
"Build": 302,
"BumpTime": "2022-05-19T19:12:37.8101140Z"
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="VpnHood.Client">
<Version>2.4.292</Version>
<Version>2.4.297</Version>
</PackageReference>
<PackageReference Include="VpnHood.Client.Device.Android">
<Version>2.4.292</Version>
<Version>2.4.297</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</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.4.292" />
<PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.4.292" />
<PackageReference Include="VpnHood.Client" Version="2.4.297" />
<PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.4.297" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions VpnHood.App.Launcher/VpnHood.App.Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<PackageIcon>VpnHood.png</PackageIcon>
<Product>VpnHood.App.Launcher</Product>
<ApplicationIcon>Resources\VpnHood.ico</ApplicationIcon>
<Version>2.4.297</Version>
<AssemblyVersion>2.4.297</AssemblyVersion>
<FileVersion>2.4.297</FileVersion>
<Version>2.4.302</Version>
<AssemblyVersion>2.4.302</AssemblyVersion>
<FileVersion>2.4.302</FileVersion>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
Expand All @@ -29,7 +29,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
</ItemGroup>

</Project>
Binary file modified VpnHood.Client.App.Android/Assets/SPA.zip
Binary file not shown.
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="299" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.4.299">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="300" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.4.300">
<uses-sdk android:minSdkVersion="22" android:targetSdkVersion="31" />
<uses-feature android:name="android.software.leanback" android:required="false" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
Expand Down
2 changes: 1 addition & 1 deletion VpnHood.Client.App.Android/Resources/Resource.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="AndroidApp.cs" />
Expand Down
17 changes: 0 additions & 17 deletions VpnHood.Client.App.UI.Html/.eslintrc.js

This file was deleted.

23 changes: 0 additions & 23 deletions VpnHood.Client.App.UI.Html/.gitignore

This file was deleted.

29 changes: 0 additions & 29 deletions VpnHood.Client.App.UI.Html/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions VpnHood.Client.App.UI.Html/_publish.bat

This file was deleted.

17 changes: 0 additions & 17 deletions VpnHood.Client.App.UI.Html/_publish.ps1

This file was deleted.

5 changes: 0 additions & 5 deletions VpnHood.Client.App.UI.Html/babel.config.js

This file was deleted.

9 changes: 0 additions & 9 deletions VpnHood.Client.App.UI.Html/jsconfig.json

This file was deleted.

Loading

0 comments on commit 119280e

Please sign in to comment.