small di fix

Author: fgsfds

Directory.Packages.props

@@ -10,8 +10,8 @@
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.2" />
     <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.2.2" />
     <PackageVersion Include="AddSealed" Version="0.6.0" />
-    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.3.2" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="Markdown.Avalonia" Version="11.0.2" />
     <PackageVersion Include="MediatR" Version="12.4.1" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
@@ -34,11 +34,11 @@
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.408.1" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.410.6" />
     <PackageVersion Include="ConfigureAwaitAnalyzer" Version="1.1.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.1.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="9.0.0" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
     <PackageVersion Include="Markdig" Version="0.38.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>

src/Avalonia.Desktop/App.axaml.cs

@@ -1,11 +1,9 @@
-using Addons.Providers;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Desktop.DI;
 using Avalonia.Desktop.Helpers;
-using Avalonia.Desktop.ViewModels;
 using Avalonia.Desktop.Views;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
@@ -14,10 +12,8 @@
 using Common.Client.Helpers;
 using Common.Client.Interfaces;
 using CommunityToolkit.Diagnostics;
-using Games.Providers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Ports.Providers;
 
 namespace Avalonia.Desktop;
 
@@ -91,14 +87,8 @@ public override void OnFrameworkInitializationCompleted()
 
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                var vm = BindingsManager.Provider.GetRequiredService<MainViewModel>();
-                var gamesProvider = BindingsManager.Provider.GetRequiredService<InstalledGamesProvider>();
-                var vmFactory = BindingsManager.Provider.GetRequiredService<ViewModelsFactory>();
-                var portsProvider = BindingsManager.Provider.GetRequiredService<InstalledPortsProvider>();
-                var installedAddonsProviderFactory = BindingsManager.Provider.GetRequiredService<InstalledAddonsProviderFactory>();
-                var configProvider = BindingsManager.Provider.GetRequiredService<IConfigProvider>();
-
-                desktop.MainWindow = new MainWindow(vm, gamesProvider, vmFactory, installedAddonsProviderFactory, portsProvider, configProvider);
+                // DI entry point
+                desktop.MainWindow = BindingsManager.Provider.GetRequiredService<MainWindow>();
 
                 desktop.Exit += OnAppExit;
             }
@@ -157,7 +147,7 @@ private static void LoadBindings()
         var container = BindingsManager.Instance;
 
         ClientBindings.Load(container, Design.IsDesignMode);
-        ViewModelsBindings.Load(container);
+        GuiBindings.Load(container);
         Games.DI.ProvidersBindings.Load(container);
         Ports.DI.ProvidersBindings.Load(container);
         Addons.DI.ProvidersBindings.Load(container);

src/Avalonia.Desktop/DI/ViewModelsBindings.cs renamed to src/Avalonia.Desktop/DI/GuiBindings.cs

@@ -1,14 +1,17 @@
 using Avalonia.Desktop.ViewModels;
+using Avalonia.Desktop.Views;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Avalonia.Desktop.DI;
 
-public static class ViewModelsBindings
+public static class GuiBindings
 {
     public static void Load(ServiceCollection container)
     {
         _ = container.AddSingleton<ViewModelsFactory>();
 
         _ = container.AddSingleton<MainViewModel>();
+
+        _ = container.AddSingleton<MainWindow>();
     }
 }