Merge branch '2dust:master' into master

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.0.6</Version>
+	<Version>7.0.7</Version>
   </PropertyGroup>
  
 	<ItemGroup>

v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs

@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Media;
+using System.Reflection;
+
+namespace v2rayN.Desktop.Common
+{
+    public static class AppBuilderExtension
+    {
+        public static AppBuilder WithFontByDefault(this AppBuilder appBuilder)
+        {
+            var uri = $"avares://{Assembly.GetExecutingAssembly().GetName().Name}/Assets/Fonts#Noto Sans SC";
+            return appBuilder.With(new FontManagerOptions()
+            {
+                DefaultFamilyName = uri,
+                FontFallbacks = new[] { new FontFallback { FontFamily = new FontFamily(uri) } }
+            });
+        }
+    }
+}

v2rayN/v2rayN.Desktop/Program.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
+using v2rayN.Desktop.Common;
 
 namespace v2rayN.Desktop;
 
@@ -48,7 +49,8 @@ internal class Program
     public static AppBuilder BuildAvaloniaApp()
     => AppBuilder.Configure<App>()
         .UsePlatformDetect()
-        .WithInterFont()
+        //.WithInterFont()
+        .WithFontByDefault()
         .LogToTrace()
         .UseReactiveUI();
 }