diff --git a/.gitignore b/.gitignore
index 4f8c770b4..9b8a57e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -574,6 +574,9 @@ iOSInjectionProject/
*.out
*.app
+# macOS
+.DS_Store
+
# WTTS
.idea
/pkg
diff --git a/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj b/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
index 44933b550..8ff29d791 100644
--- a/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
+++ b/src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
@@ -5,7 +5,7 @@
Exe
BD.WTTS
AVALONIA;$(DefineConstants)
- net.steampp.app.v3
+ net.steampp.app
diff --git a/src/BD.WTTS.Client.Avalonia.App/Info.plist b/src/BD.WTTS.Client.Avalonia.App/Info.plist
index 4af3a783e..daa11ea91 100644
--- a/src/BD.WTTS.Client.Avalonia.App/Info.plist
+++ b/src/BD.WTTS.Client.Avalonia.App/Info.plist
@@ -25,6 +25,6 @@
XSAppIconAssets
Assets.xcassets/AppIcon.appiconset
CFBundleIdentifier
- net.steampp.app.v3
+ net.steampp.app
diff --git a/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs b/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs
index aa2bd09ce..05eac21f3 100644
--- a/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/Properties/AssemblyInfo.Xaml.cs
@@ -1,11 +1,11 @@
-//steampp
+// steampp
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Styling")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Controls")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Pages")]
[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.UI.Views.Windows")]
-//FluentAvaloniaUI
+// FluentAvaloniaUI
[assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Controls")]
[assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Windowing")]
[assembly: XmlnsDefinition("https://github.com/amwx/FluentAvalonia", "FluentAvalonia.UI.Controls.Primitives")]
\ No newline at end of file
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs b/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs
index ff1db135a..d03a1172c 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/App.axaml.cs
@@ -8,7 +8,14 @@ public sealed partial class App : Application
public override void Initialize()
{
- AvaloniaXamlLoader.Load(this);
+ try
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+ catch (Exception ex)
+ {
+ Log.Error(TAG, ex, "load Xaml fail.");
+ }
}
public override void RegisterServices()
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs b/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs
index d3297de20..71d638e13 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/Styling/CustomTheme.axaml.cs
@@ -1,7 +1,3 @@
-using Avalonia.Markup.Xaml.Styling;
-using FluentAvalonia.Interop;
-using FluentAvalonia.Styling;
-
namespace BD.WTTS.UI.Styling;
///
diff --git a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs
index 6cc1ffe3d..920a0d3cf 100644
--- a/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs
+++ b/src/BD.WTTS.Client.Avalonia.App/UI/Views/Pages/MainView.axaml.cs
@@ -1,10 +1,9 @@
-using Avalonia.Controls;
-using FluentAvalonia.UI.Controls;
-
namespace BD.WTTS.UI.Views.Pages;
public partial class MainView : UserControl
{
+ const string TAG = "MainView";
+
public MainView()
{
InitializeComponent();
@@ -12,7 +11,14 @@ public partial class MainView : UserControl
private void InitializeComponent()
{
- AvaloniaXamlLoader.Load(this);
+ try
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+ catch (Exception ex)
+ {
+ Log.Error(TAG, ex, "load Xaml fail.");
+ }
var debug = this.FindControl