From 5e523c069bb4d773a9e8bf2105d6e031b6b9e4b0 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Wed, 8 Apr 2026 18:14:59 +0800
Subject: [PATCH] Update Avalonia to 12

---
 v2rayN/Directory.Packages.props                | 18 +++++++++---------
 v2rayN/v2rayN.Desktop/App.axaml                |  2 +-
 v2rayN/v2rayN.Desktop/Base/WindowBase.cs       |  3 ++-
 .../v2rayN.Desktop/Views/AddServerWindow.axaml | 12 ++++++------
 .../Views/ClashConnectionsView.axaml           |  2 +-
 .../Views/DNSSettingWindow.axaml               |  2 +-
 v2rayN/v2rayN.Desktop/Views/MsgView.axaml      |  2 +-
 .../Views/OptionSettingWindow.axaml            | 10 +++++-----
 .../Views/ProfilesSelectWindow.axaml           |  2 +-
 v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml |  2 +-
 .../v2rayN.Desktop/Views/SubEditWindow.axaml   | 16 ++++++++--------
 11 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index 4cdb0ad7..36ee392d 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -5,13 +5,13 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.0.0" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.2" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.14" />
     <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
-    <PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" />
-    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
+    <PackageVersion Include="DialogHost.Avalonia" Version="0.12.1" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="12.0.1" />
     <PackageVersion Include="CliWrap" Version="3.10.1" />
     <PackageVersion Include="Downloader" Version="5.2.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
@@ -21,9 +21,9 @@
     <PackageVersion Include="ReactiveUI" Version="23.2.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="ReactiveUI.WPF" Version="23.2.1" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
-    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
+    <PackageVersion Include="Semi.Avalonia" Version="12.0.1" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="12.0.0" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="12.0.0" />
     <PackageVersion Include="NLog" Version="6.1.2" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />
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">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/v2rayN/v2rayN.Desktop/Base/WindowBase.cs b/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
index d1419b30..5bd67f48 100644
--- a/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
+++ b/v2rayN/v2rayN.Desktop/Base/WindowBase.cs
@@ -26,7 +26,8 @@ public class WindowBase<TViewModel> : ReactiveWindow<TViewModel> where TViewMode
             Height = sizeItem.Height;
 
             var workingArea = (Screens.ScreenFromWindow(this) ?? Screens.Primary).WorkingArea;
-            var scaling = (Utils.IsMacOS() ? null : VisualRoot?.RenderScaling) ?? 1.0;
+            var scaling = Utils.IsMacOS() ? 1.0 : RenderScaling;
+            scaling = scaling > 0 ? scaling : 1.0;
 
             var x = workingArea.X + ((workingArea.Width - (Width * scaling)) / 2);
             var y = workingArea.Y + ((workingArea.Height - (Height * scaling)) / 2);
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 00bcff1b..e500022a 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -414,7 +414,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        Watermark="1000-2000,3000,4000" />
+                        PlaceholderText="1000-2000,3000,4000" />
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="2"
@@ -449,12 +449,12 @@
                             x:Name="txtUpMbps7"
                             Width="90"
                             Margin="{StaticResource Margin4}"
-                            Watermark="Up" />
+                            PlaceholderText="Up" />
                         <TextBox
                             x:Name="txtDownMbps7"
                             Width="90"
                             Margin="{StaticResource Margin4}"
-                            Watermark="Down" />
+                            PlaceholderText="Down" />
                     </StackPanel>
                 </Grid>
                 <Grid
@@ -549,7 +549,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        Watermark="2,3,4" />
+                        PlaceholderText="2,3,4" />
 
                     <TextBlock
                         Grid.Row="4"
@@ -563,7 +563,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        Watermark="Ipv4,Ipv6" />
+                        PlaceholderText="Ipv4,Ipv6" />
 
                     <TextBlock
                         Grid.Row="5"
@@ -578,7 +578,7 @@
                         Width="200"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
-                        Watermark="1500" />
+                        PlaceholderText="1500" />
                 </Grid>
                 <Grid
                     x:Name="gridAnytls"
