diff --git a/packaging/build-osx-app.sh b/packaging/build-osx-app.sh index ac726cb0f..468c87fa4 100644 --- a/packaging/build-osx-app.sh +++ b/packaging/build-osx-app.sh @@ -33,9 +33,9 @@ emit_plist() { CFBundleIdentifier net.steampp.app CFBundleShortVersionString - 2.6.2 + 2.6.3 CFBundleVersion - 2.6.2.0 + 2.6.3.0 LSMinimumSystemVersion 10.14 CFBundleDevelopmentRegion diff --git a/release-template.md b/release-template.md index 36b3ddcd2..d89ee8486 100644 --- a/release-template.md +++ b/release-template.md @@ -6,9 +6,9 @@ 5. 新增 代理设置可自定义 DNS 6. 新增 ASF 编辑/移除 Bot 功能 7. 新增 Android ASF 本地挂卡功能 (Beta) -8. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.2** 之后可用) -9. 新增 Uplay 相关加速服务 (需要升级到 **2.6.2** 之后可用) -10. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.2** 之后可用) +8. 新增 Microsoft/Xbox 相关加速服务 (需要升级到 **2.6.3** 之后可用) +9. 新增 Uplay 相关加速服务 (需要升级到 **2.6.3** 之后可用) +10. 新增 OneDrive 等更多相关加速服务 (需要升级到 **2.6.3** 之后可用) 11. 优化 Desktop 加速代理性能 12. 优化 Desktop 脚本注入打包的性能 13. 优化 Desktop 已安装游戏加载性能 @@ -76,7 +76,7 @@ - .nupkg 文件可使用解压工具打开或解压，找到此文件复制即可 [![steampp.net](https://img.shields.io/badge/WebSite-steampp.net-brightgreen.svg?style=flat-square&color=61dafb)](https://steampp.net) -[![Steam++ v2.6.2](https://img.shields.io/badge/Steam++-v2.6.2-brightgreen.svg?style=flat-square&color=512bd4)]() +[![Steam++ v2.6.3](https://img.shields.io/badge/Steam++-v2.6.3-brightgreen.svg?style=flat-square&color=512bd4)]() ##### [不知道该下载哪个文件?](./download-guide.md) @@ -85,23 +85,23 @@ ### 文件校验 | File | Checksum (SHA256) | | ---- | ---- | -| Steam++_win_x64_v2.6.2.7z | SHA256 | -| Steam++_win_x64_fde_v2.6.2.7z | SHA256 | +| Steam++_win_x64_v2.6.3.7z | SHA256 | +| Steam++_win_x64_fde_v2.6.3.7z | SHA256 | | | | -| Steam++_win_x64_v2.6.2.exe | SHA256 | -| Steam++_win_x64_fde_v2.6.2.exe | SHA256 | +| Steam++_win_x64_v2.6.3.exe | SHA256 | +| Steam++_win_x64_fde_v2.6.3.exe | SHA256 | | | | -| Steam++_linux_x64_v2.6.2.7z | SHA256 | -| Steam++_linux_arm64_v2.6.2.7z | SHA256 | +| Steam++_linux_x64_v2.6.3.7z | SHA256 | +| Steam++_linux_arm64_v2.6.3.7z | SHA256 | | | | -| Steam++_linux_x64_v2.6.2.deb | SHA256 | -| Steam++_linux_arm64_v2.6.2.deb | SHA256 | +| Steam++_linux_x64_v2.6.3.deb | SHA256 | +| Steam++_linux_arm64_v2.6.3.deb | SHA256 | | | | -| Steam++_linux_x64_v2.6.2.rpm | SHA256 | -| Steam++_linux_arm64_v2.6.2.rpm | SHA256 | +| Steam++_linux_x64_v2.6.3.rpm | SHA256 | +| Steam++_linux_arm64_v2.6.3.rpm | SHA256 | | | | -| Steam++_macos_x64_v2.6.2.dmg | SHA256 | +| Steam++_macos_x64_v2.6.3.dmg | SHA256 | | | | -| Steam++_android_arm64_v8a_v2.6.2.apk | SHA256 | -| Steam++_android_armeabi_v7a_v2.6.2.apk | SHA256 | -| Steam++_android_x86_v2.6.2.apk | SHA256 | +| Steam++_android_arm64_v8a_v2.6.3.apk | SHA256 | +| Steam++_android_armeabi_v7a_v2.6.3.apk | SHA256 | +| Steam++_android_x86_v2.6.3.apk | SHA256 | diff --git a/src/Common.CoreLib/Properties/ThisAssembly.Version.cs b/src/Common.CoreLib/Properties/ThisAssembly.Version.cs index d8d85206b..96a3307bf 100644 --- a/src/Common.CoreLib/Properties/ThisAssembly.Version.cs +++ b/src/Common.CoreLib/Properties/ThisAssembly.Version.cs @@ -12,7 +12,7 @@ namespace System.Properties /// macOS：\packaging\build-osx-app.sh <CFBundleVersion> <CFBundleShortVersionString> /// /// - public const string Version = "2.6.2"; + public const string Version = "2.6.3"; //public const string InfoVersion = Version + "-beta"; } diff --git a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest index ca90aa609..0db9bb973 100644 --- a/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest +++ b/src/ST.Client.Desktop.Avalonia.App.Bridge.Package/Package.appxmanifest @@ -10,7 +10,7 @@ + Version="2.6.3.0" /> Steam++ diff --git a/src/ST.Client.Mobile.Droid.App/Properties/AndroidManifest.xml b/src/ST.Client.Mobile.Droid.App/Properties/AndroidManifest.xml index a76a5e877..4d5ba60b1 100644 --- a/src/ST.Client.Mobile.Droid.App/Properties/AndroidManifest.xml +++ b/src/ST.Client.Mobile.Droid.App/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/src/ST.Client/Services/IHostsFileService.cs b/src/ST.Client/Services/IHostsFileService.cs index 71646710e..9ed7ff853 100644 --- a/src/ST.Client/Services/IHostsFileService.cs +++ b/src/ST.Client/Services/IHostsFileService.cs @@ -63,6 +63,10 @@ namespace System.Application.Services /// void OnExitRestoreHosts(); + /// + /// 获取当前 hosts 文件是否包含修改过的标签，注意：产生异常时也将返回 ，并 显示 + /// + /// bool ContainsHostsByTag(); enum EncodingType : byte diff --git a/src/ST.Client/Services/Implementation/HostsFileServiceImpl.cs b/src/ST.Client/Services/Implementation/HostsFileServiceImpl.cs index 2f3995623..305f787d3 100644 --- a/src/ST.Client/Services/Implementation/HostsFileServiceImpl.cs +++ b/src/ST.Client/Services/Implementation/HostsFileServiceImpl.cs @@ -619,16 +619,24 @@ namespace System.Application.Services.Implementation public bool ContainsHostsByTag() { - var filePath = s.HostsFilePath; - var fileInfo = new FileInfo(filePath); - if (fileInfo.Exists && fileInfo.Length <= MaxFileLength) + try { - var lines = File.ReadAllLines(filePath, GetEncoding()); - if (lines.Reverse().Any(x => x.StartsWith(MarkEnd))) + var filePath = s.HostsFilePath; + var fileInfo = new FileInfo(filePath); + if (fileInfo.Exists && fileInfo.Length <= MaxFileLength) { - return true; + var lines = File.ReadAllLines(filePath, GetEncoding()); + if (lines.Reverse().Any(x => x.StartsWith(MarkEnd))) + { + return true; + } } } + catch (Exception ex) + { + Log.Error(TAG, ex, "ContainsHostsByTag fail."); + Toast.Show(AppResources.OperationHostsError_.Format(ex.GetAllMessage())); + } return false; }