Skip to content

Commit 21ec2a7

Browse files
Copilotwinnerspiros
Copilot
and
winnerspiros
authored
Switch from ppy NuGet packages to winnerspiros/osu-framework submodule with project references
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/197e182f-5f78-4815-b2c9-02b74f8dfb71 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent 51459e3 commit 21ec2a7

9 files changed

Lines changed: 131 additions & 6 deletions

File tree

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "submodules/osu-framework"]
2+
path = submodules/osu-framework
3+
url = https://github.com/winnerspiros/osu-framework.git

‎osu.Android.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171
</ItemGroup>
7272

7373
<ItemGroup>
74-
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.416.0" />
74+
<!-- Use winnerspiros/osu-framework fork (net10.0-android, optimized) via submodule instead of ppy NuGet package -->
75+
<ProjectReference Include="$(MSBuildThisFileDirectory)submodules\osu-framework\osu.Framework.Android\osu.Framework.Android.csproj" />
7576
</ItemGroup>
7677

7778
<PropertyGroup>

‎osu.Android.slnf‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
"osu.Game.Rulesets.Taiko\\osu.Game.Rulesets.Taiko.csproj",
1414
"osu.Game.Tests.Android\\osu.Game.Tests.Android.csproj",
1515
"osu.Game.Tests\\osu.Game.Tests.csproj",
16-
"osu.Game\\osu.Game.csproj"
16+
"osu.Game\\osu.Game.csproj",
17+
"submodules\\osu-framework\\osu.Framework\\osu.Framework.csproj",
18+
"submodules\\osu-framework\\osu.Framework.Android\\osu.Framework.Android.csproj",
19+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid\\Veldrid.csproj",
20+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid.MetalBindings\\Veldrid.MetalBindings.csproj",
21+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid.OpenGLBindings\\Veldrid.OpenGLBindings.csproj"
1722
]
1823
}
1924
}

‎osu.Desktop.slnf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
"Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling.Tests\\osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
2424
"Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling\\osu.Game.Rulesets.EmptyScrolling.csproj",
2525
"Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
26-
"Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj"
26+
"Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
27+
"submodules\\osu-framework\\osu.Framework\\osu.Framework.csproj",
28+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid\\Veldrid.csproj",
29+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid.MetalBindings\\Veldrid.MetalBindings.csproj",
30+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid.OpenGLBindings\\Veldrid.OpenGLBindings.csproj"
2731
]
2832
}
2933
}

‎osu.Game/osu.Game.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
</PackageReference>
4040
<PackageReference Include="Realm" Version="20.1.0" />
41-
<PackageReference Include="ppy.osu.Framework" Version="2026.416.0" />
41+
<!-- Use winnerspiros/osu-framework fork (net10.0, optimized) via submodule instead of ppy NuGet package -->
42+
<ProjectReference Include="..\submodules\osu-framework\osu.Framework\osu.Framework.csproj" />
4243
<PackageReference Include="ppy.osu.Game.Resources" Version="2026.411.0" />
4344
<PackageReference Include="Sentry" Version="6.2.0" />
4445
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->

‎osu.iOS.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
3030
</PropertyGroup>
3131
<ItemGroup>
32-
<PackageReference Include="ppy.osu.Framework.iOS" Version="2026.416.0" />
32+
<!-- Use winnerspiros/osu-framework fork (net10.0-ios, optimized) via submodule instead of ppy NuGet package -->
33+
<ProjectReference Include="$(MSBuildThisFileDirectory)submodules\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj" />
3334
</ItemGroup>
3435
</Project>

‎osu.iOS.slnf‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
"osu.Game.Tests.iOS\\osu.Game.Tests.iOS.csproj",
1414
"osu.Game.Tests\\osu.Game.Tests.csproj",
1515
"osu.Game\\osu.Game.csproj",
16-
"osu.iOS\\osu.iOS.csproj"
16+
"osu.iOS\\osu.iOS.csproj",
17+
"submodules\\osu-framework\\osu.Framework\\osu.Framework.csproj",
18+
"submodules\\osu-framework\\osu.Framework.iOS\\osu.Framework.iOS.csproj",
19+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid\\Veldrid.csproj",
20+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid.MetalBindings\\Veldrid.MetalBindings.csproj",
21+
"submodules\\osu-framework\\submodules\\veldrid\\src\\Veldrid.OpenGLBindings\\Veldrid.OpenGLBindings.csproj"
1722
]
1823
}
1924
}

