Skip to content

Commit a9ae50c

Browse files
authored
Upgrade to .NET 10 (#116)
* Updated to .NET 10. * Updated Avalonia libs and github workflow. * Updated Avalonia version in readme.
1 parent 9af2d21 commit a9ae50c

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
branches: [ main ]
77

88
env:
9-
DOTNET_VERSION: '8.0.x'
9+
DOTNET_VERSION: '10.0.x'
1010

1111
jobs:
1212
build:

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SmartCommander
22

3-
A two-panel cross-platform open-source file manager based on Avalonia (currently uses Avalonia version 11.0.10). Supports Windows and Linux.
3+
A two-panel cross-platform open-source file manager based on Avalonia (currently uses Avalonia version 11.3.11). Supports Windows and Linux.
44

55

66
The main window on Ubuntu 22.04:
@@ -15,10 +15,11 @@ The main window on Windows 11:<br/><br/>
1515

1616
## How to build
1717

18-
Please make sure you have .NET 8 SDK (or later) installed.
18+
Please make sure you have .NET 10 SDK installed.
1919
```
2020
dotnet build src --configuration Release
2121
```
22+
2223
## Main features
2324

2425
- Configurable interface (you can fully manage panels, columns, operations, themes, etc.)

installers/SmartCommander_Windows.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
3737
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
3838

3939
[Files]
40-
Source: "..\src\SmartCommander\bin\Release\net8.0\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
41-
Source: "..\src\SmartCommander\bin\Release\net8.0\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
40+
Source: "..\src\SmartCommander\bin\Release\net10.0\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
41+
Source: "..\src\SmartCommander\bin\Release\net10.0\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
4242
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
4343

4444
[Icons]

src/SmartCommander/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Avalonia;
2-
using Avalonia.ReactiveUI;
2+
using ReactiveUI.Avalonia;
33
using Serilog;
44
using SmartCommander.Models;
55
using System;

src/SmartCommander/SmartCommander.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<!--Avalonia doesn't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
77
<TrimMode>copyused</TrimMode>
@@ -41,20 +41,20 @@
4141
<TrimmableAssembly Include="Avalonia.Themes.Default" />
4242
</ItemGroup>
4343
<ItemGroup>
44-
<PackageReference Include="Avalonia" Version="11.3.7" />
44+
<PackageReference Include="Avalonia" Version="11.3.11" />
4545
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
46-
<PackageReference Include="Avalonia.Desktop" Version="11.3.7" />
46+
<PackageReference Include="Avalonia.Desktop" Version="11.3.11" />
4747
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
48-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.7" />
49-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.7" />
50-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.7" />
51-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.7" />
52-
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
48+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.9" />
49+
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.11" />
50+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.11" />
51+
<PackageReference Include="MessageBox.Avalonia" Version="3.3.1.1" />
5352
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
53+
<PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
5454
<PackageReference Include="Serilog" Version="4.3.0" />
55-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
55+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
5656
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
57-
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.6.5" />
57+
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.9.3" />
5858
</ItemGroup>
5959
<ItemGroup>
6060
<Compile Update="Assets\Resources.Designer.cs">

src/SmartCommander/Views/MainWindow.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Avalonia.Controls;
2-
using Avalonia.ReactiveUI;
2+
using ReactiveUI.Avalonia;
33
using MsBox.Avalonia.Enums;
44
using ReactiveUI;
55
using SmartCommander.Models;

0 commit comments

Comments
 (0)