Merge branch 'master' into bring-back-borderless

ppy · Nov 22, 2024 · 9c2e2a5 · 9c2e2a5
2 parents f3dfc4a + dc98996
commit 9c2e2a5
Show file tree

Hide file tree

Showing 267 changed files with 10,916 additions and 5,809 deletions.
diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml
@@ -47,13 +47,80 @@ jobs:
 
       - name: Combine
         run: osu.Framework.NativeLibs/scripts/ffmpeg/combine_dylibs.sh
+        env:
+          platform: macOS
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
           name: macOS-universal
           path: macOS-universal
 
+  build-iOS:
+    name: Build iOS
+    runs-on: macos-12
+    strategy:
+      matrix:
+        arch: [arm64, simulator-arm64, simulator-x86_64]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: ilammy/setup-nasm@v1
+        if: matrix.arch == 'simulator-x86_64'
+
+      - name: Setup gas-preprocessor
+        run: |
+          git clone --depth=1 https://github.com/FFmpeg/gas-preprocessor
+          echo "GAS_PREPROCESSOR=$PWD/gas-preprocessor/gas-preprocessor.pl" >> $GITHUB_ENV
+
+      - name: Build
+        run: osu.Framework.NativeLibs/scripts/ffmpeg/build-iOS.sh
+        env:
+          arch: ${{ matrix.arch }}
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: iOS-${{ matrix.arch }}
+          path: iOS-${{ matrix.arch }}
+
+  combine-iOS:
+    name: Combine iOS libs
+    runs-on: macos-12
+    needs: build-iOS
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: iOS-simulator-x86_64
+          path: iOS-simulator-x86_64
+      - uses: actions/download-artifact@v4
+        with:
+          name: iOS-simulator-arm64
+          path: iOS-simulator-arm64
+      - uses: actions/download-artifact@v4
+        with:
+          name: iOS-arm64
+          path: iOS-arm64
+
+      - name: Combine dylibs
+        run: osu.Framework.NativeLibs/scripts/ffmpeg/combine_dylibs.sh
+        env:
+          platform: iOS-simulator
+
+      - name: Create XCFrameworks
+        run: osu.Framework.NativeLibs/scripts/ffmpeg/create-xcframeworks.sh
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: iOS-xcframework
+          path: iOS-xcframework
+
   build-win:
     name: Build Windows
     runs-on: ubuntu-22.04
@@ -112,7 +179,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install nasm libva-dev libvdpau-dev
+          sudo apt-get install nasm
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -126,14 +193,42 @@ jobs:
           name: linux-x64
           path: linux-x64
 
+  build-android:
+    name: Build Android
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        arch:
+          - armeabi-v7a
+          - arm64-v8a
+          - x86
+          - x86_64
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build
+        run: osu.Framework.NativeLibs/scripts/ffmpeg/build-android.sh
+        env:
+          arch: ${{ matrix.arch }}
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-${{ matrix.arch }}
+          path: android-${{ matrix.arch }}
+
   make-pr:
     name: Create pull request
     runs-on: ubuntu-22.04
     needs:
       - combine-macos
+      - combine-iOS
       - build-win
       - build-win-arm64
       - build-linux
+      - build-android
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -142,6 +237,10 @@ jobs:
         with:
           name: macOS-universal
           path: osu.Framework.NativeLibs/runtimes/osx/native
+      - uses: actions/download-artifact@v4
+        with:
+          name: iOS-xcframework
+          path: osu.Framework.iOS/runtimes/ios/native
       - uses: actions/download-artifact@v4
         with:
           name: linux-x64
@@ -158,6 +257,22 @@ jobs:
         with:
           name: win-x86
           path: osu.Framework.NativeLibs/runtimes/win-x86/native
+      - uses: actions/download-artifact@v4
+        with:
+          name: android-armeabi-v7a
+          path: osu.Framework.Android/armeabi-v7a
+      - uses: actions/download-artifact@v4
+        with:
+          name: android-arm64-v8a
+          path: osu.Framework.Android/arm64-v8a
+      - uses: actions/download-artifact@v4
+        with:
+          name: android-x86
+          path: osu.Framework.Android/x86
+      - uses: actions/download-artifact@v4
+        with:
+          name: android-x86_64
+          path: osu.Framework.Android/x86_64
 
       - uses: peter-evans/create-pull-request@v6
         with:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,6 +76,8 @@ jobs:
 
       - name: Setup Go
         uses: actions/setup-go@v5
+        with:
+          go-version: 1.21.9
 
       - name: Install httpbin
         run: go install github.com/mccutchen/go-httpbin/v2/cmd/go-httpbin@latest
@@ -88,13 +90,13 @@ jobs:
         run: dotnet build -c ${{matrix.os.configuration}} -warnaserror osu-framework.Desktop.slnf
 
       - name: Test
