Merge branch 'development'

CHANGELOG.md

@@ -1,3 +1,17 @@
+# v2.7.350
+### Client
+* Farture: Follow server supported networks by ip range
+* Update: Performance improvement
+* Windows: Fix Auto Updater
+
+### Server
+* Farture: Filter server local networks
+* Farture: Filter networks by ip ranges
+* Fix: Missing some NetProtector log
+* Fix: Winodws: AutoUpdater
+* Security: Always block access to loopback addresses
+* Update: log file archive format
+
 # v2.6.346
 ### Client
 * Update: Improve stability when using no UDP mode

Pub/Common.ps1

@@ -14,18 +14,19 @@ $msverbosity = "minimal";
 $versionFile = Join-Path $PSScriptRoot "version.json"
 $versionJson = (Get-Content $versionFile | Out-String | ConvertFrom-Json);
 $bumpTime = [datetime]::Parse($versionJson.BumpTime);
+$version = [version]::Parse($versionJson.Version);
 if ( $bump -gt 0 )
 {
 	$isVersionBumped = $true;
-	$versionJson.Build = $versionJson.Build + 1;
+	$version = [version]::new($version.Major, $version.Minor, $version.Build + 1);
+	$versionJson.Version = $version.ToString(3);
 	$versionJson.BumpTime = [datetime]::UtcNow.ToString("o");
 	$versionJson.Prerelease = ($bump -eq 2);
 	$versionJson | ConvertTo-Json -depth 10 | Out-File $versionFile;
 }
 
 $prerelease=$versionJson.Prerelease;
 $isLatest=$versionJson.Prerelease -eq $false; 
-$version=[version]::new($versionJson.Major, $versionJson.Minor, $versionJson.Build, 0);
 $versionParam = $version.ToString(3);
 $versionTag="v$versionParam" + (&{if($prerelease) {"-prerelease"} else {""}});
 $releaseDate = Get-Date -asUTC -Format "s";

Pub/PublishNuget.ps1

@@ -15,15 +15,16 @@ UpdateProjectVersion $projectFile;
 Write-Host 
 Write-Host "*** Packing..." -BackgroundColor Blue
 rm "$publishDir" -ErrorAction Ignore -Recurse
-dotnet pack "$projectDir" -c "Release" -o "$publishDir" --runtime any -p:Version=$versionParam -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+$nugetVersion="$versionParam" + (&{if($prerelease) {"-prerelease"} else {""}});
+dotnet pack "$projectDir" -c "Release" -o "$publishDir" --runtime any -p:Version=$nugetVersion -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
 if ($LASTEXITCODE -gt 0) { Throw "The pack exited with error code: " + $lastexitcode; }
 
 # publish nuget
 if (!$noPushNuget)
 {
 	Write-Host
 	Write-Host "*** Publishing..." -BackgroundColor Blue
-	$packageFile = (Join-Path $publishDir "$packageId.$versionParam.nupkg")
+	$packageFile = (Join-Path $publishDir "$packageId.$nugetVersion.nupkg")
 	dotnet nuget push $packageFile --api-key $nugetApiKey --source https://api.nuget.org/v3/index.json
 	if ($LASTEXITCODE -gt 0) { Write-Host ("The publish exited with error code: " + $lastexitcode) -ForegroundColor Red;  }
 }

Pub/PublishToGitHub.ps1

@@ -7,8 +7,8 @@ $changeLog = $text -replace "# Upcoming", "# v$versionParam";
 $changeLog  | Out-File -FilePath "$solutionDir/CHANGELOG.md" -Encoding utf8 -Force -NoNewline;
 
 # create release note
-$releaseNote = $text -replace "# Upcoming", "$versionTag`n";
-$releaseNote = $releaseNote -replace "# $versionTag`n", ""; # remove version hash
+$releaseNote = $changeLog;
+$releaseNote = $releaseNote -replace "# $versionTag`r`n", ""; # remove version hash
 $releaseNote = $releaseNote.SubString(0, $releaseNote.IndexOf("`n# "));
 # $releaseNote += "To see a list of all changes visit: [Changelog](https://github.com/vpnhood/VpnHood/blob/main/CHANGELOG.md)";
 $releaseNote | Out-File -FilePath "$packagesRootDir/ReleaseNote.txt" -Encoding utf8 -Force -NoNewline;

Pub/Version.json

@@ -1,8 +1,6 @@
 {
-  "Major": 2,
-  "Minor": 6,
-  "Build": 346,
-  "BumpTime": "2023-02-03T21:51:41.0629987Z",
+  "Version": "2.7.350",
+  "BumpTime": "2023-02-13T21:10:19.5187587Z",
   "Prerelease": false,
   "DeprecatedVersion": "2.0.0"
 }

Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj

