Merge 437b2bd4e6 into 4e042295d2

Refactor
Avoid duplicate tags
2025-10-27 02:34:41 +00:00 · 2025-09-13 07:14:58 +00:00 · 2025-09-13 15:11:10 +08:00 · 2025-09-13 15:05:18 +08:00 · 2025-09-13 15:05:18 +08:00 · 2025-09-13 15:05:18 +08:00
37 changed files with 8 additions and 40 deletions
--- a/v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/AddGroupServerViewModel.cs
@ -1,4 +1,3 @@
-using System.Data;
 using System.Reactive;
 using DynamicData.Binding;
 using ReactiveUI;
--- a/v2rayN/v2rayN.Desktop/App.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/App.axaml.cs
@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;
 using v2rayN.Desktop.Views;
--- a/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
+++ b/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Desktop.Base;

--- a/v2rayN/v2rayN.Desktop/GlobalUsings.cs
+++ b/v2rayN/v2rayN.Desktop/GlobalUsings.cs
@ -1,8 +1,9 @@
-global using ServiceLib;
+global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
+global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
 global using ServiceLib.ViewModels;
--- a/v2rayN/v2rayN.Desktop/Program.cs
+++ b/v2rayN/v2rayN.Desktop/Program.cs
@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Common;

 namespace v2rayN.Desktop;
--- a/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs
@ -8,7 +8,6 @@ using Avalonia.Styling;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Semi.Avalonia;
-using ServiceLib.Manager;

 namespace v2rayN.Desktop.ViewModels;

--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;

 namespace v2rayN.Desktop.Views;
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs
@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;

 namespace v2rayN.Desktop.Views;
--- a/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/FullConfigTemplateWindow.axaml.cs
@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;

 namespace v2rayN.Desktop.Views;
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@ -10,7 +10,6 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Base;
 using v2rayN.Desktop.Common;
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Desktop.Base;

 namespace v2rayN.Desktop.Views;
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
@ -6,7 +6,6 @@ using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Desktop.Views;

--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@ -8,7 +8,6 @@ using Avalonia.Threading;
 using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;

--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs
@ -6,7 +6,6 @@ using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Desktop.Common;

--- a/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs
@ -2,7 +2,6 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using CliWrap.Buffered;
 using DialogHostAvalonia;
-using ServiceLib.Manager;

 namespace v2rayN.Desktop.Views;

--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@ -1,7 +1,6 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Threading;
-using ServiceLib.Manager;

 namespace v2rayN;

--- a/v2rayN/v2rayN/Base/WindowBase.cs
+++ b/v2rayN/v2rayN/Base/WindowBase.cs
@ -1,6 +1,5 @@
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Base;

--- a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
+++ b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
@ -1,5 +1,4 @@
 using System.Windows.Media;
-using ServiceLib.Manager;

 namespace v2rayN.Converters;

--- a/v2rayN/v2rayN/GlobalUsings.cs
+++ b/v2rayN/v2rayN/GlobalUsings.cs
@ -1,8 +1,9 @@
-global using ServiceLib;
+global using ServiceLib;
 global using ServiceLib.Base;
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
+global using ServiceLib.Manager;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
 global using ServiceLib.ViewModels;
--- a/v2rayN/v2rayN/Manager/HotkeyManager.cs
+++ b/v2rayN/v2rayN/Manager/HotkeyManager.cs
@ -4,7 +4,6 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using ServiceLib.Manager;

 namespace v2rayN.Manager;

--- a/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs
@ -9,7 +9,6 @@ using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using ServiceLib.Manager;

 namespace v2rayN.ViewModels;

--- a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs
@ -1,8 +1,8 @@
+using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using ReactiveUI;
-using System.Reactive.Disposables;
 using DynamicData;
+using ReactiveUI;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/FullConfigTemplateWindow.xaml.cs
@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@ -4,7 +4,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Manager;

 namespace v2rayN.Views;
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@ -9,7 +9,6 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Manager;

--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@ -4,7 +4,6 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Media;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
@ -4,7 +4,6 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using ReactiveUI;
-using ServiceLib.Manager;
 using v2rayN.Base;

 namespace v2rayN.Views;
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@ -8,7 +8,6 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Base;
 using Point = System.Windows.Point;
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
@ -2,7 +2,6 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml.cs
@ -3,7 +3,6 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
 using ReactiveUI;
-using ServiceLib.Manager;
 using Splat;
 using v2rayN.Manager;

--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml.cs
@ -1,7 +1,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;

--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
@ -4,7 +4,6 @@ using System.Windows;
 using System.Windows.Input;
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
-using ServiceLib.Manager;

 namespace v2rayN.Views;
Author	SHA1	Message	Date
DHR60	bfc47418e0	Merge `437b2bd4e6` into `4e042295d2`	2025-09-13 07:14:58 +00:00
DHR60	437b2bd4e6	Refactor	2025-09-13 15:11:10 +08:00
DHR60	81e4755dda	Avoid duplicate tags	2025-09-13 15:05:18 +08:00
DHR60	9a78dcb61c	Add group in traffic splitting support	2025-09-13 15:05:18 +08:00
DHR60	5bf1b374bd	Add PolicyGroup include other Group support	2025-09-13 15:05:18 +08:00
DHR60	5030269fdd	Add fallback support	2025-09-13 15:05:17 +08:00
DHR60	02ba731442	Fix	2025-09-13 15:05:17 +08:00
DHR60	c81b89b98c	Add Proxy Chain support	2025-09-13 15:05:17 +08:00
DHR60	997d75cc22	Adjust UI	2025-09-13 15:05:17 +08:00
DHR60	17ff20d44a	Add generate policy group	2025-09-13 15:05:17 +08:00
DHR60	fcbf477bb1	Add Policy Group support	2025-09-13 15:05:17 +08:00
DHR60	4bf89187a9	Rename	2025-09-13 15:05:17 +08:00
DHR60	c29c4796c7	Exclude specific profile types from selection	2025-09-13 15:05:17 +08:00
DHR60	14ea998a12	Fix right click not working	2025-09-13 15:05:17 +08:00
DHR60	13ed6e84e7	avalonia	2025-09-13 15:05:17 +08:00
DHR60	cfe515c5ac	VM and wpf	2025-09-13 15:05:17 +08:00
DHR60	1e054cfc7d	Multi Profile	2025-09-13 15:05:17 +08:00
DHR60	4e042295d2	Add global fakeip and fakeip filter (#7919 ) 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-13 14:55:30 +08:00
2dust	33d9c5db6c	up GlobalUsings	2025-09-13 14:46:35 +08:00