-        run: dotnet test $pwd/**/*.Tests/bin/${{matrix.os.configuration}}/*/*.Tests.dll --no-build --settings $pwd/build/vstestconfig.runsettings --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}.trx"
+        run: dotnet test $pwd/**/*.Tests/bin/${{matrix.os.configuration}}/*/*.Tests.dll --no-build --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}.trx" -- NUnit.ConsoleOut=0
         shell: pwsh
 
       # Attempt to upload results even if test fails.
       # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#always
       - name: Upload Test Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: osu-framework-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}
@@ -139,9 +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
+        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
@@ -166,9 +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
+        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/.github/workflows/report-nunit.yml b/.github/workflows/report-nunit.yml
@@ -5,30 +5,40 @@
 name: Annotate CI run with test results
 on:
   workflow_run:
-    workflows: ["Continuous Integration"]
+    workflows: [ "Continuous Integration" ]
     types:
       - completed
+
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
 jobs:
   annotate:
     name: Annotate CI run with test results
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
-    strategy:
-       fail-fast: false
-       matrix:
-          os:
-            - { prettyname: Windows, configuration: Debug }
-            - { prettyname: macOS, configuration: Debug }
-            - { prettyname: Linux, configuration: Debug }
-            - { prettyname: Linux, configuration: Release }
-          threadingMode: ['SingleThread', 'MultiThreaded']
     timeout-minutes: 5
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.workflow_run.repository.full_name }}
+          ref: ${{ github.event.workflow_run.head_sha }}
+
+      - name: Download results
+        uses: actions/download-artifact@v4
+        with:
+          pattern: osu-framework-test-results-*
+          merge-multiple: true
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ github.token }}
+
       - name: Annotate CI run with test results
         uses: dorny/[email protected]
         with:
-          artifact: osu-framework-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}
-          name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}}, ${{matrix.os.configuration}})
+          name: Results
           path: "*.trx"
           reporter: dotnet-trx
           list-suites: 'failed'

diff --git a/.gitignore b/.gitignore
@@ -308,12 +308,15 @@ fabric.properties
 # Reference:  https://github.com/JetBrains/resharper-rider-samples/blob/master/.gitignore
 
 # User specific
-**/.idea/**/workspace.xml
-**/.idea/**/tasks.xml
-**/.idea/shelf/*
-**/.idea/dictionaries
 **/.idea/httpRequests/
 **/.idea/**/usage.statistics.xml
+**/.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+.idea/*/.idea/projectSettingsUpdater.xml
+.idea/*/.idea/encodings.xml
 
 # Sensitive or high-churn files
 **/.idea/**/dataSources/
@@ -339,3 +342,8 @@ inspectcode
 
 .idea/.idea.osu-framework.Desktop/.idea/misc.xml
 .idea/.idea.osu-framework.Android/.idea/deploymentTargetDropDown.xml
+
+# NativeLibs build folders and tarballs
+osu.Framework.NativeLibs/scripts/ffmpeg/*/
+osu.Framework.NativeLibs/scripts/ffmpeg/*.tar.gz
+
diff --git a/.idea/.idea.osu-framework.Android/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu-framework.Android/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.osu-framework.Desktop/.idea/encodings.xml b/.idea/.idea.osu-framework.Desktop/.idea/encodings.xml
diff --git a/.idea/.idea.osu-framework.Desktop/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu-framework.Desktop/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.osu-framework.iOS/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu-framework.iOS/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.osu-framework/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu-framework/.idea/projectSettingsUpdater.xml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -58,7 +58,7 @@
                 "${workspaceRoot}/SampleGame.Desktop/bin/Debug/net8.0/SampleGame.Desktop.dll",
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build SampleGame (Debug)",
             "linux": {
                 "env": {
                     "LD_LIBRARY_PATH": "${workspaceRoot}/SampleGame.Desktop/bin/Debug/net8.0:${env:LD_LIBRARY_PATH}"
@@ -75,7 +75,7 @@
                 "${workspaceRoot}/SampleGame.Desktop/bin/Release/net8.0/SampleGame.Desktop.dll",
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build SampleGame (Release)",
             "linux": {
                 "env": {
                     "LD_LIBRARY_PATH": "${workspaceRoot}/SampleGame.Desktop/bin/Release/net8.0:${env:LD_LIBRARY_PATH}"

diff --git a/README.md b/README.md
@@ -27,9 +27,9 @@ This framework is intended to take steps beyond what you would normally expect f
 
 ## Requirements
 
-- A desktop platform with the [.NET 6.0 SDK](https://dotnet.microsoft.com/download).
+- A desktop platform with the [.NET 8.0 SDK](https://dotnet.microsoft.com/download).
 - When running on linux, please have a system-wide ffmpeg installation available to support video decoding.
-- When running on Windows 7 or 8.1, *[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60&pivots=os-windows#dependencies)** may be required to correctly run .NET 6 applications if your operating system is not up-to-date with the latest service packs.
+- When running on Windows 7 or 8.1, *[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60&pivots=os-windows#dependencies)** may be required to correctly run .NET 8 applications if your operating system is not up-to-date with the latest service packs.
 - When working with the codebase, we recommend using an IDE with intellisense and syntax highlighting, such as [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/), [Jetbrains Rider](https://www.jetbrains.com/rider/), or [Visual Studio Code](https://code.visualstudio.com/) with the [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) and [C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) plugin installed.
 
 ### Building

diff --git a/build/vstestconfig.runsettings b/build/vstestconfig.runsettings
diff --git a/osu-framework.iOS.slnf b/osu-framework.iOS.slnf
@@ -16,4 +16,4 @@
       "SampleGame\\SampleGame.csproj"
     ]
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ @@
           "SampleGame\\SampleGame.csproj"
         ]
       }
-    }
+    }