From 06793a01d7cc4f76541c58d516e8e24e49b9c991 Mon Sep 17 00:00:00 2001 From: psyGamer <psygamer21@gmail.com> Date: Sat, 22 Jun 2024 17:29:02 +0200 Subject: [PATCH] More macOS build fixes --- .github/workflows/CelesteStudio.Build.yml | 16 +++++++++------- .../CelesteStudio.Mac/CelesteStudio.Mac.csproj | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CelesteStudio.Build.yml b/.github/workflows/CelesteStudio.Build.yml index abb74c34..0563d0a3 100644 --- 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 index 95d958af..9b0def76 100644 --- 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>