Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
431 changes: 217 additions & 214 deletions .editorconfig

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
with:
submodules: recursive

- name: Install .NET 10.0.x
uses: actions/setup-dotnet@v5
Expand Down Expand Up @@ -46,7 +48,7 @@ jobs:
echo "::error::$line"
exit_code=1
fi
done <<< $(dotnet codefilesanity)
done <<< $(dotnet codefilesanity | grep -v "^external/")
exit $exit_code

- name: InspectCode
Expand Down Expand Up @@ -77,6 +79,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
with:
submodules: recursive

- name: Install .NET 10.0.x
uses: actions/setup-dotnet@v5
Expand Down Expand Up @@ -116,6 +120,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
with:
submodules: recursive

- name: Setup JDK 11
uses: actions/setup-java@v5
Expand All @@ -141,6 +147,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
with:
submodules: recursive

- name: Install .NET 10.0.x
uses: actions/setup-dotnet@v5
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v6
with:
submodules: recursive

- name: Setup JDK 17
uses: actions/setup-java@v5
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "external/osu-framework"]
path = external/osu-framework
url = https://github.com/winnerspiros/osu-framework
9 changes: 9 additions & 0 deletions external/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>
<PropertyGroup>
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
<RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
<RunAnalyzers>false</RunAnalyzers>
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
<NoWarn>$(NoWarn);IDE0001;IDE0002;IDE0003;IDE0004;IDE0005;IDE0018;IDE0019;IDE0031;IDE0032;IDE0040;IDE0042;IDE0055;IDE0057;IDE0062;IDE0270;IDE1006;CA2265</NoWarn>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions external/osu-framework
Submodule osu-framework added at 892653
2 changes: 1 addition & 1 deletion osu.Android.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
This is safe because .NET guarantees backward compatibility for loading net8.0 assemblies
in a net10.0 runtime, and Android API changes between 34→36 are additive.
TODO: Remove this comment once ppy.osu.Framework.Android ships net10.0-android assets. -->
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.318.0" />
<ProjectReference Include="$(MSBuildThisFileDirectory)external/osu-framework/osu.Framework.Android/osu.Framework.Android.csproj" />
</ItemGroup>
<PropertyGroup>
<!-- Fody does not handle Android build well, and warns when unchanged.
Expand Down
7 changes: 5 additions & 2 deletions osu.Android.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
"osu.Game.Rulesets.Taiko\\osu.Game.Rulesets.Taiko.csproj",
"osu.Game.Tests.Android\\osu.Game.Tests.Android.csproj",
"osu.Game.Tests\\osu.Game.Tests.csproj",
"osu.Game\\osu.Game.csproj"
"osu.Game\\osu.Game.csproj",
"external/osu-framework/osu.Framework/osu.Framework.csproj",
"external/osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj",
"external/osu-framework/osu.Framework.Android/osu.Framework.Android.csproj"
]
}
}
}
6 changes: 4 additions & 2 deletions osu.Desktop.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
"Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling.Tests\\osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
"Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling\\osu.Game.Rulesets.EmptyScrolling.csproj",
"Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
"Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj"
"Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
"external/osu-framework/osu.Framework/osu.Framework.csproj",
"external/osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj"
]
}
}
}
1 change: 1 addition & 0 deletions osu.Desktop/osu.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<StartupObject>osu.Desktop.Program</StartupObject>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="$(MSBuildThisFileDirectory)../external/osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj" />
<ProjectReference Include="..\osu.Game.Tournament\osu.Game.Tournament.csproj" />
<ProjectReference Include="..\osu.Game\osu.Game.csproj" />
<ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
Expand Down
6 changes: 4 additions & 2 deletions osu.Game/osu.Game.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="Project">
<TargetFramework>net10.0</TargetFramework>
<OutputType>Library</OutputType>
Expand Down Expand Up @@ -38,7 +38,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Realm" Version="20.1.0" />
<PackageReference Include="ppy.osu.Framework" Version="2026.318.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2026.312.0" />
<PackageReference Include="Sentry" Version="6.2.0" />
<!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
Expand All @@ -47,4 +46,7 @@
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
<PackageReference Include="TagLibSharp" Version="2.3.0" />
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="$(MSBuildThisFileDirectory)../external/osu-framework/osu.Framework/osu.Framework.csproj" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion osu.iOS.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.iOS" Version="2026.318.0" />
<ProjectReference Include="$(MSBuildThisFileDirectory)external/osu-framework/osu.Framework.iOS/osu.Framework.iOS.csproj" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)external/osu-framework/osu.Framework.iOS.props" />
</Project>
7 changes: 5 additions & 2 deletions osu.iOS.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
"osu.Game.Tests.iOS\\osu.Game.Tests.iOS.csproj",
"osu.Game.Tests\\osu.Game.Tests.csproj",
"osu.Game\\osu.Game.csproj",
"osu.iOS\\osu.iOS.csproj"
"osu.iOS\\osu.iOS.csproj",
"external/osu-framework/osu.Framework/osu.Framework.csproj",
"external/osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj",
"external/osu-framework/osu.Framework.iOS/osu.Framework.iOS.csproj"
]
}
}
}
Loading
Loading