More macOS build fixes

psyGamer · Jun 22, 2024 · 06793a0 · 06793a0
1 parent ab35158
commit 06793a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/CelesteStudio.Build.yml b/.github/workflows/CelesteStudio.Build.yml
@@ -56,30 +56,32 @@ jobs:
           path: publish-linux-x64/**/*
 
   build-mac:
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0'
       - name: Install macOS workflow
-        run: dotnet workload install macos
+        run: dotnet workload install macos && dotnet workload restore
+      - name: Switch XCode
+        run: sudo xcode-select -switch /Applications/Xcode_15.1.app/Contents/Developer
 
       - name: Publish x64
-        run: dotnet publish Studio/CelesteStudio.Mac -c Release -r osx-x64 --self-contained=true /p:PublishSingleFile=true --output publish-osx-x64
+        run: dotnet publish Studio/CelesteStudio.Mac -c Release --output publish-osx-x64
       - name: Publish ARM64
         run: dotnet publish Studio/CelesteStudio.Mac -c Release -r osx-arm64 --self-contained=true /p:PublishSingleFile=true --output publish-osx-arm64
 
       - name: Upload x64
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: CelesteStudio-osx-x64
           path: publish-osx-x64/**/*
       - name: Upload ARM64
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: CelesteStudio-osx-arm64
           path: publish-osx-arm64/**/*
diff --git a/Studio/CelesteStudio.Mac/CelesteStudio.Mac.csproj b/Studio/CelesteStudio.Mac/CelesteStudio.Mac.csproj
@@ -2,10 +2,11 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net7.0-macos</TargetFramework>
 
         <SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
         <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
+        <RollForward>LatestMajor</RollForward>
     </PropertyGroup>
 
     <ItemGroup>