From 0f496a86d86435e23652030fd0c7008dd999ba3a Mon Sep 17 00:00:00 2001 From: Paul Irwin Date: Fri, 14 Aug 2026 10:00:52 -0600 Subject: [PATCH] Dependency upgrades: Avalonia, icons, etc. --- JavaToCSharp.Tests/JavaToCSharp.Tests.csproj | 4 ++-- JavaToCSharp/JavaToCSharp.csproj | 6 +++--- JavaToCSharpCli/JavaToCSharpCli.csproj | 4 ++-- JavaToCSharpGui/App.axaml.cs | 4 ---- JavaToCSharpGui/JavaToCSharpGui.csproj | 18 +++++++++--------- JavaToCSharpGui/Program.cs | 6 +++--- JavaToCSharpGui/Views/MainWindow.axaml | 20 ++++++++++---------- 7 files changed, 29 insertions(+), 33 deletions(-) diff --git a/JavaToCSharp.Tests/JavaToCSharp.Tests.csproj b/JavaToCSharp.Tests/JavaToCSharp.Tests.csproj index 51827f4d..9117d199 100644 --- a/JavaToCSharp.Tests/JavaToCSharp.Tests.csproj +++ b/JavaToCSharp.Tests/JavaToCSharp.Tests.csproj @@ -10,13 +10,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/JavaToCSharp/JavaToCSharp.csproj b/JavaToCSharp/JavaToCSharp.csproj index 2cad3e2c..019950af 100644 --- a/JavaToCSharp/JavaToCSharp.csproj +++ b/JavaToCSharp/JavaToCSharp.csproj @@ -17,10 +17,10 @@ - + - - + + diff --git a/JavaToCSharpCli/JavaToCSharpCli.csproj b/JavaToCSharpCli/JavaToCSharpCli.csproj index 564e41a9..8e9ade2e 100644 --- a/JavaToCSharpCli/JavaToCSharpCli.csproj +++ b/JavaToCSharpCli/JavaToCSharpCli.csproj @@ -9,8 +9,8 @@ true - - + + diff --git a/JavaToCSharpGui/App.axaml.cs b/JavaToCSharpGui/App.axaml.cs index 5ab33082..9aeef243 100644 --- a/JavaToCSharpGui/App.axaml.cs +++ b/JavaToCSharpGui/App.axaml.cs @@ -1,6 +1,5 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; -using Avalonia.Data.Core.Plugins; using Avalonia.Markup.Xaml; using JavaToCSharpGui.Views; @@ -17,9 +16,6 @@ public override void OnFrameworkInitializationCompleted() { if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { - // Line below is needed to remove Avalonia data validation. - // Without this line you will get duplicate validations from both Avalonia and CT - BindingPlugins.DataValidators.RemoveAt(0); desktop.MainWindow = new MainWindow(); base.OnFrameworkInitializationCompleted(); } diff --git a/JavaToCSharpGui/JavaToCSharpGui.csproj b/JavaToCSharpGui/JavaToCSharpGui.csproj index 334d7f4c..28810ad8 100644 --- a/JavaToCSharpGui/JavaToCSharpGui.csproj +++ b/JavaToCSharpGui/JavaToCSharpGui.csproj @@ -10,7 +10,7 @@ enable true true - 11.3.8 + 12.1.1 @@ -21,14 +21,14 @@ - - - - - - - - + + + + + + + + diff --git a/JavaToCSharpGui/Program.cs b/JavaToCSharpGui/Program.cs index c3856476..ee7b9f46 100644 --- a/JavaToCSharpGui/Program.cs +++ b/JavaToCSharpGui/Program.cs @@ -1,6 +1,6 @@ using Avalonia; -using Projektanker.Icons.Avalonia; -using Projektanker.Icons.Avalonia.FontAwesome; +using Optris.Icons.Avalonia; +using Optris.Icons.Avalonia.FontAwesome7; namespace JavaToCSharpGui; @@ -17,7 +17,7 @@ public static void Main(string[] args) => BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp() { IconProvider.Current - .Register(); + .Register(); return AppBuilder.Configure() .UsePlatformDetect() diff --git a/JavaToCSharpGui/Views/MainWindow.axaml b/JavaToCSharpGui/Views/MainWindow.axaml index ab9e6a54..519aa794 100644 --- a/JavaToCSharpGui/Views/MainWindow.axaml +++ b/JavaToCSharpGui/Views/MainWindow.axaml @@ -34,21 +34,21 @@ AutomationProperties.Name="Toggle Dark/Light Mode" Theme="{DynamicResource ButtonToggleSwitch}"> - + - + - File: - + - + - +