From d8976b4fb5e2fa3614bfa8626bd01c6c1e193f06 Mon Sep 17 00:00:00 2001
From: Miepee <38186597+Miepee@users.noreply.github.com>
Date: Tue, 2 Jan 2024 20:26:02 +0100
Subject: [PATCH] Try to fix macos CI (#29)

---
 .github/workflows/main.yml   | 17 ++++++++++-------
 Atomic.Mac/Atomic.Mac.csproj |  6 +++---
 Atomic.Mac/Info.plist        |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9613a00..1eba468 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,17 +11,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest]
         configuration: [Release]
         include:
           - 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
+          - os: macos-13
             COMMAND: Atomic.Mac -o builds/macOS-latest
             ARTIFACT: builds/macOS-latest
-            POSTBUILD: rm -r builds/macOS-latest/* && mv Atomic.Mac/bin/Release/net6.0-macos/Atomic.Mac.app builds/macOS-latest/Atomic.Mac.app
+            POSTBUILD: rm -r builds/macOS-latest/* && mv Atomic.Mac/bin/Release/net8.0-macos/Atomic.Mac.app 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
@@ -32,12 +32,15 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.x.x
     - name: Install Mac workload 
-      working-directory: ./Atomic
-      run: dotnet workload install macos
+      working-directory: ./
+      run: dotnet workload install macos && dotnet workload restore
+    - name: Switch XCode
+      run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app/Contents/Developer
+      if: matrix.os == 'macos-13'
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/Atomic.Mac/Atomic.Mac.csproj b/Atomic.Mac/Atomic.Mac.csproj
index 535eaf5..2c942d5 100644
--- a/Atomic.Mac/Atomic.Mac.csproj
+++ b/Atomic.Mac/Atomic.Mac.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0-macos</TargetFramework>
+        <TargetFramework>net8.0-macos</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <OutputType>Exe</OutputType>
         <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
-        <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
         <RollForward>LatestMajor</RollForward>
     </PropertyGroup>
 
@@ -17,4 +17,4 @@
       <ProjectReference Include="..\Atomic\Atomic.csproj" />
     </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Atomic.Mac/Info.plist b/Atomic.Mac/Info.plist
index a4cf639..bfd8b91 100644
--- a/Atomic.Mac/Info.plist
+++ b/Atomic.Mac/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleShortVersionString</key>
     <string>1.0</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.14</string>
+    <string>10.15</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>NSHumanReadableCopyright</key>
@@ -17,4 +17,4 @@
     <key>CFBundleIconFile</key>
     <string>MacIcon.icns</string>
   </dict>
-</plist>
\ No newline at end of file
+</plist>