pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-07-26 09:52:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Avalonia to 12.1 (#9148)

Browse Source
This commit is contained in:
DHR60
2026-07-13 01:41:28 +00:00
committed by GitHub
parent 1de83f96ed
commit 6f50206606
14 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View File

@@ -83,6 +83,11 @@ jobs:
working-directory: ./v2rayN working-directory: ./v2rayN
run: dotnet publish ./AmazTool/AmazTool.csproj -c Release -r $RID -p:SelfContained=true -p:PublishTrimmed=true $ExtOpt -o $Output 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 - name: Upload build artifacts
uses: actions/upload-artifact@v7.0.1 uses: actions/upload-artifact@v7.0.1
with: with:

20
v2rayN/Directory.Packages.props
View File

@@ -5,14 +5,14 @@
<CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled> <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" /> <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" /> <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.0" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.18" /> <PackageVersion Include="Avalonia.Desktop" Version="12.1.0" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.18" /> <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
<PackageVersion Include="AwesomeAssertions" Version="9.4.0" /> <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
<PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" /> <PackageVersion Include="DialogHost.Avalonia" Version="0.12.2" />
<PackageVersion Include="IPNetwork2" Version="4.3.0" /> <PackageVersion Include="IPNetwork2" Version="4.3.0" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.13" /> <PackageVersion Include="ReactiveUI.Avalonia" Version="12.0.3" />
<PackageVersion Include="CliWrap" Version="3.10.2" /> <PackageVersion Include="CliWrap" Version="3.10.2" />
<PackageVersion Include="Downloader" Version="5.9.0" /> <PackageVersion Include="Downloader" Version="5.9.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" /> <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
@@ -22,9 +22,9 @@
<PackageVersion Include="ReactiveUI" Version="23.2.28" /> <PackageVersion Include="ReactiveUI" Version="23.2.28" />
<PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" /> <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageVersion Include="ReactiveUI.WPF" Version="23.2.28" /> <PackageVersion Include="ReactiveUI.WPF" Version="23.2.28" />
<PackageVersion Include="Semi.Avalonia" Version="11.3.14" /> <PackageVersion Include="Semi.Avalonia" Version="12.1.0" />
<PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" /> <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="12.0.0" />
<PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" /> <PackageVersion Include="Semi.Avalonia.DataGrid" Version="12.1.0" />
<PackageVersion Include="NLog" Version="6.1.3" /> <PackageVersion Include="NLog" Version="6.1.3" />
<PackageVersion Include="sqlite-net-e" Version="1.11.0" /> <PackageVersion Include="sqlite-net-e" Version="1.11.0" />
<PackageVersion Include="Repobot.SQLite.Unofficial" Version="3.53.3" /> <PackageVersion Include="Repobot.SQLite.Unofficial" Version="3.53.3" />
@@ -36,4 +36,4 @@
<PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.22" /> <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.22" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4" /> <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
v2rayN/v2rayN.Desktop/App.axaml
View File

@@ -8,7 +8,7 @@
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib" xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
Name="v2rayN" Name="v2rayN"
x:DataType="vms:StatusBarViewModel" x:DataType="vms:StatusBarViewModel"
RequestedThemeVariant="Default"> RequestedThemeVariant="Default">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>

3
v2rayN/v2rayN.Desktop/Program.cs
View File

@@ -58,6 +58,9 @@ internal class Program
.UsePlatformDetect() .UsePlatformDetect()
//.WithInterFont() //.WithInterFont()
.WithFontByDefault() .WithFontByDefault()
#if DEBUG
.WithDeveloperTools()
#endif
.LogToTrace() .LogToTrace()
.UseReactiveUI(_ => { }); .UseReactiveUI(_ => { });

16
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
View File

@@ -443,12 +443,12 @@
x:Name="txtMinGeckoPacketSize" x:Name="txtMinGeckoPacketSize"
Width="90" Width="90"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="Min" /> PlaceholderText="Min" />
<TextBox <TextBox
x:Name="txtMaxGeckoPacketSize" x:Name="txtMaxGeckoPacketSize"
Width="90" Width="90"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="Max" /> PlaceholderText="Max" />
</StackPanel> </StackPanel>
<TextBlock <TextBlock
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
@@ -481,7 +481,7 @@
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="1000-2000,3000,4000" /> PlaceholderText="1000-2000,3000,4000" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
@@ -519,12 +519,12 @@
x:Name="txtUpMbps7" x:Name="txtUpMbps7"
Width="90" Width="90"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="Up" /> PlaceholderText="Up" />
<TextBox <TextBox
x:Name="txtDownMbps7" x:Name="txtDownMbps7"
Width="90" Width="90"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="Down" /> PlaceholderText="Down" />
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid <Grid
@@ -633,7 +633,7 @@
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="0, 0, 0" /> PlaceholderText="0, 0, 0" />
<TextBlock <TextBlock
Grid.Row="5" Grid.Row="5"
@@ -647,7 +647,7 @@
Grid.Column="1" Grid.Column="1"
Width="400" Width="400"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="Ipv4,Ipv6" /> PlaceholderText="Ipv4,Ipv6" />
<TextBlock <TextBlock
Grid.Row="6" Grid.Row="6"
@@ -662,7 +662,7 @@
Width="200" Width="200"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Watermark="1280" /> PlaceholderText="1280" />
</Grid> </Grid>
<Grid <Grid
x:Name="gridAnytls" x:Name="gridAnytls"

2
v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
View File

@@ -23,7 +23,7 @@
Width="200" Width="200"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
Watermark="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" /> PlaceholderText="{x:Static resx:ResUI.ConnectionsHostFilterTitle}" />
<Button <Button
x:Name="btnConnectionCloseAll" x:Name="btnConnectionCloseAll"

2
v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
View File

@@ -317,7 +317,7 @@
BorderThickness="1" BorderThickness="1"
Classes="TextArea" Classes="TextArea"
TextWrapping="Wrap" TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.TbDNSHostsConfig}" /> PlaceholderText="{x:Static resx:ResUI.TbDNSHostsConfig}" />
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>

