switch to msi

MiloradLalovic · Jan 27, 2023 · fb22c8f · fb22c8f
1 parent 6f41605
commit fb22c8f
Show file tree

Hide file tree

Showing 19 changed files with 1,986 additions and 97 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
-# v2.6.341
+# Upcoming
 ### Client
 * Fix: UDP port memory leak
+* Feature: Notify when new version is available
 * Update: Add build version on top right of screen
+* Update: Winodws: Switch to MSI package to prevent False positive virus detection
 
 ### Server
 * Fix: UDP port memory leak

diff --git a/Pub/Version.json b/Pub/Version.json
@@ -1,8 +1,8 @@
 {
   "Major": 2,
   "Minor": 6,
-  "Build": 341,
-  "BumpTime": "2023-01-26T20:54:43.8152202Z",
-  "Prerelease": true,
+  "Build": 342,
+  "BumpTime": "2023-01-27T18:07:28.8588504Z",
+  "Prerelease": false,
   "DeprecatedVersion": "2.0.0"
 }
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="341" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.6.341">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="342" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.6.342">
   <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" />

diff --git a/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj b/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.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

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.App.Win.Setup/VpnHood.Client.App.Win.Setup.back.aip b/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.back.aip
diff --git a/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj b/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
@@ -19,8 +19,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <PackageId>VpnHood.Client.App.Win</PackageId>
     <StartupObject></StartupObject>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>

diff --git a/VpnHood.Client.App.Win/WinApp.cs b/VpnHood.Client.App.Win/WinApp.cs
@@ -97,7 +97,6 @@ public void Start(string[] args)
         {
             LogToConsole = logToConsole, 
             AppDataPath = AppLocalDataPath,
-            //UpdateInfoUrl = new Uri("https://github.com/vpnhood/VpnHood/releases/latest/download/VpnHoodClient-win-x64.json")
             UpdateInfoUrl = new Uri("https://github.com/vpnhood/VpnHood/releases/latest/download/VpnHoodClient-win-x64.json")
         });
         VpnHoodAppUi.Init(new MemoryStream(Resource.SPA));

diff --git a/VpnHood.Client.App.Win/_publish.ps1 b/VpnHood.Client.App.Win/_publish.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot/../Pub/Common.ps1"
+. "$PSScriptRoot/../Pub/Common.ps1";
 
 Write-Host;
 Write-Host "*** Building Client Windows ..." -BackgroundColor Blue -ForegroundColor White;
@@ -31,7 +31,7 @@ $module_updaterConfigFile= "$moduleDir/$module_title.txt";
 # publish 
 Write-Host;
 if (-not $noclean)  { dotnet clean "$projectDir" -c "Release" --output $publishDir /verbosity:$msverbosity }
-dotnet publish "$projectDir" -c "Release" --output $publishDir --framework "net7.0-windows --self-contained --runtime "win-x64" /p:Version=$versionParam;
+dotnet publish "$projectDir" -c "Release" --output $publishDir --framework "net7.0-windows" --self-contained --runtime "win-x64" /p:Version=$versionParam;
 if ($LASTEXITCODE -gt 0) { Throw "The publish exited with error code: " + $lastexitcode; }
 
 # Build Setup

diff --git a/VpnHood.Client.App/VpnHood.Client.App.csproj b/VpnHood.Client.App/VpnHood.Client.App.csproj
@@ -11,8 +11,8 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <Description>Readymade Vpn App skeleton for VpnHood clients. You just need to create a UI on it.</Description>
     <PackageId>VpnHood.Client.App</PackageId>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.App/VpnHoodApp.cs b/VpnHood.Client.App/VpnHoodApp.cs
@@ -134,7 +134,7 @@ private VpnHoodApp(IAppProvider clientAppProvider, AppOptions? options = default
         ClientIpGroup = _lastClientIpGroup,
         IsWaitingForAd = IsWaitingForAd,
         VersionStatus = VersionStatus,
-        LastPublishInfo = LatestPublishInfo
+        LastPublishInfo = VersionStatus is VersionStatus.Deprecated or VersionStatus.Old ? LatestPublishInfo : null
     };
 
     private Guid? DefaultClientProfileId

diff --git a/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj b/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj
@@ -9,10 +9,10 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood client device provider for Windows using WinDivert.</Description>
-    <Version>2.6.341</Version>
+    <Version>2.6.342</Version>
     <PackageId>VpnHood.Client.Device.WinDivert</PackageId>
     <Version>1.1.226</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj
@@ -14,8 +14,8 @@
     <RepositoryType></RepositoryType>
     <PackageId>VpnHood.Client.Device</PackageId>
     <RootNamespace>VpnHood.Client.Device</RootNamespace>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client/VpnHood.Client.csproj b/VpnHood.Client/VpnHood.Client.csproj
@@ -13,8 +13,8 @@
     <Copyright>2022 VpnHood</Copyright>
     <PackageId>VpnHood.Client</PackageId>
     <PackageTags>VPN VpnClient Proxy</PackageTags>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Common/VpnHood.Common.csproj b/VpnHood.Common/VpnHood.Common.csproj
@@ -12,8 +12,8 @@
     <PackageId>VpnHood.Common</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood Common Library is shared among all other VpnHood modules.</Description>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Server.Access/VpnHood.Server.Access.csproj b/VpnHood.Server.Access/VpnHood.Server.Access.csproj
@@ -12,8 +12,8 @@
     <PackageId>VpnHood.Server.Access</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Stores, and retrieves end users' access and usage. Provides required interfaces and classes to use or create an access server and accounting.</Description>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj b/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj
@@ -12,8 +12,8 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageIcon>VpnHood.png</PackageIcon>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Server/VpnHood.Server.csproj b/VpnHood.Server/VpnHood.Server.csproj
@@ -13,8 +13,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>The core of VpnHood server. It can listen and accept connections from VpnHood clients.</Description>
     <PackageId>VpnHood.Server</PackageId>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Tunneling/VpnHood.Tunneling.csproj b/VpnHood.Tunneling/VpnHood.Tunneling.csproj
@@ -15,8 +15,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Product>VpnHood.Tunneling</Product>
     <Description>Provides tunnelling classes and protocols shared between VpnHood.Client and VpnHood.Server.</Description>
-    <Version>2.6.341</Version>
-    <AssemblyVersion>2.6.341</AssemblyVersion>
+    <Version>2.6.342</Version>
+    <AssemblyVersion>2.6.342</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>