up 7.3.2

up PackageReference
Fix
2025-10-13 20:09:12 +00:00 · 2024-12-15 15:14:25 +08:00 · 2024-12-15 15:13:37 +08:00 · 2024-12-15 14:41:48 +08:00 · 2024-12-15 14:41:29 +08:00 · 2024-12-15 14:27:00 +08:00
9 changed files with 13 additions and 65 deletions
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@ -1382,7 +1382,7 @@
    <value>关闭窗口时隐藏至托盘</value>
  </data>
  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
-    <value>测速时自动分批的每批数量（最大1000）</value>
+    <value>测试时自动分批的每批数量（最大1000）</value>
  </data>
  <data name="TbSettingsExceptionTip2" xml:space="preserve">
    <value>例外. 对于下列地址不使用代理配置文件:使用逗号(,)分隔</value>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@ -1382,7 +1382,7 @@
    <value>關閉視窗時隱藏至托盤</value>
  </data>
  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
-    <value>測速時自動分批的每批數量（最大1000）</value>
+    <value>測試時自動分批的每批數量（最大1000）</value>
  </data>
  <data name="TbSettingsExceptionTip2" xml:space="preserve">
    <value>例外. 對於下列位址不使用代理設定檔:使用逗號(,)分隔</value>
--- a/v2rayN/ServiceLib/Sample/custom_routing_locked
+++ b/v2rayN/ServiceLib/Sample/custom_routing_locked
@ -1,21 +0,0 @@
-[
-  {
-    "domain": [
-      "geosite:google"
-    ],
-    "outboundTag": "proxy"
-  },
-  {
-    "outboundTag": "direct",
-    "domain": [
-      "domain:example-example.com",
-      "domain:example-example2.com"
-    ]
-  },
-  {
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  }
-]
--- a/v2rayN/ServiceLib/Sample/custom_routing_rules
+++ b/v2rayN/ServiceLib/Sample/custom_routing_rules
@ -1,29 +0,0 @@
-[
-	{
-		"remarks": "block",
-		"outboundTag": "block",
-		"domain": [
-			"geosite:category-ads-all"
-		]
-	},
-	{
-		"remarks": "direct",
-		"outboundTag": "direct",
-		"domain": [
-			"geosite:cn"
-		]
-	},
-	{
-		"remarks": "direct",
-		"outboundTag": "direct",
-		"ip": [
-			"geoip:private",
-			"geoip:cn"
-		]
-	},
-	{
-		"remarks": "proxy",
-		"port": "0-65535",
-		"outboundTag": "proxy"
-	}
-]
--- a/v2rayN/ServiceLib/ServiceLib.csproj
+++ b/v2rayN/ServiceLib/ServiceLib.csproj
@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.3.1</Version>
+	<Version>7.3.2</Version>
  </PropertyGroup>
 
 	<ItemGroup>
@ -16,9 +16,9 @@
 		<PackageReference Include="WebDav.Client" Version="2.8.0" />
 		<PackageReference Include="YamlDotNet" Version="16.2.1" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
-		<PackageReference Include="CliWrap" Version="3.6.7" /> 
+		<PackageReference Include="CliWrap" Version="3.7.0" /> 
 		<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" />
-		<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
+		<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.20" />
 		<PackageReference Include="TaskScheduler" Version="2.11.0" />

 	</ItemGroup>
@ -28,8 +28,6 @@
    <EmbeddedResource Include="Sample\clash_tun_yaml" />
    <EmbeddedResource Include="Sample\custom_routing_black" />
    <EmbeddedResource Include="Sample\custom_routing_global" />
-    <EmbeddedResource Include="Sample\custom_routing_locked" />
-    <EmbeddedResource Include="Sample\custom_routing_rules" />
    <EmbeddedResource Include="Sample\custom_routing_white" />
    <EmbeddedResource Include="Sample\dns_singbox_normal" />
    <EmbeddedResource Include="Sample\dns_v2ray_normal" />
--- a/v2rayN/v2rayN.Desktop/App.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/App.axaml.cs
@ -56,13 +56,13 @@ public partial class App : Application
    {
    }

-    private void MenuAddServerViaClipboardClick(object? sender, EventArgs e)
+    private async void MenuAddServerViaClipboardClick(object? sender, EventArgs e)
    {
        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
        {
            if (desktop.MainWindow != null)
            {
-                var clipboardData = AvaUtils.GetClipboardData(desktop.MainWindow).Result;
+                var clipboardData = await AvaUtils.GetClipboardData(desktop.MainWindow);
                var service = Locator.Current.GetService<MainWindowViewModel>();
                if (service != null) _ = service.AddServerViaClipboardAsync(clipboardData);
            }
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@ -28,8 +28,8 @@
        <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.2" />
        <PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
        <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />		
-        <PackageReference Include="Semi.Avalonia" Version="11.2.1.1" />
-        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.2.1.1" />
+        <PackageReference Include="Semi.Avalonia" Version="11.2.1.2" />
+        <PackageReference Include="Semi.Avalonia.DataGrid" Version="11.2.1.2" />
        <PackageReference Include="ReactiveUI" Version="20.1.63" />
        <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 	</ItemGroup>
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@ -20,7 +20,7 @@ namespace v2rayN.Views
            _config.GlobalHotkeys ??= new List<KeyEventItem>();

            btnReset.Click += btnReset_Click;
-            btnSave.Click += btnSave_Click;
+            btnSave.Click += btnSave_ClickAsync;

            txtGlobalHotkey0.KeyDown += TxtGlobalHotkey_PreviewKeyDown;
            txtGlobalHotkey1.KeyDown += TxtGlobalHotkey_PreviewKeyDown;
@ -99,11 +99,11 @@ namespace v2rayN.Views
            }
        }

-        private void btnSave_Click(object sender, RoutedEventArgs e)
+        private async void btnSave_ClickAsync(object sender, RoutedEventArgs e)
        {
            _config.GlobalHotkeys = _TextBoxKeyEventItem.Values.ToList();

-            if (ConfigHandler.SaveConfig(_config).Result == 0)
+            if (await ConfigHandler.SaveConfig(_config) == 0)
            {
                HotkeyHandler.Instance.ReLoad();
                this.DialogResult = true;
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@ -15,7 +15,7 @@
 	
 	<ItemGroup>
 		<PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
-		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.1.4" />
+		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" /> 
 		<PackageReference Include="ReactiveUI.WPF" Version="20.1.63" />
 	</ItemGroup>
Author	SHA1	Message	Date
2dust	3d1bcffdc5	up 7.3.2 Some checks are pending release macos / build (Release) (push) Waiting to run Details release / build (Release) (push) Waiting to run Details	2024-12-15 15:14:25 +08:00
2dust	45fa0f94d2	up PackageReference	2024-12-15 15:13:37 +08:00
2dust	ed16b7de4a	Fix https://github.com/2dust/v2rayN/issues/6258	2024-12-15 14:41:48 +08:00
2dust	f2ec03c7ec	Bug fix https://github.com/2dust/v2rayN/issues/6263	2024-12-15 14:41:29 +08:00
2dust	11db87f1e6	Remove unused resources	2024-12-15 14:27:00 +08:00