From 6f50206606e76040b0251ce8dbe2890fcb81cb7a Mon Sep 17 00:00:00 2001
From: DHR60 <192860629+DHR60@users.noreply.github.com>
Date: Mon, 13 Jul 2026 01:41:28 +0000
Subject: [PATCH] Update Avalonia to 12.1 (#9148)
---
.github/workflows/build.yml | 5 +++++
v2rayN/Directory.Packages.props | 20 +++++++++----------
v2rayN/v2rayN.Desktop/App.axaml | 2 +-
v2rayN/v2rayN.Desktop/Program.cs | 3 +++
.../Views/AddServerWindow.axaml | 16 +++++++--------
.../Views/ClashConnectionsView.axaml | 2 +-
.../Views/DNSSettingWindow.axaml | 2 +-
.../Views/MessageBoxDialog.axaml | 2 +-
v2rayN/v2rayN.Desktop/Views/MsgView.axaml | 2 +-
.../Views/OptionSettingWindow.axaml | 16 +++++++--------
.../Views/ProfilesSelectWindow.axaml | 2 +-
.../v2rayN.Desktop/Views/ProfilesView.axaml | 2 +-
.../v2rayN.Desktop/Views/SubEditWindow.axaml | 16 +++++++--------
v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj | 2 +-
14 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1e06cf0..88895362 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,6 +83,11 @@ jobs:
working-directory: ./v2rayN
run: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r $RID -p:SelfContained=true -p:PublishTrimmed=true $ExtOpt -o $Output
+ - name: Remove Debug Symbols
+ shell: bash
+ run: |
+ find ${{ matrix.arch }} -type f -name '*.pdb' -delete
+
- name: Upload build artifacts
uses: actions/upload-artifact@v7.0.1
with:
diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index db0cd968..33f3ddff 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -5,14 +5,14 @@
false
-
-
-
-
+
+
+
+
-
+
-
+
@@ -22,9 +22,9 @@
-
-
-
+
+
+
@@ -36,4 +36,4 @@
-
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/App.axaml b/v2rayN/v2rayN.Desktop/App.axaml
index 21204f60..3c90d152 100644
--- a/v2rayN/v2rayN.Desktop/App.axaml
+++ b/v2rayN/v2rayN.Desktop/App.axaml
@@ -8,7 +8,7 @@
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Name="v2rayN"
x:DataType="vms:StatusBarViewModel"
- RequestedThemeVariant="Default">
+ RequestedThemeVariant="Default">
diff --git a/v2rayN/v2rayN.Desktop/Program.cs b/v2rayN/v2rayN.Desktop/Program.cs
index 0ad036ec..a7d1e055 100644
--- a/v2rayN/v2rayN.Desktop/Program.cs
+++ b/v2rayN/v2rayN.Desktop/Program.cs
@@ -58,6 +58,9 @@ internal class Program
.UsePlatformDetect()
//.WithInterFont()
.WithFontByDefault()
+#if DEBUG
+ .WithDeveloperTools()
+#endif
.LogToTrace()
.UseReactiveUI(_ => { });
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 675626a7..7f970661 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -443,12 +443,12 @@
x:Name="txtMinGeckoPacketSize"
Width="90"
Margin="{StaticResource Margin4}"
- Watermark="Min" />
+ PlaceholderText="Min" />
+ PlaceholderText="Max" />
+ PlaceholderText="1000-2000,3000,4000" />
+ PlaceholderText="Up" />
+ PlaceholderText="Down" />
+ PlaceholderText="0, 0, 0" />
+ PlaceholderText="Ipv4,Ipv6" />
+ PlaceholderText="1280" />
+ PlaceholderText="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
+ PlaceholderText="{x:Static resx:ResUI.TbDNSHostsConfig}" />
diff --git a/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml b/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
index dae11854..a173e23b 100644
--- a/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
@@ -11,7 +11,7 @@
CanResize="False"
ShowInTaskbar="False"
SizeToContent="Height"
- SystemDecorations="Full"
+ WindowDecorations="Full"
WindowStartupLocation="CenterOwner"
mc:Ignorable="d">
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
index aabe80fa..9a23bff6 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
@@ -21,7 +21,7 @@
Width="200"
Margin="{StaticResource MarginLr8}"
VerticalContentAlignment="Center"
- Watermark="{x:Static resx:ResUI.MsgFilterTitle}" />
+ PlaceholderText="{x:Static resx:ResUI.MsgFilterTitle}" />
+ PlaceholderText="Up" />
+ PlaceholderText="Down" />
+ PlaceholderText="50-100" />
+ PlaceholderText="10-20" />
+ PlaceholderText="0" />
+ PlaceholderText="0.0.0.0" />
+ PlaceholderText="proxy_set.sh" />
+ PlaceholderText="pac.txt" />
+ PlaceholderText="{x:Static resx:ResUI.MsgServerTitle}" />
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
index 598ee3ec..31ea8cd5 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -63,7 +63,7 @@
Width="200"
Margin="{StaticResource MarginLr4}"
VerticalContentAlignment="Center"
- Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
+ PlaceholderText="{x:Static resx:ResUI.MsgServerTitle}" />
+ PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
+ PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
@@ -128,7 +128,7 @@
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
DockPanel.Dock="Right"
- Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+ PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
+ PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
+ PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
+ PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
+ PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
+ PlaceholderText="{x:Static resx:ResUI.TipPreSocksPort}" />
true
-
+