@@ -108,10 +108,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="VpnHood.Client">
-      <Version>2.6.332</Version>
+      <Version>2.6.348</Version>
     </PackageReference>
     <PackageReference Include="VpnHood.Client.Device.Android">
-      <Version>2.6.332</Version>
+      <Version>2.6.348</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Essentials" Version="1.7.4" />
   </ItemGroup>

Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj

@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="VpnHood.Client" Version="2.6.332" />
-    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.6.332" />
+    <PackageReference Include="VpnHood.Client" Version="2.6.348" />
+    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.6.348" />
   </ItemGroup>
 
 </Project>

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="346" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.6.346">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="350" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.7.350">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="33" />
   <uses-feature android:name="android.software.leanback" android:required="false" />
   <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj

@@ -12,8 +12,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Tiny internal webserver to server your single-page application (SPA). You need this only if you want to create a UI for your VpnHood client by single-page application (SPA).</Description>
     <PackageId>VpnHood.Client.App.UI</PackageId>
-    <Version>2.6.346</Version>
-    <AssemblyVersion>2.6.346</AssemblyVersion>
+    <Version>2.7.350</Version>
+    <AssemblyVersion>2.7.350</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="17.7" version="20.2.1" Modules="professional" RootPath="." Language="en" Id="{F5BEDA55-1847-4909-B85B-443D6C887C92}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="17.7" version="20.3.1" Modules="professional" RootPath="." Language="en" Id="{F5BEDA55-1847-4909-B85B-443D6C887C92}">
   <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
     <ROW Name="HiddenItems" Value="ActSyncAppComponent;CPLAppletComponent;AppXAppDetailsComponent;FixupComponent;AppXCapabilitiesComponent;AppXDependenciesComponent;AppXProductDetailsComponent;AppXVisualAssetsComponent;AppXAppDeclarationsComponent;AppXUriRulesComponent;MsiXDiffComponent;MsixManifestEditorComponent"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="AI_CURRENT_YEAR" Value="2023" ValueLocId="-"/>
     <ROW Property="AI_EXTERNALUIUNINSTALLERNAME" MultiBuildValue="DefaultBuild:aiui"/>
-    <ROW Property="AI_PACKAGING_TOOL" Value="Advanced Installer 20.2.1 build b066527d" ValueLocId="-"/>
+    <ROW Property="AI_PACKAGING_TOOL" Value="Advanced Installer 20.3.1 build dae8a046" ValueLocId="-"/>
     <ROW Property="AI_PREDEF_LCONDS_PROPS" Value="AI_DETECTED_INTERNET_CONNECTION"/>
     <ROW Property="AI_PRODUCTNAME_ARP" Value="VpnHood"/>
     <ROW Property="AI_RUN_AS_ADMIN" Value="1"/>
@@ -23,10 +23,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="DOTNET" Value="dotnet"/>
     <ROW Property="Manufacturer" Value="VpnHood"/>
-    <ROW Property="ProductCode" Value="1033:{7B4DABD2-DDFB-429F-BF69-AB0606E778DD} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{2A363930-1FB1-49E2-88AC-123F0FC5B15C} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="VpnHood"/>
-    <ROW Property="ProductVersion" Value="2023.1.27.1538" Options="16"/>
+    <ROW Property="ProductVersion" Value="2.6.348" Options="16"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{38FCFAB0-A40C-4840-A9F9-B7A06A5BC552}"/>
@@ -72,7 +72,7 @@
     <ROW Directory="zhHant_Dir" Directory_Parent="APPDIR" DefaultDir="zh-Hant"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
-    <ROW Component="AI_CustomARPName" ComponentId="{ACBF0F8C-64BD-4290-B808-123573C2347D}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
+    <ROW Component="AI_CustomARPName" ComponentId="{7591CA2F-1582-43A1-9145-95A485EA40FD}" Directory_="APPDIR" Attributes="260" KeyPath="DisplayName" Options="1"/>
     <ROW Component="AI_DisableModify" ComponentId="{21851DB9-D1F6-4B22-9844-D91CE291D8A3}" Directory_="APPDIR" Attributes="260" KeyPath="NoModify" Options="1"/>
     <ROW Component="APPDIR" ComponentId="{6782C70B-B5DB-4ACB-ACED-FA77FF112859}" Directory_="APPDIR" Attributes="0"/>
     <ROW Component="Accessibility.dll" ComponentId="{6125235F-C8DC-42E0-BC59-0E11D956B841}" Directory_="APPDIR" Attributes="0" KeyPath="Accessibility.dll"/>
@@ -1104,7 +1104,7 @@
     <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DynamicPropertyComponent">
-    <ROW Property="ProductVersion" Type="2" SourcePath="VpnHoodClient.dll"/>
+    <ROW Property="ProductVersion" Type="3" SourcePath="..\Pub\Version.json" PathInSource="Root\Version"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
     <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>