Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade package to the latest. #2171

Merged
merged 8 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"ppy.localisationanalyser.tools": {
"version": "2022.809.0",
"version": "2023.1117.0",
"commands": [
"localisation"
]
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup dotnet version
uses: actions/setup-dotnet@v1
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x' # SDK Version to use.
dotnet-version: "8.0.x"
- name: Fetch all tags
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- name: Get current tag
Expand All @@ -34,15 +34,15 @@ jobs:
release_name: ${{ github.ref }}
- name: Zip the dlls
run: |
cd osu.Game.Rulesets.Karaoke/bin/Release/net6.0/DLLs
cd osu.Game.Rulesets.Karaoke/bin/Release/net8.0/DLLs
zip -r ../osu.Game.Rulesets.Karaoke.zip ./*
- name: Upload Release Asset
uses: softprops/action-gh-release@v1
with:
token: ${{ secrets.RELEASE_TOKEN }}
files: |
osu.Game.Rulesets.Karaoke/bin/Release/net6.0/Packed/osu.Game.Rulesets.Karaoke.dll
osu.Game.Rulesets.Karaoke/bin/Release/net6.0/osu.Game.Rulesets.Karaoke.zip
osu.Game.Rulesets.Karaoke/bin/Release/net8.0/Packed/osu.Game.Rulesets.Karaoke.dll
osu.Game.Rulesets.Karaoke/bin/Release/net8.0/osu.Game.Rulesets.Karaoke.zip
draft: true
body: |
Thank you for showing interest in this ruleset. This is a tagged release (${{ env.CURRENT_TAG }}).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup Label="Package References">
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
Expand All @@ -27,6 +27,6 @@
<PropertyGroup Label="Project">
<OutputType>WinExe</OutputType>
<RootNamespace>osu.Game.Rulesets.Karaoke.Tests</RootNamespace>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
OnLyricEnd?.Invoke(this);

// Apply end hit result
ApplyResult(r => { r.Type = KaraokeLyricHitWindows.DEFAULT_HIT_RESULT; });
ApplyResult(KaraokeLyricHitWindows.DEFAULT_HIT_RESULT);
}
}

Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableNote.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
if (!userTriggered)
{
if (!HitObject.HitWindows.CanBeHit(timeOffset))
ApplyResult(r => r.Type = HitResult.Miss);
ApplyResult(HitResult.Miss);
return;
}

var result = HitObject.HitWindows.ResultFor(timeOffset);
if (result == HitResult.None)
return;

ApplyResult(r => r.Type = result);
ApplyResult(result);
}

public bool OnPressed(KeyBindingPressEvent<KaraokeScoringAction> e)
Expand Down
14 changes: 7 additions & 7 deletions osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="Project">
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>osu.Game.Rulesets.Karaoke</AssemblyTitle>
<OutputType>Library</OutputType>
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -11,18 +11,18 @@
<PackageReference Include="osu.Game.Rulesets.Karaoke.Resources" Version="2022.611.0" />
<PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
<PackageReference Include="LrcParser" Version="2023.524.0" />
<PackageReference Include="Octokit" Version="9.0.0" />
<PackageReference Include="osu.Framework.KaraokeFont" Version="2023.1214.0" />
<PackageReference Include="osu.Framework.Microphone" Version="2023.627.0" />
<PackageReference Include="Octokit" Version="9.1.2" />
<PackageReference Include="osu.Framework.KaraokeFont" Version="2024.219.0" />
<PackageReference Include="osu.Framework.Microphone" Version="2024.219.0" />
<PackageReference Include="ppy.LocalisationAnalyser" Version="2023.1117.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ppy.osu.Game" Version="2024.130.2" />
<PackageReference Include="ppy.osu.Game" Version="2024.219.0" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
<PackageReference Include="SixLabors.Fonts" Version="2.0.1" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.1" />
<PackageReference Include="SixLabors.Fonts" Version="2.0.2" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.1" />
<!--install because it might cause "Could not load file or assembly" error, might be removed eventually-->
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
<PackageReference Include="WanaKanaSharp" Version="0.2.0" />
Expand Down