v2.4.0 Update to .NET 9, Add roslynator

Author: dimanrus

README.md

@@ -3,7 +3,7 @@
 ***
 ## Стек технологий:
 * Avalonia
-* .NET 8, C#
+* .NET 9, C#
 * EF Core
 * SqlLite
 ***

src/SudInfo.Avalonia/App.axaml.cs

@@ -33,9 +33,9 @@ public async override void OnFrameworkInitializationCompleted()
 
         if (appSetting.Theme == "Acrylic")
         {
-            mainWindow.TransparencyLevelHint = new List<WindowTransparencyLevel>() {
+            mainWindow.TransparencyLevelHint = [
                 WindowTransparencyLevel.AcrylicBlur
-            };
+            ];
             mainWindow.Background = null;
         }
 
@@ -67,7 +67,6 @@ public async override void OnFrameworkInitializationCompleted()
 
         mainWindow.Show();
         MainWindow = mainWindow;
- 
     }
 
     #endregion

src/SudInfo.Avalonia/Extensions/ServiceCollectionExtension.cs

@@ -3,6 +3,7 @@
 internal static class ServiceCollectionExtension
 {
     public static readonly IServiceProvider ServiceProvider = new ServiceCollection()
+
     #region Page view models
             .AddScoped<ComputersPageViewModel>()
             .AddScoped<PrintersPageViewModel>()
@@ -19,6 +20,7 @@ internal static class ServiceCollectionExtension
             .AddScoped<CartridgesPageViewModel>()
             .AddScoped<PhonesPageViewModel>()
     #endregion
+
     #region Window view models
             .AddScoped<AppWindowViewModel>()
             .AddScoped<CartridgeWindowViewModel>()
@@ -35,8 +37,8 @@ internal static class ServiceCollectionExtension
             .AddScoped<PrinterWindowViewModel>()
             .AddScoped<PhoneWindowViewModel>()
     #endregion
+
     #region Services
-            .AddTransient<ExcelService>()
             .AddTransient<PrinterService>()
             .AddTransient<RutokenService>()
             .AddTransient<PeripheryService>()
@@ -52,7 +54,7 @@ internal static class ServiceCollectionExtension
             .AddSingleton<NavigationService>()
             .AddTransient<ComputerService>()
             .AddTransient<PhoneService>()
-    #endregion
             .AddTransient<SudInfoDatabaseContext>()
             .BuildServiceProvider();
+    #endregion
 }

src/SudInfo.Avalonia/Models/Result.cs

@@ -1,23 +1,13 @@
 namespace SudInfo.Avalonia.Models;
 
-public class Result<T> : Result
+public class Result<T>(T? obj, bool success = false, string message = "") : Result(success, message)
 {
-    public Result(T? obj, bool success = false, string message = "") : base(success, message)
-    {
-        Object = obj;
-    }
-
-    public T? Object { get; set; }
+    public T? Object { get; set; } = obj;
 }
