Merge branch 'master' into drag-after-drawable-removed

.config/dotnet-tools.json

@@ -15,16 +15,16 @@
       ]
     },
     "nvika": {
-      "version": "2.2.0",
+      "version": "3.0.0",
       "commands": [
         "nvika"
       ]
     },
     "codefilesanity": {
-      "version": "0.0.36",
+      "version": "0.0.37",
       "commands": [
         "CodeFileSanity"
       ]
     }
   }
-}
+}

.editorconfig

@@ -9,6 +9,9 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 
+[g_*.cs]
+generated_code = true
+
 [*.cs]
 end_of_line = crlf
 insert_final_newline = true
@@ -191,8 +194,10 @@ csharp_style_prefer_index_operator = true:warning
 csharp_style_prefer_range_operator = true:warning
 csharp_style_prefer_switch_expression = false:none
 
+csharp_style_namespace_declarations = block_scoped:warning
+
 [*.{yaml,yml}]
 insert_final_newline = true
 indent_style = space
 indent_size = 2
-trim_trailing_whitespace = true
+trim_trailing_whitespace = true

.git-blame-ignore-revs

@@ -4,3 +4,5 @@
 ba1385330cc501f34937e08257e586c84e35d772
 # Make everything partial
 9bbc6a81a2b8f035e2b043d3718d2db6e4f1d868
+# Mass NRT enabling
+75ed421f60228920abd819cebc5982cb7799bbbb

.github/workflows/build-ffmpeg.yml

@@ -13,7 +13,7 @@ jobs:
           - arm64
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - uses: ilammy/setup-nasm@v1
 
@@ -34,7 +34,7 @@ jobs:
     needs: build-macos
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - uses: actions/download-artifact@v3
         with:
@@ -65,7 +65,7 @@ jobs:
           - x64
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
@@ -91,7 +91,7 @@ jobs:
       image: mstorsjo/llvm-mingw:latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build
         run: osu.Framework.NativeLibs/scripts/ffmpeg/win/fetch_and_build.sh
@@ -116,7 +116,7 @@ jobs:
           apt-get install -y git curl gcc make nasm
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build
         run: osu.Framework.NativeLibs/scripts/ffmpeg/linux/fetch_and_build.sh
@@ -137,7 +137,7 @@ jobs:
       - build-linux
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - uses: actions/download-artifact@v3
         with:
@@ -160,7 +160,7 @@ jobs:
           name: win-x86
           path: osu.Framework.NativeLibs/runtimes/win-x86/native
 
-      - uses: peter-evans/create-pull-request@v2
+      - uses: peter-evans/create-pull-request@v4
         with:
           commit-message: Update FFmpeg binaries
           title: Update FFmpeg binaries

.github/workflows/ci.yml

@@ -7,25 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      # FIXME: Tools won't run in .NET 5.0 unless you install 3.1.x LTS side by side.
-      # https://itnext.io/how-to-support-multiple-net-sdks-in-github-actions-workflows-b988daa884e
-      - name: Install .NET 3.1.x LTS
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "3.1.x"
+        uses: actions/checkout@v3
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 
       - name: Restore Tools
         run: dotnet tool restore
 
       - name: Restore Packages
-        run: dotnet restore
+        run: dotnet restore osu-framework.Desktop.slnf
 
       - name: Restore inspectcode cache
         uses: actions/cache@v3
@@ -73,10 +66,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 
@@ -100,7 +93,7 @@ jobs:
       # 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@v2
+        uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: osu-framework-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}
@@ -112,34 +105,36 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 
-      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1
+      - name: Restore .NET workloads
+        run: dotnet workload install android
 
-      - name: Build
-        run: msbuild osu-framework.Android.slnf /restore /p:Configuration=Debug
+      - name: Compile
+        run: dotnet build -c Debug osu-framework.Android.slnf
 
   build-only-ios:
     name: Build only (iOS)
     runs-on: macos-latest
     timeout-minutes: 60
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install .NET 6.0.x
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "6.0.x"
 
-      # Contrary to seemingly any other msbuild, msbuild running on macOS/Mono
-      # cannot accept .sln(f) files as arguments.
-      # Build just the iOS framework project for now.
-      - name: Build
-        run: msbuild osu.Framework.iOS/osu.Framework.iOS.csproj /restore /p:Configuration=Debug
+      - 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: Compile
+        run: dotnet build -c Debug osu-framework.iOS.slnf

.github/workflows/deploy-nativelibs.yml

@@ -40,27 +40,25 @@ jobs:
     needs: check-if-tag
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set Artifacts Directory
         id: artifactsPath
         run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts"
 
-      - name: Setup .NET 5.0.x
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET 6.0.x
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "6.0.x"
 
       - name: Build NativeLibs
         run: dotnet pack -c Release osu.Framework.NativeLibs /p:Configuration=Release /p:Version=${{needs.check-if-tag.outputs.version}} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}}
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: osu-framework-nativelibs
           path: ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.nupkg
 
-      - name: Deploy
-        run: |
-            dotnet nuget add source https://api.nuget.org/v3/index.json -n authed-nuget -u ${{secrets.NUGET_USER_NAME}} -p ${{secrets.NUGET_AUTH_TOKEN}}
-            dotnet nuget push ${{github.workspace}}/artifacts/*.nupkg --skip-duplicate --source authed-nuget
+      - name: Publish packages to nuget.org
+        run: dotnet nuget push ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json