2
v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
View File

@@ -11,7 +11,7 @@
CanResize="False" CanResize="False"
ShowInTaskbar="False" ShowInTaskbar="False"
SizeToContent="Height" SizeToContent="Height"
SystemDecorations="Full" WindowDecorations="Full"
WindowStartupLocation="CenterOwner" WindowStartupLocation="CenterOwner"
mc:Ignorable="d"> mc:Ignorable="d">

2
v2rayN/v2rayN.Desktop/Views/MsgView.axaml
View File

@@ -21,7 +21,7 @@
Width="200" Width="200"
Margin="{StaticResource MarginLr8}" Margin="{StaticResource MarginLr8}"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Watermark="{x:Static resx:ResUI.MsgFilterTitle}" /> PlaceholderText="{x:Static resx:ResUI.MsgFilterTitle}" />
<Button <Button
x:Name="btnCopy" x:Name="btnCopy"

16
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View File

@@ -279,12 +279,12 @@
x:Name="txtUpMbps" x:Name="txtUpMbps"
Width="90" Width="90"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="Up" /> PlaceholderText="Up" />
<TextBox <TextBox
x:Name="txtDownMbps" x:Name="txtDownMbps"
Width="90" Width="90"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="Down" /> PlaceholderText="Down" />
</StackPanel> </StackPanel>
<TextBlock <TextBlock
@@ -351,7 +351,7 @@
Width="120" Width="120"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Watermark="50-100" /> PlaceholderText="50-100" />
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="2" Grid.Column="2"
@@ -373,7 +373,7 @@
Width="120" Width="120"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Watermark="10-20" /> PlaceholderText="10-20" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
@@ -395,7 +395,7 @@
Width="120" Width="120"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Watermark="0" /> PlaceholderText="0" />
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="3"
Grid.Column="2" Grid.Column="2"
@@ -461,7 +461,7 @@
Grid.Column="1" Grid.Column="1"
Width="200" Width="200"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
Watermark="0.0.0.0" /> PlaceholderText="0.0.0.0" />
<TextBlock <TextBlock
Grid.Row="23" Grid.Row="23"
Grid.Column="2" Grid.Column="2"
@@ -865,7 +865,7 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
TextWrapping="Wrap" TextWrapping="Wrap"
Watermark="proxy_set.sh" /> PlaceholderText="proxy_set.sh" />
<Button <Button
x:Name="btnBrowseCustomSystemProxyScriptPath" x:Name="btnBrowseCustomSystemProxyScriptPath"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
@@ -910,7 +910,7 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
TextWrapping="Wrap" TextWrapping="Wrap"
Watermark="pac.txt" /> PlaceholderText="pac.txt" />
<Button <Button
x:Name="btnBrowseCustomSystemProxyPacPath" x:Name="btnBrowseCustomSystemProxyPacPath"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"

