Merge pull request #5842 from peppy/use-local-veldrid-satellites

Fix `UseLocalVeldrid` not adding satellite assemblies to slnf files
ppy · Jun 15, 2023 · 8a8ff59 · 8a8ff59
2 parents 73ebbe3 + d7592f5
commit 8a8ff59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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