Merge remote-tracking branch 'remotes/origin/main' into ftp

Author: anovik

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
       branches: [ main ]      
 
 env:
-  DOTNET_VERSION: '8.0.x' 
+  DOTNET_VERSION: '10.0.x' 
 
 jobs:
   build:

README.md

@@ -1,6 +1,6 @@
 # SmartCommander
 
-A two-panel cross-platform open-source file manager based on Avalonia (currently uses Avalonia version 11.0.10). Supports Windows and Linux.
+A two-panel cross-platform open-source file manager based on Avalonia (currently uses Avalonia version 11.3.11). Supports Windows and Linux.
 
 
 The main window on Ubuntu 22.04:
@@ -15,10 +15,11 @@ The main window on Windows 11:<br/><br/>
 
 ## How to build
 
-Please make sure you have .NET 8 SDK (or later) installed.
+Please make sure you have .NET 10 SDK installed.
 ```
 dotnet build src --configuration Release
 ```
+
 ## Main features
 
 - Configurable interface (you can fully manage panels, columns, operations, themes, etc.)

installers/SmartCommander_Windows.iss

@@ -37,8 +37,8 @@ Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "..\src\SmartCommander\bin\Release\net8.0\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\src\SmartCommander\bin\Release\net8.0\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\src\SmartCommander\bin\Release\net10.0\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\src\SmartCommander\bin\Release\net10.0\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

src/SmartCommander/Program.cs

@@ -1,5 +1,5 @@
 using Avalonia;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using Serilog;
 using SmartCommander.Models;
 using System;

src/SmartCommander/SmartCommander.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <!--Avalonia doesn't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
     <TrimMode>copyused</TrimMode>
@@ -19,11 +19,8 @@
     <Compile Remove="TcPlugins\ListerAppNetCore\**" />
     <EmbeddedResource Remove="TcPlugins\ListerAppNetCore\**" />
     <None Remove="TcPlugins\ListerAppNetCore\**" />
-    <AvaloniaResource Remove="Assets\Resources.fr-FR.resx" />
     <AvaloniaResource Remove="Assets\Resources.resx" />
     <AvaloniaResource Remove="Assets\Resources.ru-RU.resx" />
-    <AvaloniaResource Remove="Assets\Resources.sr-Cyrl-RS.resx" />
-    <AvaloniaResource Remove="Assets\Resources.sr-Latn-ME.resx" />
     <None Remove=".gitignore" />
   </ItemGroup>
   <ItemGroup>
@@ -44,21 +41,21 @@
     <TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.7" />
+    <PackageReference Include="Avalonia" Version="11.3.11" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.7" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.11" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.7" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.7" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.7" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.7" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.9" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.11" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.11" />
     <PackageReference Include="FluentFTP" Version="53.0.2" />
-    <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
+    <PackageReference Include="MessageBox.Avalonia" Version="3.3.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
     <PackageReference Include="Serilog" Version="4.3.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.6.5" />  
+    <PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.9.3" />  
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Assets\Resources.Designer.cs">

src/SmartCommander/Views/MainWindow.axaml.cs

@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using SmartCommander.Models;