Merge 11924b545f into 5d6c5da9d9

up 7.15.0
Code clean
2025-10-13 20:09:12 +00:00 · 2025-09-29 06:05:21 +08:00 · 2025-09-28 19:12:58 +08:00 · 2025-09-28 19:12:17 +08:00
5 changed files with 3 additions and 6 deletions
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@ -1,7 +1,7 @@
 <Project>
    <PropertyGroup>
-        <Version>7.14.12</Version>
+        <Version>7.15.0</Version>
    </PropertyGroup>
    <PropertyGroup>
--- a/v2rayN/ServiceLib/Manager/AppManager.cs
+++ b/v2rayN/ServiceLib/Manager/AppManager.cs
@ -1,5 +1,3 @@
 using System.Reactive;
 namespace ServiceLib.Manager;
 public sealed class AppManager
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@ -338,6 +338,6 @@ public class CheckUpdateViewModel : MyReactiveObject
        {
            return;
        }
-        found.Remarks = model.Remarks; 
+        found.Remarks = model.Remarks;
    }
 }
--- a/v2rayN/v2rayN.Desktop/App.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/App.axaml.cs
@ -1,4 +1,3 @@
 using System.Reactive;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@ -19,7 +19,7 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
        InitializeComponent();
        _config = AppManager.Instance.Config;
-        
+
        ViewModel = StatusBarViewModel.Instance;
        ViewModel?.InitUpdateView(UpdateViewHandler);
Author	SHA1	Message	Date
DHR60	ea857861d0	Merge `11924b545f` into `5d6c5da9d9`	2025-09-29 06:05:21 +08:00
2dust	5d6c5da9d9	up 7.15.0 Some checks failed release Linux / build (Release) (push) Has been cancelled Details release macOS / build (Release) (push) Has been cancelled Details release Windows desktop (Avalonia UI) / build (Release) (push) Has been cancelled Details release Windows / build (Release) (push) Has been cancelled Details	2025-09-28 19:12:58 +08:00
2dust	ade2db3903	Code clean	2025-09-28 19:12:17 +08:00