Merge branch 'dev' into downmerge

11 months ago · f7feb2e933
9 changed files with 21 additions and 2 deletions
--- a/StabilityMatrix.Avalonia.Diagnostics/StabilityMatrix.Avalonia.Diagnostics.csproj
+++ b/StabilityMatrix.Avalonia.Diagnostics/StabilityMatrix.Avalonia.Diagnostics.csproj
@ -21,6 +21,7 @@
    <ItemGroup>
      <PackageReference Include="Avalonia" Version="11.0.5" />
      <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
+      <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
      <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
--- a/StabilityMatrix.Avalonia/App.axaml
+++ b/StabilityMatrix.Avalonia/App.axaml
@ -4,6 +4,7 @@
             xmlns:local="using:StabilityMatrix.Avalonia"
             xmlns:idcr="using:Dock.Avalonia.Controls.Recycling"
             xmlns:styling="clr-namespace:FluentAvalonia.Styling;assembly=FluentAvalonia"
+             Name="Stability Matrix"
             RequestedThemeVariant="Dark">
             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->

--- a/StabilityMatrix.Avalonia/Helpers/UriHandler.cs
+++ b/StabilityMatrix.Avalonia/Helpers/UriHandler.cs
@ -62,7 +62,7 @@ public class UriHandler
        {
            RegisterUriSchemeWin();
        }
-        else
+        else if (Compat.IsLinux)
        {
            // Try to register on unix but ignore errors
            // Library does not support some distros
--- a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
+++ b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
+        <CFBundleName>Stability Matrix</CFBundleName>
        <OutputType>WinExe</OutputType>
        <TargetFramework>net8.0</TargetFramework>
        <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
@ -14,6 +15,13 @@
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    </PropertyGroup>

+    <ItemGroup>
+        <CFBundleURLTypes Include="dummy">
+            <CFBundleURLName>StabilityMatrix.URL</CFBundleURLName>
+            <CFBundleURLSchemes>stabilitymatrix;stabilitymatrix://</CFBundleURLSchemes>
+        </CFBundleURLTypes>
+    </ItemGroup>
+    
    <ItemGroup>
        <InternalsVisibleTo Include="StabilityMatrix.Tests" />
        <InternalsVisibleTo Include="StabilityMatrix.UITests" />
@ -40,6 +48,7 @@
        <PackageReference Include="Dock.Avalonia" Version="11.0.0.3" />
        <PackageReference Include="Dock.Model.Avalonia" Version="11.0.0.3" />
        <PackageReference Include="Dock.Serializer" Version="11.0.0.3" />
+        <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
        <PackageReference Include="DynamicData" Version="8.1.1" />
        <PackageReference Include="Exceptionless.DateTimeExtensions" Version="3.4.3" />
        <PackageReference Include="FluentAvalonia.BreadcrumbBar" Version="2.0.2" />
--- a/StabilityMatrix.Core/Models/Packages/BasePackage.cs
+++ b/StabilityMatrix.Core/Models/Packages/BasePackage.cs
@ -117,6 +117,11 @@ public abstract class BasePackage
            return TorchVersion.DirectMl;
        }

+        if (Compat.IsMacOS && Compat.IsArm && AvailableTorchVersions.Contains(TorchVersion.Mps))
+        {
+            return TorchVersion.Mps;
+        }
+
        return TorchVersion.Cpu;
    }

--- a/StabilityMatrix.Core/Processes/ProcessRunner.cs
+++ b/StabilityMatrix.Core/Processes/ProcessRunner.cs
@ -92,7 +92,7 @@ public static class ProcessRunner
        else if (Compat.IsMacOS)
        {
            using var process = new Process();
-            process.StartInfo.FileName = "explorer";
+            process.StartInfo.FileName = "open";
            process.StartInfo.Arguments = $"-R {Quote(filePath)}";
            process.Start();
            await process.WaitForExitAsync().ConfigureAwait(false);
--- a/StabilityMatrix.Core/StabilityMatrix.Core.csproj
+++ b/StabilityMatrix.Core/StabilityMatrix.Core.csproj
@ -25,6 +25,7 @@
      <PackageReference Include="DeviceId.Mac" Version="6.2.1" />
      <PackageReference Include="DeviceId.Windows" Version="6.5.0" />
      <PackageReference Include="DeviceId.Windows.Wmi" Version="6.5.1" />
+      <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
      <PackageReference Include="DynamicData" Version="8.1.1" />
      <PackageReference Include="Hardware.Info" Version="100.0.0.1" />
      <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
--- a/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
+++ b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
@ -11,6 +11,7 @@
    </PropertyGroup>

    <ItemGroup>
+        <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
        <PackageReference Include="DotNext" Version="4.15.1" />
        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
--- a/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj
+++ b/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj
@ -11,6 +11,7 @@

    <ItemGroup>
        <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.5" />
+        <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
        <PackageReference Include="NSubstitute" Version="5.1.0" />
        <PackageReference Include="Verify" Version="22.4.1" />