From bdb3eaa9061190c92fee10b1ebc22e33545b58cd Mon Sep 17 00:00:00 2001
From: Miepee <38186597+Miepee@users.noreply.github.com>
Date: Sun, 24 Jul 2022 22:35:06 +0200
Subject: [PATCH] Hopefully fix action builds

---
 .github/workflows/main.yml | 54 +++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43e9242..7aac1d3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ on:
       - 'README.md'
 
 jobs:
-  build:
+  cli:
     strategy:
       fail-fast: false
       matrix:
@@ -14,14 +14,54 @@ jobs:
         configuration: [Release]
         include:
           - os: ubuntu-latest
-            COMMAND: AM2RPortHelper.csproj -p:PublishSingleFile=true -p:DebugType=embedded -r ubuntu.18.04-x64 --no-self-contained
-            ARTIFACT: AM2RPortHelper/bin/Release/net5.0/ubuntu.18.04-x64/publish/
+            COMMAND: AM2RPortHelperCLI.csproj -p:PublishSingleFile=true -p:DebugType=embedded -r linux-x64 --no-self-contained
+            ARTIFACT: AM2RPortHelperCLI/bin/Release/net6.0/linux-x64/publish/
           - os: macOS-latest
-            COMMAND: AM2RPortHelper.csproj -r osx-x64 --no-self-contained
-            ARTIFACT: AM2RPortHelper/bin/Release/net5.0/osx-x64/publish
+            COMMAND: AM2RPortHelperCLI.csproj -r osx-x64 --no-self-contained
+            ARTIFACT: AM2RPortHelperCLI/bin/Release/net6.0/osx-x64/publish
           - os: windows-latest
-            COMMAND: AM2RPortHelper.csproj -r win-x86 -o builds\win86 --no-self-contained
-            ARTIFACT: AM2RPortHelper\bin\Release\net5.0\win-x86\
+            COMMAND: AM2RPortHelperCLI.csproj -p:PublishSingleFile=true -p:DebugType=embedded -r win-x86 --no-self-contained
+            ARTIFACT: AM2RPortHelperCLI\bin\Release\net6.0\win-x86\
+    runs-on: ${{ matrix.os }}
+    
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      working-directory: ./AM2RPortHelper
+      run: dotnet restore
+    - name: Build
+      working-directory: ./AM2RPortHelper
+      run: dotnet publish ${{ matrix.COMMAND }} -c "${{ matrix.configuration }}"
+    # Steps for uploading artifacts.
+    - name: Zip to Archive
+      run: 7z a -tzip ${{ matrix.os }}.zip ./${{ matrix.ARTIFACT }}
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v1.0.0
+      with:
+        name: ${{ matrix.os }}
+        path: ${{ matrix.os }}.zip
+        
+  gui:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        configuration: [Release]
+        include:
+          - os: ubuntu-latest
+            COMMAND: AM2RPortHelperGUI.Gtk.csproj -p:PublishSingleFile=true -p:DebugType=embedded -r linux-x64 --no-self-contained
+            ARTIFACT: AM2RPortHelperGUI.Gtk/bin/Release/net6.0/linux-x64/publish/
+          - os: macOS-latest
+            COMMAND: AM2RPortHelperGUI.Mac.csproj -r osx-x64 --no-self-contained
+            ARTIFACT: AM2RPortHelperGUI.Mac/bin/Release/net6.0/osx-x64/publish
+          - os: windows-latest
+            COMMAND: AM2RPortHelperGUI.Wpf.csproj -p:PublishSingleFile=true -p:DebugType=embedded -r win-x86 --no-self-contained
+            ARTIFACT: AM2RPortHelperGUI.Wpf\bin\Release\net6.0\win-x86\
     runs-on: ${{ matrix.os }}