aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-13 11:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/HEAD' into dev

Browse Source 
# Conflicts:
#	osu.Framework/osu.Framework.csproj
This commit is contained in:
LA
2026-03-03 19:23:44 +08:00
parent a15bb4424c ba04d538f0
commit 8c6a5b0690
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
UseLocalOpenTabletDriver.ps1 Normal file
View File

@@ -0,0 +1,20 @@
# Run this script to use a local copy of OpenTabletDriver rather than fetching it from nuget.
# It expects the OpenTabletDriver directory to be at the same level as the osu-framework directory
#
# https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects
$FRAMEWORK_CSPROJ="osu.Framework/osu.Framework.csproj"
$SLN="osu-framework.sln"
dotnet remove $FRAMEWORK_CSPROJ reference OpenTabletDriver;
dotnet sln $SLN add ../OpenTabletDriver/OpenTabletDriver/OpenTabletDriver.csproj;
dotnet add $FRAMEWORK_CSPROJ reference ../OpenTabletDriver/OpenTabletDriver/OpenTabletDriver.csproj;
$TMP=New-TemporaryFile
$SLNF=Get-Content "osu-framework.Desktop.slnf" | ConvertFrom-Json
$SLNF.solution.projects += ("../OpenTabletDriver/OpenTabletDriver/OpenTabletDriver.csproj")
ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8
Move-Item -Path $TMP -Destination "osu-framework.Desktop.slnf" -Force

20
UseLocalOpenTabletDriver.sh Executable file
View File

@@ -0,0 +1,20 @@
#!/bin/sh
# Run this script to use a local copy of OpenTabletDriver rather than fetching it from nuget.
# It expects the OpenTabletDriver directory to be at the same level as the osu-framework directory
#
# https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects
FRAMEWORK_CSPROJ="osu.Framework/osu.Framework.csproj"
SLN="osu-framework.sln"
dotnet remove $FRAMEWORK_CSPROJ reference OpenTabletDriver
dotnet sln $SLN add ../OpenTabletDriver/OpenTabletDriver/OpenTabletDriver.csproj
dotnet add $FRAMEWORK_CSPROJ reference ../OpenTabletDriver/OpenTabletDriver/OpenTabletDriver.csproj
tmp=$(mktemp)
jq '.solution.projects += ["../OpenTabletDriver/OpenTabletDriver/OpenTabletDriver.csproj"]' osu-framework.Desktop.slnf > $tmp
mv -f $tmp osu-framework.Desktop.slnf

2
osu.Framework/osu.Framework.csproj
View File

@@ -45,7 +45,7 @@
<PackageReference Include="ppy.osuTK.NS20" Version="1.0.211" />
<PackageReference Include="StbiSharp" Version="1.1.0" />
<PackageReference Include="ppy.SDL2-CS" Version="1.0.741-alpha" />
<PackageReference Include="ppy.SDL3-CS" Version="2025.1205.0" />
<PackageReference Include="ppy.SDL3-CS" Version="2026.302.0" />
<PackageReference Include="ppy.osu.Framework.SourceGeneration" Version="2025.1121.1" />
<!-- DO NOT use ProjectReference for native packaging project.