h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 20:07:29 +08:00
Code Issues Releases Wiki Activity

Merge pull request #21711 from peppy/update-framework-standardise

Browse Source 
Update framework (again) and remove some no-longer required workarounds
This commit is contained in:
Bartłomiej Dach 2022-12-19 18:03:00 +01:00 committed by GitHub
commit b42accb763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
global.json
View File

@ -1,6 +0,0 @@
{
"sdk": {
"version": "6.0.300",
"rollForward": "major"
}
}

6
osu.Android.props
View File

@ -10,11 +10,7 @@
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.1216.1" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1219.0" />
</ItemGroup>
<ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
<PackageReference Include="Realm" Version="10.18.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<LinkDescription Include="$(MSBuildThisFileDirectory)\osu.Android\Linker.xml"/> <LinkDescription Include="$(MSBuildThisFileDirectory)\osu.Android\Linker.xml"/>

2
osu.Game/osu.Game.csproj
View File

@ -35,7 +35,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Realm" Version="10.18.0" /> <PackageReference Include="Realm" Version="10.18.0" />
<PackageReference Include="ppy.osu.Framework" Version="2022.1216.1" /> <PackageReference Include="ppy.osu.Framework" Version="2022.1219.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.1207.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1207.0" />
<PackageReference Include="Sentry" Version="3.23.1" /> <PackageReference Include="Sentry" Version="3.23.1" />
<PackageReference Include="SharpCompress" Version="0.32.2" /> <PackageReference Include="SharpCompress" Version="0.32.2" />

24
osu.iOS.props
View File

@ -15,24 +15,12 @@
<PropertyGroup Condition="'$(Platform)' == 'iPhoneSimulator'"> <PropertyGroup Condition="'$(Platform)' == 'iPhoneSimulator'">
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier> <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<!-- Workaround to make SignalR 5.x work properly, avoiding a runtime error (https://github.com/mono/mono/issues/20805#issuecomment-791440473) -->
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.4"> <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1219.0" />
<IncludeAssets>none</IncludeAssets>
</PackageReference> <!-- Required since Veldrid references a library that depends on Microsoft.DotNet.PlatformAbstractions (2.0.3), which doesn't play nice with Realm. -->
<PackageReference Include="System.Buffers" Version="4.5.1"> <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<IncludeAssets>none</IncludeAssets> <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
</PackageReference> <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1216.1" />
</ItemGroup>
<!-- OpenTabletDriver contains P/Invokes to the "Quartz" framework for native macOS code.
This leads iOS linker into attempting to include that framework, despite not existing on such platform.
See: https://github.com/OpenTabletDriver/OpenTabletDriver/issues/2524 / https://github.com/xamarin/xamarin-macios/issues/15118#issuecomment-1141893683 -->
<Target Name="OsuFrameworkIOSRemoveQuartz" BeforeTargets="_ComputeLinkNativeExecutableInputs" AfterTargets="_LoadLinkerOutput">
<ItemGroup>
<_LinkerFrameworks Remove="Quartz"/>
</ItemGroup>
</Target>
</Project> </Project>

2
osu.iOS/OsuGameIOS.cs
View File

@ -33,7 +33,7 @@ namespace osu.iOS
{ {
switch (handler) switch (handler)
{ {
case IOSMouseHandler _: case IOSMouseHandler:
return new IOSMouseSettings(); return new IOSMouseSettings();
default: default:

1
osu.sln
View File

@ -63,7 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset
osu.sln.DotSettings = osu.sln.DotSettings osu.sln.DotSettings = osu.sln.DotSettings
osu.TestProject.props = osu.TestProject.props osu.TestProject.props = osu.TestProject.props
global.json = global.json
EndProjectSection EndProjectSection
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"