Merge pull request LykosAI#1094 from ionite34/fix-dotnet-and-save-pane

Fix missing .net 8 and remember sidebar open state

(cherry picked from commit 8117898)

# Conflicts:
#	CHANGELOG.md
#	StabilityMatrix.Core/Models/Settings/Settings.cs

Author: mohnjiles

CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.15.0-dev.2
+### Changed
+- Civitai model browser image loading now uses dynamic resizing for better performance and a smoother scrolling experience.
+- Detailed notifications for Civitai model browser api errors.
+- The main sidebar now remembers whether it was collapsed or expanded between restarts.
+### Fixed
+- Fixed missing .NET 8 dependency for SwarmUI installs in certain cases
+
+## v2.15.0-dev.1
+### Added
+- Added Python Version selector for all new package installs
+- Added the ability to rename packages
+### Changed
+- Updated all Python version management, virtual environment creation, and pip installs to use `uv` for improved reliability, compatibility, and speed
+- The Civitai model browser Download Location selector will now remember the last location used based on the model type
+- New installs of ComfyUI, SD.Next, and InvokeAI will now use Python 3.12.10, unless otherwise specified in the Advanced Options during installation
+- New installs of all other packages will now use Python 3.10.17, unless otherwise specified in the Advanced Options during installation
+### Supporters
+#### 🌟 Visionaries
+A massive thank you to our esteemed Visionary-tier Patrons: **Waterclouds**, **bluepopsicle**, **Bob S**, **Ibixat**, and **Corey T**! Your exceptional commitment propels Stability Matrix to new heights and allows us to push the boundaries of innovation. We're incredibly grateful for your foundational support! 🚀
+
+>>>>>>> 81178983 (Merge pull request #1094 from ionite34/fix-dotnet-and-save-pane)
 ## v2.14.2
 ### Changed
 - Changed Nvidia GPU detection to use compute capability level instead of the GPU name for certain feature gates / torch indexes

StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs

@@ -46,7 +46,8 @@ IPyRunner pyRunner
 
     private DirectoryPath DotnetDir => AssetsDir.JoinDir("dotnet");
     private string DotnetPath => Path.Combine(DotnetDir, "dotnet");
-    private bool IsDotnetInstalled => File.Exists(DotnetPath);
+    private string Dotnet7SdkExistsPath => Path.Combine(DotnetDir, "sdk", "7.0.405");
+    private string Dotnet8SdkExistsPath => Path.Combine(DotnetDir, "sdk", "8.0.101");
     private string Dotnet7DownloadUrlMacOs =>
         "https://download.visualstudio.microsoft.com/download/pr/5bb0e0e4-2a8d-4aba-88ad-232e1f65c281/ee6d35f762d81965b4cf336edde1b318/dotnet-sdk-7.0.405-osx-arm64.tar.gz";
     private string Dotnet8DownloadUrlMacOs =>
@@ -103,19 +104,17 @@ public async Task InstallPackageRequirements(
 
     public async Task InstallDotnetIfNecessary(IProgress<ProgressReport>? progress = null)
     {
-        if (IsDotnetInstalled)
-            return;
+        var downloadUrl = Compat.IsMacOS ? Dotnet8DownloadUrlMacOs : Dotnet8DownloadUrlLinux;
 
-        if (Compat.IsMacOS)
-        {
-            await DownloadAndExtractPrerequisite(progress, Dotnet7DownloadUrlMacOs, DotnetDir);
-            await DownloadAndExtractPrerequisite(progress, Dotnet8DownloadUrlMacOs, DotnetDir);
-        }
-        else
+        var dotnet8SdkExists = Directory.Exists(Dotnet8SdkExistsPath);
+
+        if (dotnet8SdkExists && Directory.Exists(DotnetDir))
         {
-            await DownloadAndExtractPrerequisite(progress, Dotnet7DownloadUrlLinux, DotnetDir);
-            await DownloadAndExtractPrerequisite(progress, Dotnet8DownloadUrlLinux, DotnetDir);
+            Logger.Info("Dotnet 8 SDK already installed at {DotnetDir}", DotnetDir);
+            return;
         }
+
+        await DownloadAndExtractPrerequisite(progress, downloadUrl, DotnetDir);
     }
 
     private async Task InstallVirtualenvIfNecessary(IProgress<ProgressReport>? progress = null)

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -74,6 +74,8 @@ IPyRunner pyRunner
     private string Dotnet8DownloadPath => Path.Combine(AssetsDir, "dotnet-sdk-8.0.101-win-x64.zip");
     private string DotnetExtractPath => Path.Combine(AssetsDir, "dotnet");
     private string DotnetExistsPath => Path.Combine(DotnetExtractPath, "dotnet.exe");
+    private string Dotnet7SdkExistsPath => Path.Combine(DotnetExtractPath, "sdk", "7.0.405");
+    private string Dotnet8SdkExistsPath => Path.Combine(DotnetExtractPath, "sdk", "8.0.101");
     private string VcBuildToolsDownloadPath => Path.Combine(AssetsDir, "vs_BuildTools.exe");
 
     private string VcBuildToolsExistsPath =>
@@ -500,21 +502,25 @@ public async Task InstallNodeIfNecessary(IProgress<ProgressReport>? progress = n
     [SupportedOSPlatform("windows")]
     public async Task InstallDotnetIfNecessary(IProgress<ProgressReport>? progress = null)
     {
-        if (File.Exists(DotnetExistsPath))
-            return;
+        if (!Directory.Exists(Dotnet7SdkExistsPath))
+        {
+            await DownloadAndExtractPrerequisite(
+                progress,
+                Dotnet7DownloadUrl,
+                Dotnet7DownloadPath,
+                DotnetExtractPath
+            );
+        }
 
-        await DownloadAndExtractPrerequisite(
-            progress,
-            Dotnet7DownloadUrl,
-            Dotnet7DownloadPath,
-            DotnetExtractPath
-        );
-        await DownloadAndExtractPrerequisite(
-            progress,
-            Dotnet8DownloadUrl,
-            Dotnet8DownloadPath,
-            DotnetExtractPath
-        );
+        if (!Directory.Exists(Dotnet8SdkExistsPath))
+        {
+            await DownloadAndExtractPrerequisite(
+                progress,
+                Dotnet8DownloadUrl,
+                Dotnet8DownloadPath,
+                DotnetExtractPath
+            );
+        }
     }
 
     [SupportedOSPlatform("windows")]

StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs

@@ -60,6 +60,9 @@ public partial class MainWindowViewModel : ViewModelBase
     [ObservableProperty]
     private object? selectedCategory;
 
+    [ObservableProperty]
+    public partial bool IsPaneOpen { get; set; }
+
     [ObservableProperty]
     private List<PageViewModelBase> pages = new();
 
@@ -164,6 +167,13 @@ protected override async Task OnInitialLoadedAsync()
             return;
         }
 
+        settingsManager.RelayPropertyFor(
+            this,
+            vm => vm.IsPaneOpen,
+            settings => settings.IsMainWindowSidebarOpen,
+            true
+        );
+
         // Initialize Discord Rich Presence (this needs LibraryDir so is set here)
         discordRichPresenceService.UpdateState();