From 6b4d0c131df38b1fb8bb7270498ef0059e8cc771 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 05:35:29 +0000 Subject: [PATCH 1/2] Bump ppy.osu.Game from 2024.219.0 to 2024.1115.0 Bumps [ppy.osu.Game](https://github.com/ppy/osu) from 2024.219.0 to 2024.1115.0. - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.219.0...2024.1115.0) --- updated-dependencies: - dependency-name: ppy.osu.Game dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../osu.Game.Rulesets.Hishigata.csproj | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj b/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj index daf385f..f84d530 100644 --- a/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj +++ b/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj @@ -1,15 +1,15 @@ - - - net8.0 - osu.Game.Rulesets.Hishigata - Library - AnyCPU - osu.Game.Rulesets.Hishigata - - - osu.Game.Rulesets.Hishigata - - - - - + + + net8.0 + osu.Game.Rulesets.Hishigata + Library + AnyCPU + osu.Game.Rulesets.Hishigata + + + osu.Game.Rulesets.Hishigata + + + + + From d484640841bec992bf6bc22c4604d545f8547321 Mon Sep 17 00:00:00 2001 From: Derrick Timmermans Date: Fri, 15 Nov 2024 10:07:27 +0100 Subject: [PATCH 2/2] Fix things --- .gitattributes | 2 +- .github/workflows/dotnetcore.yml | 2 +- osu.Game.Rulesets.Hishigata/Objects/HishigataBonus.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index c61ca25..1c3e930 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,7 +5,7 @@ # Check out with crlf (Windows) line endings *.sln text eol=crlf -*.csproj text eol=crlf +#*.csproj text eol=crlf *.cs text diff=csharp eol=crlf *.resx text eol=crlf *.vsixmanifest text eol=crlf diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 0210e0b..6c8e95b 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -19,7 +19,7 @@ jobs: - name: Unit Tests run: dotnet test --no-build --no-restore - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Hishigata (Dev build) path: osu.Game.Rulesets.Hishigata/bin/Debug/**/osu.Game.Rulesets.Hishigata.dll diff --git a/osu.Game.Rulesets.Hishigata/Objects/HishigataBonus.cs b/osu.Game.Rulesets.Hishigata/Objects/HishigataBonus.cs index 6dc9ca2..c378770 100644 --- a/osu.Game.Rulesets.Hishigata/Objects/HishigataBonus.cs +++ b/osu.Game.Rulesets.Hishigata/Objects/HishigataBonus.cs @@ -35,7 +35,7 @@ public BonusHitSampleInfo(int volume = 0) { } - public override HitSampleInfo With(Optional newName = default, Optional newBank = default, Optional newSuffix = default, Optional newVolume = default) + public override HitSampleInfo With(Optional newName = default, Optional newBank = default, Optional newSuffix = default, Optional newVolume = default, Optional newEditorAutoBank = default) => new BonusHitSampleInfo(newVolume.GetOr(Volume)); public bool Equals(BonusHitSampleInfo? other)