diff --git a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml b/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
index 6a9b7088..f941eec4 100644
--- a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
@@ -23,7 +23,7 @@
                 Width="200"
                 VerticalContentAlignment="Center"
                 Margin="{StaticResource MarginLr8}"
-                Watermark="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
+                PlaceholderText="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
 
             <Button
                 x:Name="btnConnectionCloseAll"
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index b736de32..eb3813da 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -317,7 +317,7 @@
                             BorderThickness="1"
                             Classes="TextArea"
                             TextWrapping="Wrap"
-                            Watermark="{x:Static resx:ResUI.TbDNSHostsConfig}" />
+                            PlaceholderText="{x:Static resx:ResUI.TbDNSHostsConfig}" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
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}" />
 
             <Button
                 x:Name="btnCopy"
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index c48b1cdf..555fd9f8 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -305,12 +305,12 @@
                                 x:Name="txtUpMbps"
                                 Width="90"
                                 Margin="{StaticResource Margin4}"
-                                Watermark="Up" />
+                                PlaceholderText="Up" />
                             <TextBox
                                 x:Name="txtDownMbps"
                                 Width="90"
                                 Margin="{StaticResource Margin4}"
-                                Watermark="Down" />
+                                PlaceholderText="Down" />
                         </StackPanel>
 
                         <TextBlock
@@ -338,7 +338,7 @@
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}"
-                            Watermark="0.0.0.0" />
+                            PlaceholderText="0.0.0.0" />
                         <TextBlock
                             Grid.Row="21"
                             Grid.Column="2"
@@ -723,7 +723,7 @@
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 TextWrapping="Wrap"
-                                Watermark="proxy_set.sh" />
+                                PlaceholderText="proxy_set.sh" />
                             <Button
                                 x:Name="btnBrowseCustomSystemProxyScriptPath"
                                 Margin="{StaticResource Margin4}"
@@ -768,7 +768,7 @@
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 TextWrapping="Wrap"
-                                Watermark="pac.txt" />
+                                PlaceholderText="pac.txt" />
                             <Button
                                 x:Name="btnBrowseCustomSystemProxyPacPath"
                                 Margin="{StaticResource Margin4}"
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
index 2dd44b54..29e0d41d 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
@@ -65,7 +65,7 @@
                         Margin="8,0"
                         VerticalContentAlignment="Center"
                         Text="{Binding ServerFilter, Mode=TwoWay}"
-                        Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
+                        PlaceholderText="{x:Static resx:ResUI.MsgServerTitle}" />
                 </WrapPanel>
 
                 <!--  Profiles grid  -->
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
index 42fab7c2..cce25e92 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}" />
 
                 <Button
                     x:Name="btnAutofitColumnWidth"
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index 79216921..3a069d7c 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -68,7 +68,7 @@
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     TextWrapping="Wrap"
-                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                    PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
                 <Button
                     Grid.Row="2"
                     Grid.Column="2"
@@ -99,7 +99,7 @@
                                     Classes="TextArea"
                                     MinLines="4"
                                     TextWrapping="Wrap"
-                                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                                    PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
                             </StackPanel>
                         </Flyout>
                     </Button.Flyout>
@@ -128,7 +128,7 @@
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         DockPanel.Dock="Right"
-                        Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                        PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
 
                     <TextBlock
                         Margin="{StaticResource Margin4}"
@@ -149,7 +149,7 @@
                     Grid.Column="1"
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                    PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
 
                 <TextBlock
                     Grid.Row="6"
@@ -178,7 +178,7 @@
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     TextWrapping="Wrap"
-                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                    PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
 
                 <TextBlock
                     Grid.Row="8"
@@ -206,7 +206,7 @@
                     Grid.Column="1"
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                    PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
                 <Button
                     Grid.Row="9"
                     Grid.Column="2"
@@ -226,7 +226,7 @@
                     Grid.Column="1"
                     Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
-                    Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                    PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
                 <Button
                     Grid.Row="10"
                     Grid.Column="2"
@@ -248,7 +248,7 @@
                     Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}"
-                    Watermark="{x:Static resx:ResUI.TipPreSocksPort}" />
+                    PlaceholderText="{x:Static resx:ResUI.TipPreSocksPort}" />
 
                 <TextBlock
                     Grid.Row="12"