diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dabe8e93c..6583d36179 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,12 +141,8 @@ jobs: dotnet-version: "8.0.x" - name: Restore .NET workloads - # `dotnet workload restore` is bugged in .NET 7.0.101+ when restoring iOS projects, - # see https://github.com/xamarin/xamarin-macios/issues/16400. - run: dotnet workload install ios - - - name: Select Xcode 16 - run: sudo xcode-select -s /Applications/Xcode_16.app/Contents/Developer + run: dotnet workload install ios --from-rollback-file workloads.json - name: Compile run: dotnet build -c Debug osu-framework.iOS.slnf + diff --git a/.github/workflows/deploy-pack.yml b/.github/workflows/deploy-pack.yml index 65efbced09..88bc62e7ac 100644 --- a/.github/workflows/deploy-pack.yml +++ b/.github/workflows/deploy-pack.yml @@ -166,12 +166,7 @@ jobs: dotnet-version: "8.0.x" - name: Restore .NET Workloads - # `dotnet workload restore` is bugged in .NET 7.0.101+ when restoring iOS projects, - # see https://github.com/xamarin/xamarin-macios/issues/16400. - run: dotnet workload install ios - - - name: Select Xcode 16 - run: sudo xcode-select -s /Applications/Xcode_16.app/Contents/Developer + run: dotnet workload install ios --from-rollback-file workloads.json - name: Pack (iOS Framework) run: dotnet pack -c Release osu.Framework.iOS /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}} diff --git a/workloads.json b/workloads.json new file mode 100644 index 0000000000..c27e7ead60 --- /dev/null +++ b/workloads.json @@ -0,0 +1,3 @@ +{ + "microsoft.net.sdk.ios": "17.2.8053/8.0.100" +}