2
v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
View File

@@ -65,7 +65,7 @@
Margin="8,0" Margin="8,0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Text="{Binding ServerFilter, Mode=TwoWay}" Text="{Binding ServerFilter, Mode=TwoWay}"
Watermark="{x:Static resx:ResUI.MsgServerTitle}" /> PlaceholderText="{x:Static resx:ResUI.MsgServerTitle}" />
</WrapPanel> </WrapPanel>
<!-- Profiles grid --> <!-- Profiles grid -->

2
v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
View File

@@ -63,7 +63,7 @@
Width="200" Width="200"
Margin="{StaticResource MarginLr4}" Margin="{StaticResource MarginLr4}"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Watermark="{x:Static resx:ResUI.MsgServerTitle}" /> PlaceholderText="{x:Static resx:ResUI.MsgServerTitle}" />
<Button <Button
x:Name="btnAutofitColumnWidth" x:Name="btnAutofitColumnWidth"

16
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
View File

@@ -68,7 +68,7 @@
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
TextWrapping="Wrap" TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" /> PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<Button <Button
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
@@ -99,7 +99,7 @@
Classes="TextArea" Classes="TextArea"
MinLines="4" MinLines="4"
TextWrapping="Wrap" TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" /> PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
</StackPanel> </StackPanel>
</Flyout> </Flyout>
</Button.Flyout> </Button.Flyout>
@@ -128,7 +128,7 @@
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
DockPanel.Dock="Right" DockPanel.Dock="Right"
Watermark="{x:Static resx:ResUI.SubUrlTips}" /> PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock <TextBlock
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
@@ -149,7 +149,7 @@
Grid.Column="1" Grid.Column="1"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
Watermark="{x:Static resx:ResUI.SubUrlTips}" /> PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock <TextBlock
Grid.Row="6" Grid.Row="6"
@@ -178,7 +178,7 @@
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
TextWrapping="Wrap" TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" /> PlaceholderText="{x:Static resx:ResUI.SubUrlTips}" />
<TextBlock <TextBlock
Grid.Row="8" Grid.Row="8"
@@ -206,7 +206,7 @@
Grid.Column="1" Grid.Column="1"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" /> PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
<Button <Button
Grid.Row="9" Grid.Row="9"
Grid.Column="2" Grid.Column="2"
@@ -226,7 +226,7 @@
Grid.Column="1" Grid.Column="1"
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
VerticalAlignment="Center" VerticalAlignment="Center"
Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" /> PlaceholderText="{x:Static resx:ResUI.LvPrevProfileTip}" />
<Button <Button
Grid.Row="10" Grid.Row="10"
Grid.Column="2" Grid.Column="2"
@@ -248,7 +248,7 @@
Margin="{StaticResource Margin4}" Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}" ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}"
Watermark="{x:Static resx:ResUI.TipPreSocksPort}" /> PlaceholderText="{x:Static resx:ResUI.TipPreSocksPort}" />
<TextBlock <TextBlock
Grid.Row="12" Grid.Row="12"

2
v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
View File

@@ -16,7 +16,7 @@
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>
<PackageReference Include="Avalonia.Desktop" /> <PackageReference Include="Avalonia.Desktop" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" /> <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="AvaloniaUI.DiagnosticsSupport" />
<PackageReference Include="DialogHost.Avalonia" /> <PackageReference Include="DialogHost.Avalonia" />
<PackageReference Include="ReactiveUI.Avalonia" /> <PackageReference Include="ReactiveUI.Avalonia" />
<PackageReference Include="Semi.Avalonia" /> <PackageReference Include="Semi.Avalonia" />