From d7592f579d5be549944a0a39ea7777b5b0d9478d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 15 Jun 2023 19:50:55 +0900 Subject: [PATCH] Fix `UseLocalVeldrid` not adding satellite assemblies to slnf files --- UseLocalVeldrid.ps1 | 6 ++++++ UseLocalVeldrid.sh | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/UseLocalVeldrid.ps1 b/UseLocalVeldrid.ps1 index d3b33e112..f78ad8297 100644 --- a/UseLocalVeldrid.ps1 +++ b/UseLocalVeldrid.ps1 @@ -18,15 +18,21 @@ $TMP=New-TemporaryFile $SLNF=Get-Content "osu-framework.Desktop.slnf" | ConvertFrom-Json $SLNF.solution.projects += ("../veldrid/src/Veldrid/Veldrid.csproj") +$SLNF.solution.projects += ("../veldrid/src/Veldrid.OpenGLBindings/Veldrid.OpenGLBindings.csproj") +$SLNF.solution.projects += ("../veldrid/src/Veldrid.MetalBindings/Veldrid.MetalBindings.csproj") ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8 Move-Item -Path $TMP -Destination "osu-framework.Desktop.slnf" -Force $SLNF=Get-Content "osu-framework.Android.slnf" | ConvertFrom-Json $SLNF.solution.projects += ("../veldrid/src/Veldrid/Veldrid.csproj") +$SLNF.solution.projects += ("../veldrid/src/Veldrid.OpenGLBindings/Veldrid.OpenGLBindings.csproj") +$SLNF.solution.projects += ("../veldrid/src/Veldrid.MetalBindings/Veldrid.MetalBindings.csproj") ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8 Move-Item -Path $TMP -Destination "osu-framework.Android.slnf" -Force $SLNF=Get-Content "osu-framework.iOS.slnf" | ConvertFrom-Json $SLNF.solution.projects += ("../veldrid/src/Veldrid/Veldrid.csproj") +$SLNF.solution.projects += ("../veldrid/src/Veldrid.OpenGLBindings/Veldrid.OpenGLBindings.csproj") +$SLNF.solution.projects += ("../veldrid/src/Veldrid.MetalBindings/Veldrid.MetalBindings.csproj") ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8 Move-Item -Path $TMP -Destination "osu-framework.iOS.slnf" -Force diff --git a/UseLocalVeldrid.sh b/UseLocalVeldrid.sh index f02c9093b..9c82f7c48 100755 --- a/UseLocalVeldrid.sh +++ b/UseLocalVeldrid.sh @@ -18,11 +18,11 @@ dotnet add $FRAMEWORK_CSPROJ reference ../veldrid/src/Veldrid/Veldrid.csproj tmp=$(mktemp) -jq '.solution.projects += ["../veldrid/src/Veldrid/Veldrid.csproj"]' osu-framework.Desktop.slnf > $tmp +jq '.solution.projects += ["../veldrid/src/Veldrid/Veldrid.csproj", "../veldrid/src/Veldrid.MetalBindings/Veldrid.MetalBindings.csproj", "../veldrid/src/Veldrid.OpenGLBindings/Veldrid.OpenGLBindings.csproj"]' osu-framework.Desktop.slnf > $tmp mv -f $tmp osu-framework.Desktop.slnf -jq '.solution.projects += ["../veldrid/src/Veldrid/Veldrid.csproj"]' osu-framework.Android.slnf > $tmp +jq '.solution.projects += ["../veldrid/src/Veldrid/Veldrid.csproj", "../veldrid/src/Veldrid.MetalBindings/Veldrid.MetalBindings.csproj", "../veldrid/src/Veldrid.OpenGLBindings/Veldrid.OpenGLBindings.csproj"]' osu-framework.Android.slnf > $tmp mv -f $tmp osu-framework.Android.slnf -jq '.solution.projects += ["../veldrid/src/Veldrid/Veldrid.csproj"]' osu-framework.iOS.slnf > $tmp +jq '.solution.projects += ["../veldrid/src/Veldrid/Veldrid.csproj", "../veldrid/src/Veldrid.MetalBindings/Veldrid.MetalBindings.csproj", "../veldrid/src/Veldrid.OpenGLBindings/Veldrid.OpenGLBindings.csproj"]' osu-framework.iOS.slnf > $tmp mv -f $tmp osu-framework.iOS.slnf