From a2aad019c4905a000039c18598682ac460b82bd1 Mon Sep 17 00:00:00 2001
From: Miepee <38186597+Miepee@users.noreply.github.com>
Date: Tue, 31 Jan 2023 13:36:41 -0500
Subject: [PATCH] Fix mac publishing

---
 .github/workflows/main.yml   | 11 ++++++++---
 Atomic.Mac/Atomic.Mac.csproj |  8 +++++---
 Atomic.Mac/Program.cs        |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0948706..4061d24 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,12 +17,15 @@ jobs:
           - os: ubuntu-latest
             COMMAND: Atomic.Gtk -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained -o builds/ubuntu-latest -p:BuildPlatform=Gtk
             ARTIFACT: builds/ubuntu-latest
+            POSTBUILD: echo "nothing to do!"
           - os: macOS-latest
-            COMMAND: Atomic.Mac -r osx-x64 --no-self-contained -o builds/macOS-latest
-            ARTIFACT: builds/macOS-latest
+            COMMAND: Atomic.Mac -o builds/macOS-latest
+            ARTIFACT: Atomic/builds/macOS-latest
+            POSTBUILD: rm -r Atomic/builds/macOS-latest/* && mv Atomic/Atomic.Mac/bin/Release/net6.0-macos/Atomic.Mac.app Atomic/builds/macOS-latest/Atomic.Mac.app
           - os: windows-latest
             COMMAND: Atomic.Wpf -p:PublishSingleFile=true -p:DebugType=embedded -r win-x86 --no-self-contained -o builds/windows-latest
             ARTIFACT: builds/windows-latest
+            POSTBUILD: echo "nothing to do!"
     runs-on: ${{ matrix.os }}
     
 
@@ -37,7 +40,9 @@ jobs:
     - name: Build
       run: dotnet publish ${{ matrix.COMMAND }} -c "${{ matrix.configuration }}"
     - name: Post-Build
-      run: cp ./LICENSE ./${{ matrix.ARTIFACT }}/
+      run: |
+          cp ./LICENSE ./${{ matrix.ARTIFACT }}/
+          ${{ matrix.POSTBUILD }}
     # Steps for uploading artifacts.
     - name: Zip to Archive
       run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }}
diff --git a/Atomic.Mac/Atomic.Mac.csproj b/Atomic.Mac/Atomic.Mac.csproj
index 038cad8..535eaf5 100644
--- a/Atomic.Mac/Atomic.Mac.csproj
+++ b/Atomic.Mac/Atomic.Mac.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net6.0-macos</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
-        <OutputType>WinExe</OutputType>
+        <OutputType>Exe</OutputType>
+        <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
+        <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
         <RollForward>LatestMajor</RollForward>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Eto.Platform.Mac64" Version="2.7.2" />
+      <PackageReference Include="Eto.Platform.macOS" Version="2.7.2" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Atomic.Mac/Program.cs b/Atomic.Mac/Program.cs
index ede8b9f..a14bd53 100644
--- a/Atomic.Mac/Program.cs
+++ b/Atomic.Mac/Program.cs
@@ -7,7 +7,7 @@ class Program
     [STAThread]
     static void Main(string[] args)
     {
-        var application = new Application(Eto.Platforms.Mac64);
+        var application = new Application(Eto.Platforms.macOS);
         application.UnhandledException += ApplicationOnUnhandledException;
         try
         {