MacOs stuff and runtime identifier

src/PixiEditor.AvaloniaUI/Initialization/ClassicDesktopEntry.cs

@@ -123,7 +123,7 @@ internal class ClassicDesktopEntry
 #elif LINUX
         return new PixiEditor.Linux.LinuxOperatingSystem();
 #elif MACOS
-        return new PixiEditor.MacOs.MacOSOperatingSystem();
+        return new PixiEditor.MacOs.MacOperatingSystem();
 #else
         throw new PlatformNotSupportedException("This platform is not supported");
 #endif

src/PixiEditor.AvaloniaUI/PixiEditor.AvaloniaUI.csproj

@@ -23,15 +23,24 @@
     <DebugType>None</DebugType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+  <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <PropertyGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))">
+  <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Linux')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <PropertyGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))">
+  <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Linux')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">
+    <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('OSX')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
   </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('OSX')) AND '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">
+    <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+  </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)'=='x64'">
     <TargetPlatform>x64</TargetPlatform>
@@ -113,7 +122,7 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(RuntimeIdentifier)'=='osx-x64'">
-    <ProjectReference Include="..\PixiEditor.Mac\PixiEditor.MacOs.csproj"/>
+    <ProjectReference Include="..\PixiEditor.MacOs\PixiEditor.MacOs.csproj"/>
   </ItemGroup>
   
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='osx-x64'">
@@ -121,7 +130,7 @@
   </PropertyGroup>
   
   <ItemGroup Condition="'$(RuntimeIdentifier)'=='osx-arm64'">
-    <ProjectReference Include="..\PixiEditor.Mac\PixiEditor.MacOs.csproj"/>
+    <ProjectReference Include="..\PixiEditor.MacOs\PixiEditor.MacOs.csproj"/>
   </ItemGroup>
   
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='osx-arm64'">

src/PixiEditor.AvaloniaUI/Views/Overlays/SelectionOverlay/SelectionOverlay.cs

@@ -114,7 +114,7 @@ internal class SelectionOverlay : Overlay
     private static void OnPathChanged(AvaloniaPropertyChangedEventArgs<VectorPath?> args)
     {
         var self = (SelectionOverlay)args.Sender;
-        if (args.NewValue.HasValue && !args.NewValue.Value.IsEmpty && self.IsVisible)
+        if (args.NewValue is { HasValue: true, Value.IsEmpty: false } && self.IsVisible)
         {
             self.cancelAnimationToken = new CancellationTokenSource();
             self.animation.RunAsync(self, self.cancelAnimationToken.Token);

src/PixiEditor.MacOs/MacOperatingSystem.cs

@@ -21,6 +21,6 @@ public sealed class MacOperatingSystem : IOperatingSystem
 
     public bool HandleNewInstance(Dispatcher? dispatcher, Action<string> openInExistingAction, IApplicationLifetime lifetime)
     {
-        throw new NotImplementedException();
+        return true;
     }
 }