-public class Result
-{
-    public Result(bool success = false, string message = "")
-    {
-        Success = success;
-        Message = message;
-    }
 
-    public bool Success { get; set; }
+public class Result(bool success = false, string message = "")
+{
+    public bool Success { get; set; } = success;
 
-    public string Message { get; set; } = string.Empty;
+    public string Message { get; set; } = message;
 }

src/SudInfo.Avalonia/Program.cs

@@ -1,6 +1,6 @@
 namespace SudInfo.Avalonia;
 
-internal class Program
+internal static class Program
 {
     [STAThread]
     public static void Main(string[] args) => BuildAvaloniaApp()

src/SudInfo.Avalonia/Services/AppService.cs

@@ -1,24 +1,19 @@
 namespace SudInfo.Avalonia.Services;
 
-public class AppService : BaseService<AppEntity>
+public class AppService(SudInfoDatabaseContext context) : BaseService<AppEntity>(context)
 {
     #region Ctors
 
-    public AppService(SudInfoDatabaseContext context) : base(context)
-    {
-    }
-
     #endregion
 
     #region Get Methods
 
     public async Task<IReadOnlyCollection<AppEntity>> Get()
     {
-        var apps = await context.Apps.AsNoTracking()
+        return await context.Apps.AsNoTracking()
                                      .Include(x => x.Computers)
                                      .ThenInclude(x => x.User)
                                      .ToListAsync();
-        return apps;
     }
 
     public async Task<Result<AppEntity>> Get(int id)
@@ -71,7 +66,7 @@ public async Task<Result> Update(AppEntity entity)
             }
             else
             {
-                app.Computers = new List<Computer>();
+                app.Computers = [];
                 foreach (var computer in entity.Computers)
                 {
                     app.Computers.Add(await context.Computers.FindAsync(computer.Id));
@@ -92,7 +87,7 @@ public override async Task<Result> Add(AppEntity entity)
         try
         {
             var computers = entity.Computers;
-            entity.Computers = new List<Computer>();
+            entity.Computers = [];
             foreach (var computer in computers)
             {
                 entity.Computers.Add(await context.Computers.FindAsync(computer.Id));

src/SudInfo.Avalonia/Services/BaseService.cs

@@ -1,20 +1,14 @@
 namespace SudInfo.Avalonia.Services;
 
-public class BaseService<T> where T : class
+public class BaseService<T>(SudInfoDatabaseContext context) where T : class
 {
     #region Private variables
 
-    protected readonly SudInfoDatabaseContext context;
+    protected readonly SudInfoDatabaseContext context = context;
 
     #endregion
-
     #region Ctors
 
-    public BaseService(SudInfoDatabaseContext context)
-    {
-        this.context = context;
-    }
-
     #endregion
 
     #region Methods

src/SudInfo.Avalonia/Services/CartridgeService.cs

@@ -2,14 +2,10 @@
 
 namespace SudInfo.Avalonia.Services;
 
-public class CartridgeService : BaseService<Cartridge>
+public class CartridgeService(SudInfoDatabaseContext context) : BaseService<Cartridge>(context)
 {
     #region Ctors
 
-    public CartridgeService(SudInfoDatabaseContext context) : base(context)
-    {
-    }
-
     #endregion
 
     #region Get Methods
@@ -29,9 +25,8 @@ public async Task<Result<Cartridge>> Get(int id)
 
     public async Task<IReadOnlyCollection<Cartridge>> Get()
     {
-        var cartridges = await context.Cartridges.AsNoTracking()
+        return await context.Cartridges.AsNoTracking()
                                                  .ToListAsync();
-        return cartridges;
     }
 
     #endregion

src/SudInfo.Avalonia/Services/ComputerService.cs

@@ -1,13 +1,9 @@
 namespace SudInfo.Avalonia.Services;
 
-public class ComputerService : BaseService<Computer>
+public class ComputerService(SudInfoDatabaseContext context) : BaseService<Computer>(context)
 {
     #region Ctors
 
-    public ComputerService(SudInfoDatabaseContext context) : base(context)
-    {
-    }
-
     #endregion
 
     #region Get Methods
@@ -30,10 +26,9 @@ public async Task<Result<Computer>> Get(int id)
 
     public async Task<IReadOnlyCollection<Computer>> Get()
     {
-        var computers = await context.Computers.AsNoTracking()
+        return await context.Computers.AsNoTracking()
                                                .Include(x => x.User)
                                                .ToListAsync();
-        return computers;
     }
 
     #endregion

src/SudInfo.Avalonia/Services/ContactService.cs

@@ -1,22 +1,17 @@
 namespace SudInfo.Avalonia.Services;
 
-public class ContactService : BaseService<Contact>
+public class ContactService(SudInfoDatabaseContext context) : BaseService<Contact>(context)
 {
     #region Ctors
 
-    public ContactService(SudInfoDatabaseContext context) : base(context)
-    {
-    }
-
     #endregion
 
     #region Get Methods
 
     public async Task<IReadOnlyCollection<Contact>> Get()
     {
-        var contacts = await context.Contacts.AsNoTracking()
+        return await context.Contacts.AsNoTracking()
                                              .ToListAsync();
-        return contacts;
     }
 
     public async Task<Result<Contact>> Get(int id)