Skip to content

Dependency upgrades: Avalonia, icons, etc. #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulirwin merged 1 commit into from
Aug 14, 2026
Merged

Dependency upgrades: Avalonia, icons, etc. #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions JavaToCSharp.Tests/JavaToCSharp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PackageReference Include="coverlet.collector" Version="10.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions JavaToCSharp/JavaToCSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="IKVM" Version="8.15.0"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.6.0" />
<PackageReference Include="Nullable.Extended.Analyzer" Version="1.15.6581"/>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0"/>
<PackageReference Include="YamlDotNet" Version="16.3.0"/>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.11" />
<PackageReference Include="YamlDotNet" Version="18.1.0" />
</ItemGroup>
<ItemGroup>
<IkvmReference Include="../Lib/javaparser-core-3.25.4.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions JavaToCSharpCli/JavaToCSharpCli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.11" />
<PackageReference Include="System.CommandLine" Version="2.0.11" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JavaToCSharp\JavaToCSharp.csproj" />
Expand Down
4 changes: 0 additions & 4 deletions JavaToCSharpGui/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Data.Core.Plugins;
using Avalonia.Markup.Xaml;
using JavaToCSharpGui.Views;

Expand All @@ -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();
}
Expand Down
18 changes: 9 additions & 9 deletions JavaToCSharpGui/JavaToCSharpGui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<AvaloniaVersion>11.3.8</AvaloniaVersion>
<AvaloniaVersion>12.1.1</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
Expand All @@ -21,14 +21,14 @@
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
<PackageReference Include="AvaloniaEdit.TextMate" Version="11.3.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
<PackageReference Include="Semi.Avalonia" Version="11.3.7.1" />
<PackageReference Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
<PackageReference Include="TextMateSharp.Grammars" Version="1.0.70" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.20" />
<PackageReference Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
<PackageReference Include="AvaloniaEdit.TextMate" Version="12.0.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="Optris.Icons.Avalonia.FontAwesome7" Version="12.0.7" />
<PackageReference Include="Semi.Avalonia" Version="12.1.0.1" />
<PackageReference Include="Semi.Avalonia.AvaloniaEdit" Version="12.0.0" />
<PackageReference Include="TextMateSharp.Grammars" Version="2.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JavaToCSharp\JavaToCSharp.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions JavaToCSharpGui/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -17,7 +17,7 @@ public static void Main(string[] args) => BuildAvaloniaApp()
public static AppBuilder BuildAvaloniaApp()
{
IconProvider.Current
.Register<FontAwesomeIconProvider>();
.Register<FontAwesome7IconProvider>();

return AppBuilder.Configure<App>()
.UsePlatformDetect()
Expand Down
20 changes: 10 additions & 10 deletions JavaToCSharpGui/Views/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@
AutomationProperties.Name="Toggle Dark/Light Mode"
Theme="{DynamicResource ButtonToggleSwitch}">
<ToggleSwitch.OnContent>
<i:Icon Value="fa-moon" />
<i:Icon Value="fa7-moon" />
</ToggleSwitch.OnContent>
<ToggleSwitch.OffContent>
<i:Icon Value="fa-sun" />
<i:Icon Value="fa7-sun" />
</ToggleSwitch.OffContent>
</ToggleSwitch>
<Button i:Attached.Icon="fa-info"
<Button i:Attached.Icon="fa7-info"
ToolTip.Tip="About"
AutomationProperties.Name="About"
Command="{CompiledBinding OpenAboutCommand}" />
<Button i:Attached.Icon="fa-brands fa-github"
<Button i:Attached.Icon="fa7-brands fa7-github"
ToolTip.Tip="Fork me on GitHub"
AutomationProperties.Name="Fork me on GitHub"
Command="{CompiledBinding ForkMeOnGitHubCommand}" />
<Button i:Attached.Icon="fa-gear"
<Button i:Attached.Icon="fa7-gear"
ToolTip.Tip="Settings"
AutomationProperties.Name="Settings"
Command="{CompiledBinding OpenSettingsCommand}" />
Expand All @@ -65,7 +65,7 @@
AutomationProperties.Name="Paste from Clipboard"
Command="{CompiledBinding PasteJavaCodeCommand}"
Name="PasteJavaCode">
<i:Icon Value="fa-paste" />
<i:Icon Value="fa7-paste" />
</Button>
<TextBlock Grid.Column="1" Margin="10,5,10,5" VerticalAlignment="Center">File:</TextBlock>
<TextBox Name="OpenPath"
Expand All @@ -78,7 +78,7 @@
ToolTip.Tip="Open File"
Command="{CompiledBinding OpenFileDialogCommand}"
Name="OpenFileDialog">
<i:Icon Value="fa-folder-open" />
<i:Icon Value="fa7-folder-open" />
</Button>
</Grid>
<AvaloniaEdit:TextEditor
Expand Down Expand Up @@ -112,13 +112,13 @@
ToolTip.Tip="Copy to Clipboard"
AutomationProperties.Name="Copy to Clipboard"
Command="{CompiledBinding CopyOutputCommand}">
<i:Icon Value="fa-copy" />
<i:Icon Value="fa7-copy" />
</Button>
<Button Name="SaveOutput"
ToolTip.Tip="Save to File"
AutomationProperties.Name="Save to File"
Command="{CompiledBinding SaveOutputCommand}">
<i:Icon Value="fa-save" />
<i:Icon Value="fa7-floppy-disk" />
</Button>
</StackPanel>
<AvaloniaEdit:TextEditor
Expand Down Expand Up @@ -149,7 +149,7 @@
ToolTip.Tip="Open Folder"
Command="{CompiledBinding OpenFolderDialogCommand}"
Name="OpenFolderDialog">
<i:Icon Value="fa-folder-open" />
<i:Icon Value="fa7-folder-open" />
</Button>
</Grid>
<ListBox Name="JavaFiles"
Expand Down
Loading