Skip to content

Commit

Permalink
Merge pull request #146 from Artemis-chan/osu-bump-
Browse files Browse the repository at this point in the history
Update to osu!
  • Loading branch information
Artemis-chan authored Feb 1, 2024
2 parents 30540ca + 251736e commit d6aa9a1
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/update-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
echo $latestVer
$regex = '(?<=\"ppy\.osu\.Game.*\"\s*Version\s*=\s*\")(.*)(?=\")'
(Get-Content osu.Game.Rulesets.Diva\osu.Game.Rulesets.Diva.csproj) -replace $regex, $latestVer | Set-Content osu.Game.Rulesets.Diva\osu.Game.Rulesets.Diva.csproj
echo "osuVersion=$latestVer" >> $GITHUB_ENV
echo "OSU_VERSION=$latestVer" >> "$GITHUB_OUTPUT"
}
- run: git --no-pager diff
Expand All @@ -35,9 +35,9 @@ jobs:
uses: peter-evans/create-pull-request@v4.2.3
with:
token: ${{ secrets.PAT }}
branch: osu-bump-${{ steps.update-csproj.outputs.version }}
commit-message: 'chore: update osu packages to ${{ steps.update-csproj.outputs.version }}'
title: 'Update to osu! ${{ env.osuVersion }}'
branch: osu-bump
commit-message: 'chore: update osu packages to ${{ steps.update-csproj.outputs.OSU_VERSION }}'
title: 'Update to osu! ${{ steps.update-csproj.outputs.OSU_VERSION }}'
base: master
body: |
#skip-changelog
Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# osu!DIVA

A try to recreate Hatsune Miku: Project DIVA as a custom mode for osu!

## Installation

1. Get the dll from:
- [Releases](https://github.com/Artemis-chan/osu-DIVA/releases)
- If that does not work,
Expand All @@ -16,13 +18,17 @@ A try to recreate Hatsune Miku: Project DIVA as a custom mode for osu!
3. Restart osu!

## Build

### Dependencies
* [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core)
* [git](https://git-scm.com/downloads) (optional, you can just download this repo manually)

- [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core)
- [git](https://git-scm.com/downloads) (optional, you can just download this repo manually)

### Steps

1. Clone the repo
`git clone https://github.com/Artemis-chan/osu-DIVA.git`
2. Get inside **osu-DIVA/osu.Game.Rulesets.Diva** folder
`cd osu-DIVA/osu.Game.Rulesets.Diva`
3. Run `dotnet publish -c Release`
4. The compiled ***osu.Game.Rulesets.Diva.dll*** can be found in **bin/Release/net5.0/publish**
4. The compiled ***osu.Game.Rulesets.Diva.dll*** can be found in **bin/Release/net6.0/publish**
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Diva.Tests/VisualTestRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static class VisualTestRunner
[STAThread]
public static int Main(string[] args)
{
using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu", new HostOptions(){ BindIPC = true }))
using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu"))
{
host.Run(new OsuTestBrowser());
return 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup Label="Package References">
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Diva/DivaRuleset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

namespace osu.Game.Rulesets.Diva
{
public class DivaRuleset : Ruleset
public partial class DivaRuleset : Ruleset
{
public override string Description => "osu!DIVA";

Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Diva/osu.Game.Rulesets.Diva.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Folder Include="Resources\Textures" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2024.114.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.114.0" />
<PackageReference Include="ppy.osu.Game" Version="2024.131.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.131.0" />
</ItemGroup>
</Project>

0 comments on commit d6aa9a1

Please sign in to comment.