Fix namespaces

StabilityMatrix.Core/Models/InstalledPackage.cs

@@ -44,7 +44,7 @@ public class InstalledPackage
     /// Get the path as a relative sub-path of the relative path.
     /// If not a sub-path, return null.
     /// </summary>
-    internal static string? GetSubPath(string relativeTo, string path)
+    public static string? GetSubPath(string relativeTo, string path)
     {
         var relativePath = System.IO.Path.GetRelativePath(relativeTo, path);
         // GetRelativePath returns the path if it's not relative

StabilityMatrix.Tests/Helper/PackageFactoryTests.cs

@@ -1,5 +1,4 @@
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models;
 using StabilityMatrix.Models.Packages;
 
 namespace StabilityMatrix.Tests.Helper;

StabilityMatrix.Tests/Models/InstalledPackageTests.cs

@@ -1,5 +1,4 @@
 using StabilityMatrix.Core.Models;
-using StabilityMatrix.Models;
 
 namespace StabilityMatrix.Tests.Models;
 

StabilityMatrix.Tests/StabilityMatrix.Tests.csproj

@@ -26,6 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\StabilityMatrix.Core\StabilityMatrix.Core.csproj" />
       <ProjectReference Include="..\StabilityMatrix\StabilityMatrix.csproj" />
     </ItemGroup>
 

StabilityMatrix.sln

@@ -7,7 +7,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix", "Stabilit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Tests", "StabilityMatrix.Tests\StabilityMatrix.Tests.csproj", "{63EF4330-CCFF-4677-B14C-1A700CD81FDA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Core", "StabilityMatrix.Core\StabilityMatrix.Core\StabilityMatrix.Core.csproj", "{E2E0B158-26D2-48EB-84E3-C5559D9AE84C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Core", "StabilityMatrix.Core\StabilityMatrix.Core.csproj", "{E2E0B158-26D2-48EB-84E3-C5559D9AE84C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Avalonia", "StabilityMatrix.Avalonia\StabilityMatrix.Avalonia.csproj", "{3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,6 +29,10 @@ Global
 		{E2E0B158-26D2-48EB-84E3-C5559D9AE84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E2E0B158-26D2-48EB-84E3-C5559D9AE84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2E0B158-26D2-48EB-84E3-C5559D9AE84C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

StabilityMatrix/InstallerWindow.xaml

@@ -20,14 +20,14 @@
     xmlns:converters="clr-namespace:StabilityMatrix.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
     xmlns:octokit="clr-namespace:Octokit;assembly=Octokit"
     xmlns:packages="clr-namespace:StabilityMatrix.Models.Packages"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="clr-namespace:MdXaml;assembly=MdXaml"
-    xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core">
+    xmlns:xaml="clr-namespace:MdXaml;assembly=MdXaml">
 
     <ui:FluentWindow.Resources>
         <converters:ValueConverterGroup x:Key="InvertAndVisibilitate">
@@ -37,7 +37,7 @@
 
         <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
         <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
-        <converters:UriToBitmapConverter x:Key="UriToBitmapConverter"/>
+        <converters:UriToBitmapConverter x:Key="UriToBitmapConverter" />
 
         <xaml:Markdown
             AssetPathRoot="{x:Static system:Environment.CurrentDirectory}"
@@ -137,11 +137,12 @@
                     Text="{Binding SelectedPackage.DisplayName, FallbackValue=Stable Diffusion Web UI}" />
                 <TextBlock FontSize="12" Text="{Binding SelectedPackage.ByAuthor, FallbackValue=by Automatic111}" />
 
-                <ui:Button Command="{Binding ShowPreviewCommand}"
+                <ui:Button
                     Appearance="Transparent"
                     BorderBrush="Transparent"
-                           Margin="0,8,0,0"
-                           Content="UI Preview">
+                    Command="{Binding ShowPreviewCommand}"
+                    Content="UI Preview"
+                    Margin="0,8,0,0">
                     <ui:Button.Style>
                         <Style BasedOn="{StaticResource {x:Type ui:Button}}" TargetType="{x:Type ui:Button}">
                             <Setter Property="Foreground">
@@ -153,8 +154,7 @@
                     </ui:Button.Style>
                 </ui:Button>
 
-                <ui:Hyperlink NavigateUri="{Binding SelectedPackage.GithubUrl}"
-                              Margin="0,0,0,8">
+                <ui:Hyperlink Margin="0,0,0,8" NavigateUri="{Binding SelectedPackage.GithubUrl}">
                     <TextBlock TextWrapping="Wrap">
                         <Run Text="GitHub Page:" />
                         <Run Text="{Binding SelectedPackage.GithubUrl, Mode=OneWay}" TextDecorations="Underline" />
@@ -216,8 +216,7 @@
                 </StackPanel>
 
                 <Label Content="Display Name" Margin="0,16,0,0" />
-                <StackPanel Orientation="Horizontal"
-                            Visibility="{Binding ShowDuplicateWarning, Converter={StaticResource BoolToVisConverter}}">
+                <StackPanel Orientation="Horizontal" Visibility="{Binding ShowDuplicateWarning, Converter={StaticResource BoolToVisConverter}}">
                     <ui:SymbolIcon
                         Foreground="{ui:ThemeResource SystemFillColorCriticalBrush}"
                         Margin="8"
@@ -260,12 +259,15 @@
             </StackPanel>
 
             <FlowDocumentScrollViewer
-                Grid.Column="2"
-                Margin="16"
                 Document="{Binding ReleaseNotes, Converter={StaticResource TextToFlowDocumentConverter}}"
+                Grid.Column="2"
                 HorizontalAlignment="Stretch"
+                Margin="16"
                 VerticalAlignment="Stretch" />
-            <ContentPresenter Grid.Column="0" Grid.ColumnSpan="3" x:Name="InstallerContentDialog" />
+            <ContentPresenter
+                Grid.Column="0"
+                Grid.ColumnSpan="3"
+                x:Name="InstallerContentDialog" />
         </Grid>
     </Grid>
 </ui:FluentWindow>

StabilityMatrix/StabilityMatrix.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="7-Zip.CommandLine" Version="18.1.0" />
     <PackageReference Include="AsyncAwaitBestPractices" Version="6.0.6" />
     <PackageReference Include="Blake3" Version="0.5.1" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     <PackageReference Include="FuzzySharp" Version="2.0.2" />
     <PackageReference Include="LiteDB" Version="5.0.16" />
     <PackageReference Include="LiteDB.Async" Version="0.1.6" />
@@ -103,7 +103,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\StabilityMatrix.Core\StabilityMatrix.Core\StabilityMatrix.Core.csproj" />
+    <ProjectReference Include="..\StabilityMatrix.Core\StabilityMatrix.Core.csproj" />
   </ItemGroup>
   
 </Project>