From 8a2d02f65b6f0046e47693a50725656cacb37107 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 17:29:25 +0000
Subject: [PATCH 1/4] Bump ppy.osu.Game from 2024.816.0 to 2024.911.0

Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2024.816.0 to 2024.911.0.
- [Release notes](https://github.com/ppy/osu/releases)
- [Commits](https://github.com/ppy/osu/compare/2024.816.0...2024.911.0)

---
updated-dependencies:
- dependency-name: ppy.osu.Game
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../osu.Game.Rulesets.Rush.csproj             | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
index c002929..0ba53eb 100644
--- a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
+++ b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
@@ -1,38 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup Label="Project">
-    <Configurations>Debug;Release;Development</Configurations>
-    <TargetFramework>net8.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
-    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
-  </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(Configuration)' == 'Release' ">
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
-        <AssemblyTitle>rush for osu!</AssemblyTitle>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
-        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
-         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
-         and we change that based on the build configuration for separation purposes.
-         Therefore prepend the AssemblyName to embedded resources names instead. -->
-    <EmbeddedResource Include="Resources\**">
-      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.816.0" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <Configurations>Debug;Release;Development</Configurations>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
+  <Choose>
+    <When Condition=" '$(Configuration)' == 'Release' ">
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
+        <AssemblyTitle>rush for osu!</AssemblyTitle>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
+        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
+         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
+         and we change that based on the build configuration for separation purposes.
+         Therefore prepend the AssemblyName to embedded resources names instead. -->
+    <EmbeddedResource Include="Resources\**">
+      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2024.911.0" />
+  </ItemGroup>
+</Project>

From 0d0728778d7cc49f56588184784355c9a5534387 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Thu, 12 Sep 2024 08:59:52 +0200
Subject: [PATCH 2/4] Update RushSkinComponent in line with bump

---
 osu.Game.Rulesets.Rush/RushSkinComponent.cs   |  2 +-
 .../osu.Game.Rulesets.Rush.csproj             | 76 +++++++++----------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Rush/RushSkinComponent.cs b/osu.Game.Rulesets.Rush/RushSkinComponent.cs
index 0948efd..d9498b9 100644
--- a/osu.Game.Rulesets.Rush/RushSkinComponent.cs
+++ b/osu.Game.Rulesets.Rush/RushSkinComponent.cs
@@ -5,7 +5,7 @@
 
 namespace osu.Game.Rulesets.Rush
 {
-    public class RushSkinComponent : GameplaySkinComponentLookup<RushSkinComponents>
+    public class RushSkinComponent : SkinComponentLookup<RushSkinComponents>
     {
         public RushSkinComponent(RushSkinComponents component)
             : base(component)
diff --git a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
index 0ba53eb..e9cda22 100644
--- a/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
+++ b/osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
@@ -1,38 +1,38 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup Label="Project">
-    <Configurations>Debug;Release;Development</Configurations>
-    <TargetFramework>net8.0</TargetFramework>
-    <OutputType>Library</OutputType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
-    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
-  </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(Configuration)' == 'Release' ">
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
-        <AssemblyTitle>rush for osu!</AssemblyTitle>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
-        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
-         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
-         and we change that based on the build configuration for separation purposes.
-         Therefore prepend the AssemblyName to embedded resources names instead. -->
-    <EmbeddedResource Include="Resources\**">
-      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.911.0" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <Configurations>Debug;Release;Development</Configurations>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Rush</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Development' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
+  <Choose>
+    <When Condition=" '$(Configuration)' == 'Release' ">
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush</AssemblyName>
+        <AssemblyTitle>rush for osu!</AssemblyTitle>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <AssemblyName>osu.Game.Rulesets.Rush-dev</AssemblyName>
+        <AssemblyTitle>rush for osu! (development build)</AssemblyTitle>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <!-- The automated version of this (<EmbeddedResource Include="xyz\**" />) would prepend the RootNamespace to name,
+         that will not work well with DllResourceStore as it can only determine the root namespace via AssemblyName,
+         and we change that based on the build configuration for separation purposes.
+         Therefore prepend the AssemblyName to embedded resources names instead. -->
+    <EmbeddedResource Include="Resources\**">
+      <LogicalName>$(AssemblyName).$([System.String]::Copy(%(Identity)).Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.'))</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2024.911.0" />
+  </ItemGroup>
+</Project>

From fa375739311e3cc74cd9347668249dc2bb8bb963 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Thu, 12 Sep 2024 09:00:52 +0200
Subject: [PATCH 3/4] Update release scripts

---
 .github/workflows/dotnet-core.yml | 2 +-
 .github/workflows/release.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 79c0d90..851d036 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -24,4 +24,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: Rush (dev build)
-        path: osu.Game.Rulesets.Rush/bin/Development/net6.0/osu.Game.Rulesets.Rush-dev.dll
+        path: osu.Game.Rulesets.Rush/bin/Development/net8.0/osu.Game.Rulesets.Rush-dev.dll
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bcaf4b8..3cda978 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,6 +38,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./osu.Game.Rulesets.Rush/bin/Release/net6.0/osu.Game.Rulesets.Rush.dll
+        asset_path: ./osu.Game.Rulesets.Rush/bin/Release/net8.0/osu.Game.Rulesets.Rush.dll
         asset_name: osu.Game.Rulesets.Rush.dll
         asset_content_type: application/vnd.microsoft.portable-executable

From 83a71779bb05c4d10543cffb96448ff40ae955c3 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Thu, 12 Sep 2024 09:03:53 +0200
Subject: [PATCH 4/4] Update artifact upload action

---
 .github/workflows/dotnet-core.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 851d036..b6c8d9a 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Test
       run: dotnet test --no-restore --verbosity normal
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Rush (dev build)
         path: osu.Game.Rulesets.Rush/bin/Development/net8.0/osu.Game.Rulesets.Rush-dev.dll