From 66869a1a1eec45b59a8466f69136befcf484f33e Mon Sep 17 00:00:00 2001
From: FaithBeam <32502411+FaithBeam@users.noreply.github.com>
Date: Sun, 27 Oct 2024 09:31:14 -0400
Subject: [PATCH 1/3] Update dotnet-desktop.yml

---
 .github/workflows/dotnet-desktop.yml | 34 ++++++++++++++++++----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 36e6a00..68c4fce 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -14,18 +14,18 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
-            rid: win-x64
-          - os: ubuntu-latest
-            rid: win-arm64
-          - os: ubuntu-latest
-            rid: linux-x64
-          - os: ubuntu-latest
-            rid: linux-arm64
+          # - os: ubuntu-latest
+          #   rid: win-x64
+          # - os: ubuntu-latest
+          #   rid: win-arm64
+          # - os: ubuntu-latest
+          #   rid: linux-x64
+          # - os: ubuntu-latest
+          #   rid: linux-arm64
           - os: macos-latest
             rid: osx-arm64
-          - os: macos-latest
-            rid: osx-x64
+          # - os: macos-latest
+          #   rid: osx-x64
     
     runs-on: ${{ matrix.os }}
     
@@ -74,14 +74,24 @@ jobs:
           -p:Version=${{ steps.gitversion.outputs.SemVer }} \
           -p:AssemblyVersion=${{ steps.gitversion.outputs.AssemblySemFileVer }} \
           -o bin
+
+      - name: Publish
+        if: ${{ startsWith(matrix.rid, 'osx') }}
+        run: |
+          dotnet msbuild ${{ env.PROJECT_FOLDER}}/${{ env.PROJECT_NAME }}.csproj \
+          -t:BundleApp \
+          -p:RuntimeIdentifier=${{ matrix.rid }} \
+          -p:UseAppHost=true \
+          -p:Configuration=${{ env.CONFIGURATION }} \
+          -p:TargetFramework=net8.0
           
       - name: Set Executable Bit
         if: ${{ startsWith(matrix.rid, 'osx') }}
-        run: chmod -R +x bin/YMouseButtonControl
+        run: chmod -R +x ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish/${{ env.PROJECT_NAME }}.app
         
       - name: Tar to Preserve Executable Bit
         if: ${{ startsWith(matrix.rid, 'osx') }}
-        run: tar -cvf ${{ env.APP_NAME }}.${{ steps.gitversion.outputs.semVer }}+${{ matrix.rid }}.tar bin/
+        run: tar -cvf ${{ env.APP_NAME }}.${{ steps.gitversion.outputs.semVer }}+${{ matrix.rid }}.tar ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish/${{ env.PROJECT_NAME }}.app
 
       - name: Upload build artifacts
         if: ${{ startsWith(matrix.rid, 'osx') }}

From 094bcfbb5271b606c27a19724e6b7d6200823c88 Mon Sep 17 00:00:00 2001
From: FaithBeam <32502411+FaithBeam@users.noreply.github.com>
Date: Sun, 27 Oct 2024 09:34:08 -0400
Subject: [PATCH 2/3] Update dotnet-desktop.yml

---
 .github/workflows/dotnet-desktop.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 68c4fce..fd293a2 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -67,6 +67,7 @@ jobs:
         run: dotnet restore -r ${{ matrix.rid }}  
 
       - name: Publish
+        if: ${{ ! startsWith(matrix.rid, 'osx') }}
         run: |
           dotnet publish ${{ env.PROJECT_FOLDER}}/${{ env.PROJECT_NAME }} \
           -c ${{ env.CONFIGURATION }} \
@@ -78,7 +79,7 @@ jobs:
       - name: Publish
         if: ${{ startsWith(matrix.rid, 'osx') }}
         run: |
-          dotnet msbuild ${{ env.PROJECT_FOLDER}}/${{ env.PROJECT_NAME }}.csproj \
+          dotnet msbuild ${{ env.PROJECT_FOLDER}}/${{ env.PROJECT_NAME }} \
           -t:BundleApp \
           -p:RuntimeIdentifier=${{ matrix.rid }} \
           -p:UseAppHost=true \
@@ -87,11 +88,11 @@ jobs:
           
       - name: Set Executable Bit
         if: ${{ startsWith(matrix.rid, 'osx') }}
-        run: chmod -R +x ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish/${{ env.PROJECT_NAME }}.app
+        run: chmod -R +x ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish/${{ env.APP_NAME }}.app
         
       - name: Tar to Preserve Executable Bit
         if: ${{ startsWith(matrix.rid, 'osx') }}
-        run: tar -cvf ${{ env.APP_NAME }}.${{ steps.gitversion.outputs.semVer }}+${{ matrix.rid }}.tar ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish/${{ env.PROJECT_NAME }}.app
+        run: tar -cvf ${{ env.APP_NAME }}.${{ steps.gitversion.outputs.semVer }}+${{ matrix.rid }}.tar ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish/${{ env.APP_NAME }}.app
 
       - name: Upload build artifacts
         if: ${{ startsWith(matrix.rid, 'osx') }}

From 340c068e77372788938047d88e652c648fea72bb Mon Sep 17 00:00:00 2001
From: FaithBeam <32502411+FaithBeam@users.noreply.github.com>
Date: Sun, 27 Oct 2024 09:36:36 -0400
Subject: [PATCH 3/3] Update dotnet-desktop.yml

---
 .github/workflows/dotnet-desktop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index fd293a2..7a9be6b 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -92,7 +92,7 @@ jobs:
         
       - name: Tar to Preserve Executable Bit
         if: ${{ startsWith(matrix.rid, 'osx') }}
-        run: tar -cvf ${{ env.APP_NAME }}.${{ steps.gitversion.outputs.semVer }}+${{ matrix.rid }}.tar ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish/${{ env.APP_NAME }}.app
+        run: tar -C ${{ env.PROJECT_FOLDER}}/bin/${{ env.CONFIGURATION }}/net8.0/${{ matrix.rid }}/publish -cvf ${{ env.APP_NAME }}.${{ steps.gitversion.outputs.semVer }}+${{ matrix.rid }}.tar ${{ env.APP_NAME }}.app
 
       - name: Upload build artifacts
         if: ${{ startsWith(matrix.rid, 'osx') }}