From 1652f6d19dd3be739acdc664d681556df75b41f6 Mon Sep 17 00:00:00 2001 From: Kuuuube <61125188+Kuuuube@users.noreply.github.com> Date: Sun, 1 Mar 2026 07:04:45 -0500 Subject: [PATCH 1/3] Add scripts to use local OpenTabletDriver (#6709) --- UseLocalOpenTabletDriver.ps1 | 20 ++++++++++++++++++++ UseLocalOpenTabletDriver.sh | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 UseLocalOpenTabletDriver.ps1 create mode 100755 UseLocalOpenTabletDriver.sh diff --git a/UseLocalOpenTabletDriver.ps1 b/UseLocalOpenTabletDriver.ps1 new file mode 100644 index 000000000..3f1a83b37 --- /dev/null +++ b/UseLocalOpenTabletDriver.ps1 @@ -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 diff --git a/UseLocalOpenTabletDriver.sh b/UseLocalOpenTabletDriver.sh new file mode 100755 index 000000000..2455db787 --- /dev/null +++ b/UseLocalOpenTabletDriver.sh @@ -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 From b858881afa2ac2d61ea52a4e0377a271026fdb3c Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Tue, 3 Mar 2026 14:14:07 +0900 Subject: [PATCH 2/3] Update SDL3 to 2026.302.0 (#6710) --- osu.Framework/osu.Framework.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj index bf3213f77..c801bcca7 100644 --- a/osu.Framework/osu.Framework.csproj +++ b/osu.Framework/osu.Framework.csproj @@ -38,7 +38,7 @@ - +