local framework

peppy · Jan 15, 2025 · 4196b3d · 4196b3d
1 parent 6027947
commit 4196b3d
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 13 deletions.
diff --git a/osu.Android.props b/osu.Android.props
@@ -1,4 +1,7 @@
 <Project>
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\osu-framework\osu.Framework.Android\osu.Framework.Android.csproj" />
+  </ItemGroup>
   <PropertyGroup>
     <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>android-x86;android-arm;android-arm64</RuntimeIdentifiers>
@@ -9,9 +12,6 @@
     <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.114.1" />
-  </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
          Since Realm objects are not declared directly in Android projects, simply disable Fody. -->

diff --git a/osu.Android.slnf b/osu.Android.slnf
@@ -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",
+      "../osu-framework/osu.Framework/osu.Framework.csproj",
+      "../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj",
+      "../osu-framework/osu.Framework.Android/osu.Framework.Android.csproj"
     ]
   }
-}
+}
diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
@@ -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",
+      "../osu-framework/osu.Framework/osu.Framework.csproj",
+      "../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj"
     ]
   }
-}
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
@@ -35,7 +35,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="20.1.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2025.114.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2024.1224.0" />
     <PackageReference Include="Sentry" Version="5.0.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
@@ -50,4 +49,7 @@
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\osu-framework\osu.Framework\osu.Framework.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
@@ -1,4 +1,7 @@
 <Project>
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj" />
+  </ItemGroup>
   <PropertyGroup>
     <CodesignKey>iPhone Developer</CodesignKey>
     <NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
@@ -16,7 +19,5 @@
     <UseInterpreter>false</UseInterpreter>
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2025.114.1" />
-  </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)../osu-framework/osu.Framework.iOS.props"/>
 </Project>
diff --git a/osu.iOS.slnf b/osu.iOS.slnf
@@ -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",
+      "../osu-framework/osu.Framework/osu.Framework.csproj",
+      "../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj",
+      "../osu-framework/osu.Framework.iOS/osu.Framework.iOS.csproj"
     ]
   }
-}
+}
diff --git a/osu.sln b/osu.sln
@@ -100,6 +100,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeAnalysis", "CodeAnalysi
 		CodeAnalysis\osu.globalconfig = CodeAnalysis\osu.globalconfig
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework", "..\osu-framework\osu.Framework\osu.Framework.csproj", "{CCDC4210-BFBB-4768-93B4-C321B2091793}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.NativeLibs", "..\osu-framework\osu.Framework.NativeLibs\osu.Framework.NativeLibs.csproj", "{7D46F8FE-5D8F-40EE-AE25-6D6B158FE5AA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.Android", "..\osu-framework\osu.Framework.Android\osu.Framework.Android.csproj", "{6E8E9A46-637B-44BE-A299-F44D8EBBE129}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.iOS", "..\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj", "{0FE5F0C2-C900-41CB-9A96-AA04BA820337}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -254,6 +262,22 @@ Global
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCDC4210-BFBB-4768-93B4-C321B2091793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCDC4210-BFBB-4768-93B4-C321B2091793}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCDC4210-BFBB-4768-93B4-C321B2091793}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCDC4210-BFBB-4768-93B4-C321B2091793}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D46F8FE-5D8F-40EE-AE25-6D6B158FE5AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D46F8FE-5D8F-40EE-AE25-6D6B158FE5AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D46F8FE-5D8F-40EE-AE25-6D6B158FE5AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D46F8FE-5D8F-40EE-AE25-6D6B158FE5AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E8E9A46-637B-44BE-A299-F44D8EBBE129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E8E9A46-637B-44BE-A299-F44D8EBBE129}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E8E9A46-637B-44BE-A299-F44D8EBBE129}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E8E9A46-637B-44BE-A299-F44D8EBBE129}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FE5F0C2-C900-41CB-9A96-AA04BA820337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FE5F0C2-C900-41CB-9A96-AA04BA820337}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FE5F0C2-C900-41CB-9A96-AA04BA820337}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FE5F0C2-C900-41CB-9A96-AA04BA820337}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE