diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 87209ad..ed68d96 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -13,8 +13,8 @@ android { minSdk = 26 targetSdk = 35 // versionCode = major*1_000_000 + minor*10_000 + patch*100 + build - versionCode = 2_090_001 - versionName = "2.9.0+1" + versionCode = 3_080_201 + versionName = "3.8.2+1" vectorDrawables.useSupportLibrary = true ndk { abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86_64") diff --git a/assets/app.manifest b/assets/app.manifest index 2d5ac80..df8b289 100644 --- a/assets/app.manifest +++ b/assets/app.manifest @@ -1,7 +1,7 @@ diff --git a/dist/navis-release/update.json b/dist/navis-release/update.json index 1da79ef..2efd3f3 100644 --- a/dist/navis-release/update.json +++ b/dist/navis-release/update.json @@ -1,48 +1,48 @@ { - "version": "2.8.0", - "notes": "2.8.0: релизы разделены по папкам windows/macos/android; обновления строго по платформе (Windows не получит Mac и наоборот); номер сборки 2.8.0+N.", - "platform": "windows-amd64", - "os": "windows", - "arch": "amd64", - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", - "sha256": "de672a772971c231e0ad407f1b74ef98b16918fbc3352345e891b1ecc43b1cd2", - "mandatory": false, - "platforms": { - "windows-amd64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", - "sha256": "de672a772971c231e0ad407f1b74ef98b16918fbc3352345e891b1ecc43b1cd2", - "os": "windows", - "arch": "amd64" - }, - "darwin-arm64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis", - "sha256": "01a40b1cce4e2fb3a38eb80f0815c295a00af11e4288f3b9e5c0b58ae336f28d", - "os": "darwin", - "arch": "arm64", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.app.zip" - }, - "darwin-amd64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis", - "sha256": "19a066cfc7f7c3a291a220482b28e66a459d091c19c5351818c401b982bc65b3", - "os": "darwin", - "arch": "amd64", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.app.zip" - }, - "darwin-universal": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis", - "sha256": "d53dba8256fd6f7b62d1ce9bbad741af087ae44fec942bf2782b9c8f4e36cef2", - "os": "darwin", - "arch": "universal", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.app.zip" - }, - "android": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/android/Navis.apk", - "sha256": "4416770bebe576eba42811990c4e4424f6722dea3a8513e6164dd34fc975b3cf", - "os": "android", - "arch": "universal" - } - } + "version": "3.8.2", + "notes": "3.8.2: Windows product version 3.8.2.1 (build 1).", + "platform": "windows-amd64", + "os": "windows", + "arch": "amd64", + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", + "sha256": "8049f973e8e8712b31fccac42c48be5eb436a5a6bf103eb979729e1cbfdec8ec", + "mandatory": false, + "platforms": { + "windows-amd64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", + "sha256": "8049f973e8e8712b31fccac42c48be5eb436a5a6bf103eb979729e1cbfdec8ec", + "os": "windows", + "arch": "amd64" + }, + "darwin-arm64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis", + "sha256": "01a40b1cce4e2fb3a38eb80f0815c295a00af11e4288f3b9e5c0b58ae336f28d", + "os": "darwin", + "arch": "arm64", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.app.zip" + }, + "darwin-amd64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis", + "sha256": "19a066cfc7f7c3a291a220482b28e66a459d091c19c5351818c401b982bc65b3", + "os": "darwin", + "arch": "amd64", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.app.zip" + }, + "darwin-universal": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis", + "sha256": "d53dba8256fd6f7b62d1ce9bbad741af087ae44fec942bf2782b9c8f4e36cef2", + "os": "darwin", + "arch": "universal", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.app.zip" + }, + "android": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/android/Navis.apk", + "sha256": "4416770bebe576eba42811990c4e4424f6722dea3a8513e6164dd34fc975b3cf", + "os": "android", + "arch": "universal" + } + } } diff --git a/dist/navis-release/windows/Navis.exe b/dist/navis-release/windows/Navis.exe index 57b11e6..fce1e64 100644 Binary files a/dist/navis-release/windows/Navis.exe and b/dist/navis-release/windows/Navis.exe differ diff --git a/dist/navis-release/windows/vpnclient.exe b/dist/navis-release/windows/vpnclient.exe index 98c7c8d..2726718 100644 Binary files a/dist/navis-release/windows/vpnclient.exe and b/dist/navis-release/windows/vpnclient.exe differ diff --git a/dist/update.json b/dist/update.json index 1da79ef..2efd3f3 100644 --- a/dist/update.json +++ b/dist/update.json @@ -1,48 +1,48 @@ { - "version": "2.8.0", - "notes": "2.8.0: релизы разделены по папкам windows/macos/android; обновления строго по платформе (Windows не получит Mac и наоборот); номер сборки 2.8.0+N.", - "platform": "windows-amd64", - "os": "windows", - "arch": "amd64", - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", - "sha256": "de672a772971c231e0ad407f1b74ef98b16918fbc3352345e891b1ecc43b1cd2", - "mandatory": false, - "platforms": { - "windows-amd64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", - "sha256": "de672a772971c231e0ad407f1b74ef98b16918fbc3352345e891b1ecc43b1cd2", - "os": "windows", - "arch": "amd64" - }, - "darwin-arm64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis", - "sha256": "01a40b1cce4e2fb3a38eb80f0815c295a00af11e4288f3b9e5c0b58ae336f28d", - "os": "darwin", - "arch": "arm64", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.app.zip" - }, - "darwin-amd64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis", - "sha256": "19a066cfc7f7c3a291a220482b28e66a459d091c19c5351818c401b982bc65b3", - "os": "darwin", - "arch": "amd64", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.app.zip" - }, - "darwin-universal": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis", - "sha256": "d53dba8256fd6f7b62d1ce9bbad741af087ae44fec942bf2782b9c8f4e36cef2", - "os": "darwin", - "arch": "universal", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.app.zip" - }, - "android": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/android/Navis.apk", - "sha256": "4416770bebe576eba42811990c4e4424f6722dea3a8513e6164dd34fc975b3cf", - "os": "android", - "arch": "universal" - } - } + "version": "3.8.2", + "notes": "3.8.2: Windows product version 3.8.2.1 (build 1).", + "platform": "windows-amd64", + "os": "windows", + "arch": "amd64", + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", + "sha256": "8049f973e8e8712b31fccac42c48be5eb436a5a6bf103eb979729e1cbfdec8ec", + "mandatory": false, + "platforms": { + "windows-amd64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", + "sha256": "8049f973e8e8712b31fccac42c48be5eb436a5a6bf103eb979729e1cbfdec8ec", + "os": "windows", + "arch": "amd64" + }, + "darwin-arm64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis", + "sha256": "01a40b1cce4e2fb3a38eb80f0815c295a00af11e4288f3b9e5c0b58ae336f28d", + "os": "darwin", + "arch": "arm64", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.app.zip" + }, + "darwin-amd64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis", + "sha256": "19a066cfc7f7c3a291a220482b28e66a459d091c19c5351818c401b982bc65b3", + "os": "darwin", + "arch": "amd64", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.app.zip" + }, + "darwin-universal": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis", + "sha256": "d53dba8256fd6f7b62d1ce9bbad741af087ae44fec942bf2782b9c8f4e36cef2", + "os": "darwin", + "arch": "universal", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.app.zip" + }, + "android": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/android/Navis.apk", + "sha256": "4416770bebe576eba42811990c4e4424f6722dea3a8513e6164dd34fc975b3cf", + "os": "android", + "arch": "universal" + } + } } diff --git a/internal/appui/index.html b/internal/appui/index.html index c0534a5..0d8839c 100644 --- a/internal/appui/index.html +++ b/internal/appui/index.html @@ -854,7 +854,7 @@

Navis

- 2.9.0 + 3.8.2

Быстрый клиент · Naive · Hy2 · AWG · Xray

diff --git a/internal/update/update.go b/internal/update/update.go index d8b89a4..e0d4e50 100644 --- a/internal/update/update.go +++ b/internal/update/update.go @@ -18,7 +18,7 @@ import ( // CurrentVersion is the product/semver used for update eligibility (feed "version"). // Keep major.minor.patch only — no build suffix here. -const CurrentVersion = "2.9.0" +const CurrentVersion = "3.8.2" // BuildNumber is the monotonic build within CurrentVersion (Windows FileVersion 4th part, // macOS CFBundleVersion suffix, Android versionCode low digits). Bump on every release build. diff --git a/packaging/msix/AppxManifest.xml b/packaging/msix/AppxManifest.xml index 06fdcb5..e85c0c0 100644 --- a/packaging/msix/AppxManifest.xml +++ b/packaging/msix/AppxManifest.xml @@ -33,7 +33,7 @@ diff --git a/scripts/pack-msix.ps1 b/scripts/pack-msix.ps1 index 2be66ff..26f06e9 100644 --- a/scripts/pack-msix.ps1 +++ b/scripts/pack-msix.ps1 @@ -9,13 +9,13 @@ .EXAMPLE .\scripts\pack-msix.ps1 - .\scripts\pack-msix.ps1 -Version 2.9.0.1 -Publisher "CN=EvilFox" + .\scripts\pack-msix.ps1 -Version 3.8.2.1 -Publisher "CN=EvilFox" #> [CmdletBinding()] param( [string]$ExePath = "", [string]$OutDir = "", - [string]$Version = "2.9.0.1", + [string]$Version = "3.8.2.1", [string]$Name = "EvilFox.Navis", [string]$Publisher = "CN=EvilFox", [string]$DisplayName = "Navis", @@ -82,7 +82,7 @@ $manifestText = Get-Content -LiteralPath $ManifestSrc -Raw -Encoding UTF8 # Prefer exact placeholder swaps so we never touch . $manifestText = $manifestText.Replace('Name="EvilFox.Navis"', "Name=`"$Name`"") $manifestText = $manifestText.Replace('Publisher="CN=EvilFox"', "Publisher=`"$Publisher`"") -$manifestText = $manifestText.Replace('Version="2.9.0.1"', "Version=`"$Version`"") +$manifestText = $manifestText.Replace('Version="3.8.2.1"', "Version=`"$Version`"") $manifestText = $manifestText.Replace('Navis', "$DisplayName") $manifestText = $manifestText.Replace('EvilFox', "$PublisherDisplayName") $manifestText = $manifestText.Replace('DisplayName="Navis"', "DisplayName=`"$DisplayName`"") diff --git a/server/update.json b/server/update.json index 1da79ef..2efd3f3 100644 --- a/server/update.json +++ b/server/update.json @@ -1,48 +1,48 @@ { - "version": "2.8.0", - "notes": "2.8.0: релизы разделены по папкам windows/macos/android; обновления строго по платформе (Windows не получит Mac и наоборот); номер сборки 2.8.0+N.", - "platform": "windows-amd64", - "os": "windows", - "arch": "amd64", - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", - "sha256": "de672a772971c231e0ad407f1b74ef98b16918fbc3352345e891b1ecc43b1cd2", - "mandatory": false, - "platforms": { - "windows-amd64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", - "sha256": "de672a772971c231e0ad407f1b74ef98b16918fbc3352345e891b1ecc43b1cd2", - "os": "windows", - "arch": "amd64" - }, - "darwin-arm64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis", - "sha256": "01a40b1cce4e2fb3a38eb80f0815c295a00af11e4288f3b9e5c0b58ae336f28d", - "os": "darwin", - "arch": "arm64", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.app.zip" - }, - "darwin-amd64": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis", - "sha256": "19a066cfc7f7c3a291a220482b28e66a459d091c19c5351818c401b982bc65b3", - "os": "darwin", - "arch": "amd64", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.app.zip" - }, - "darwin-universal": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis", - "sha256": "d53dba8256fd6f7b62d1ce9bbad741af087ae44fec942bf2782b9c8f4e36cef2", - "os": "darwin", - "arch": "universal", - "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.dmg", - "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.app.zip" - }, - "android": { - "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/android/Navis.apk", - "sha256": "4416770bebe576eba42811990c4e4424f6722dea3a8513e6164dd34fc975b3cf", - "os": "android", - "arch": "universal" - } - } + "version": "3.8.2", + "notes": "3.8.2: Windows product version 3.8.2.1 (build 1).", + "platform": "windows-amd64", + "os": "windows", + "arch": "amd64", + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", + "sha256": "8049f973e8e8712b31fccac42c48be5eb436a5a6bf103eb979729e1cbfdec8ec", + "mandatory": false, + "platforms": { + "windows-amd64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/windows/Navis.exe", + "sha256": "8049f973e8e8712b31fccac42c48be5eb436a5a6bf103eb979729e1cbfdec8ec", + "os": "windows", + "arch": "amd64" + }, + "darwin-arm64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis", + "sha256": "01a40b1cce4e2fb3a38eb80f0815c295a00af11e4288f3b9e5c0b58ae336f28d", + "os": "darwin", + "arch": "arm64", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/arm64/Navis.app.zip" + }, + "darwin-amd64": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis", + "sha256": "19a066cfc7f7c3a291a220482b28e66a459d091c19c5351818c401b982bc65b3", + "os": "darwin", + "arch": "amd64", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/amd64/Navis.app.zip" + }, + "darwin-universal": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis", + "sha256": "d53dba8256fd6f7b62d1ce9bbad741af087ae44fec942bf2782b9c8f4e36cef2", + "os": "darwin", + "arch": "universal", + "dmg_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.dmg", + "zip_url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/macos/universal/Navis.app.zip" + }, + "android": { + "url": "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/navis-release/android/Navis.apk", + "sha256": "4416770bebe576eba42811990c4e4424f6722dea3a8513e6164dd34fc975b3cf", + "os": "android", + "arch": "universal" + } + } } diff --git a/versioninfo.json b/versioninfo.json index efa6bcc..81e7d40 100644 --- a/versioninfo.json +++ b/versioninfo.json @@ -1,7 +1,7 @@ { "FixedFileInfo": { - "FileVersion": { "Major": 2, "Minor": 9, "Patch": 0, "Build": 1 }, - "ProductVersion": { "Major": 2, "Minor": 9, "Patch": 0, "Build": 1 }, + "FileVersion": { "Major": 3, "Minor": 8, "Patch": 2, "Build": 1 }, + "ProductVersion": { "Major": 3, "Minor": 8, "Patch": 2, "Build": 1 }, "FileFlagsMask": "3f", "FileFlags": "00", "FileOS": "40004", @@ -11,12 +11,12 @@ "StringFileInfo": { "CompanyName": "EvilFox", "FileDescription": "Navis 2 — VPN client (Naive / Hy2 / AWG / VLESS / VMess / Trojan)", - "FileVersion": "2.9.0.1", + "FileVersion": "3.8.2.1", "InternalName": "Navis", "LegalCopyright": "Copyright (c) EvilFox", "OriginalFilename": "Navis.exe", "ProductName": "Navis", - "ProductVersion": "2.9.0.1", + "ProductVersion": "3.8.2.1", "Comments": "Open-source VPN/proxy client. https://evilfox.win/" }, "VarFileInfo": {