‎osu.sln‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeAnalysis", "CodeAnalysi
100100
CodeAnalysis\osu.globalconfig = CodeAnalysis\osu.globalconfig
101101
EndProjectSection
102102
EndProject
103+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "submodules", "submodules", "{B3415621-5EBA-1A55-0B57-0078FEC59DC7}"
104+
EndProject
105+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "osu-framework", "osu-framework", "{1FB18CA5-D11A-5A73-7178-BCA4E099065E}"
106+
EndProject
107+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework", "submodules\osu-framework\osu.Framework\osu.Framework.csproj", "{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}"
108+
EndProject
109+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "submodules", "submodules", "{1C948B52-6E4F-68E3-E0C4-6AE99A0AADB7}"
110+
EndProject
111+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "veldrid", "veldrid", "{130A5569-C338-E4B0-9D63-415C7AA28121}"
112+
EndProject
113+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{82BF4178-9C08-C098-7308-17833527C35A}"
114+
EndProject
115+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Veldrid", "submodules\osu-framework\submodules\veldrid\src\Veldrid\Veldrid.csproj", "{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}"
116+
EndProject
117+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Veldrid.MetalBindings", "submodules\osu-framework\submodules\veldrid\src\Veldrid.MetalBindings\Veldrid.MetalBindings.csproj", "{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}"
118+
EndProject
119+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Veldrid.OpenGLBindings", "submodules\osu-framework\submodules\veldrid\src\Veldrid.OpenGLBindings\Veldrid.OpenGLBindings.csproj", "{1E5F31A9-64B8-419E-8176-7955BE41E6BA}"
120+
EndProject
121+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.Android", "submodules\osu-framework\osu.Framework.Android\osu.Framework.Android.csproj", "{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}"
122+
EndProject
123+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.iOS", "submodules\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj", "{054AA97E-9110-4F91-95B1-1C5AF965CB9F}"
124+
EndProject
103125
Global
104126
GlobalSection(SolutionConfigurationPlatforms) = preSolution
105127
Debug|Any CPU = Debug|Any CPU
@@ -530,6 +552,78 @@ Global
530552
{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|x64.Build.0 = Release|Any CPU
531553
{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|x86.ActiveCfg = Release|Any CPU
532554
{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|x86.Build.0 = Release|Any CPU
555+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
556+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
557+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Debug|x64.ActiveCfg = Debug|Any CPU
558+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Debug|x64.Build.0 = Debug|Any CPU
559+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Debug|x86.ActiveCfg = Debug|Any CPU
560+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Debug|x86.Build.0 = Debug|Any CPU
561+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
562+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Release|Any CPU.Build.0 = Release|Any CPU
563+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Release|x64.ActiveCfg = Release|Any CPU
564+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Release|x64.Build.0 = Release|Any CPU
565+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Release|x86.ActiveCfg = Release|Any CPU
566+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D}.Release|x86.Build.0 = Release|Any CPU
567+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
568+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
569+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Debug|x64.ActiveCfg = Debug|Any CPU
570+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Debug|x64.Build.0 = Debug|Any CPU
571+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Debug|x86.ActiveCfg = Debug|Any CPU
572+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Debug|x86.Build.0 = Debug|Any CPU
573+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Release|Any CPU.ActiveCfg = Release|Any CPU
574+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Release|Any CPU.Build.0 = Release|Any CPU
575+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Release|x64.ActiveCfg = Release|Any CPU
576+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Release|x64.Build.0 = Release|Any CPU
577+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Release|x86.ActiveCfg = Release|Any CPU
578+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D}.Release|x86.Build.0 = Release|Any CPU
579+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
580+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
581+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Debug|x64.ActiveCfg = Debug|Any CPU
582+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Debug|x64.Build.0 = Debug|Any CPU
583+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Debug|x86.ActiveCfg = Debug|Any CPU
584+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Debug|x86.Build.0 = Debug|Any CPU
585+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
586+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Release|Any CPU.Build.0 = Release|Any CPU
587+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Release|x64.ActiveCfg = Release|Any CPU
588+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Release|x64.Build.0 = Release|Any CPU
589+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Release|x86.ActiveCfg = Release|Any CPU
590+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA}.Release|x86.Build.0 = Release|Any CPU
591+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
592+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
593+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Debug|x64.ActiveCfg = Debug|Any CPU
594+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Debug|x64.Build.0 = Debug|Any CPU
595+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Debug|x86.ActiveCfg = Debug|Any CPU
596+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Debug|x86.Build.0 = Debug|Any CPU
597+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
598+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Release|Any CPU.Build.0 = Release|Any CPU
599+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Release|x64.ActiveCfg = Release|Any CPU
600+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Release|x64.Build.0 = Release|Any CPU
601+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Release|x86.ActiveCfg = Release|Any CPU
602+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA}.Release|x86.Build.0 = Release|Any CPU
603+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
604+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
605+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Debug|x64.ActiveCfg = Debug|Any CPU
606+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Debug|x64.Build.0 = Debug|Any CPU
607+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Debug|x86.ActiveCfg = Debug|Any CPU
608+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Debug|x86.Build.0 = Debug|Any CPU
609+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
610+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Release|Any CPU.Build.0 = Release|Any CPU
611+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Release|x64.ActiveCfg = Release|Any CPU
612+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Release|x64.Build.0 = Release|Any CPU
613+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Release|x86.ActiveCfg = Release|Any CPU
614+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC}.Release|x86.Build.0 = Release|Any CPU
615+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
616+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
617+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Debug|x64.ActiveCfg = Debug|Any CPU
618+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Debug|x64.Build.0 = Debug|Any CPU
619+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Debug|x86.ActiveCfg = Debug|Any CPU
620+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Debug|x86.Build.0 = Debug|Any CPU
621+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
622+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Release|Any CPU.Build.0 = Release|Any CPU
623+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Release|x64.ActiveCfg = Release|Any CPU
624+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Release|x64.Build.0 = Release|Any CPU
625+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Release|x86.ActiveCfg = Release|Any CPU
626+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F}.Release|x86.Build.0 = Release|Any CPU
533627
EndGlobalSection
534628
GlobalSection(SolutionProperties) = preSolution
535629
HideSolutionNode = FALSE
@@ -548,6 +642,16 @@ Global
548642
{B9B92246-02EB-4118-9C6F-85A0D726AA70} = {5CB72FDE-BA77-47D1-A556-FEB15AAD4523}
549643
{B9022390-8184-4548-9DB1-50EB8878D20A} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
550644
{1743BF7C-E6AE-4A06-BAD9-166D62894303} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
645+
{1FB18CA5-D11A-5A73-7178-BCA4E099065E} = {B3415621-5EBA-1A55-0B57-0078FEC59DC7}
646+
{79A134D6-8F7B-414F-B65B-C1818B8EBE2D} = {1FB18CA5-D11A-5A73-7178-BCA4E099065E}
647+
{1C948B52-6E4F-68E3-E0C4-6AE99A0AADB7} = {1FB18CA5-D11A-5A73-7178-BCA4E099065E}
648+
{130A5569-C338-E4B0-9D63-415C7AA28121} = {1C948B52-6E4F-68E3-E0C4-6AE99A0AADB7}
649+
{82BF4178-9C08-C098-7308-17833527C35A} = {130A5569-C338-E4B0-9D63-415C7AA28121}
650+
{30E3ED7C-5D08-4B45-B3F0-0085470EC38D} = {82BF4178-9C08-C098-7308-17833527C35A}
651+
{CF33CF75-275C-4BC0-A20E-AA7F72E4FCCA} = {82BF4178-9C08-C098-7308-17833527C35A}
652+
{1E5F31A9-64B8-419E-8176-7955BE41E6BA} = {82BF4178-9C08-C098-7308-17833527C35A}
653+
{450DE12A-B1FF-45A3-B6E2-A48AAD556BFC} = {1FB18CA5-D11A-5A73-7178-BCA4E099065E}
654+
{054AA97E-9110-4F91-95B1-1C5AF965CB9F} = {1FB18CA5-D11A-5A73-7178-BCA4E099065E}
551655
EndGlobalSection
552656
GlobalSection(ExtensibilityGlobals) = postSolution
553657
SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}

‎submodules/osu-framework‎

Submodule osu-framework added at 13df6c9

0 commit comments

Comments
 (0)