From 8defe6fe76ec4b93c92c037c08f832c223f9ffa5 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 11 May 2020 20:55:14 +0800
Subject: [PATCH 1/2] Remove osu.game using and add osu.android.props file

---
 osu.Android.props                             | 57 +++++++++++++++++++
 osu.Android/osu.Android.csproj                |  4 --
 ...Game.Rulesets.Karaoke.Tests.Android.csproj |  4 --
 3 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 osu.Android.props

diff --git a/osu.Android.props b/osu.Android.props
new file mode 100644
index 0000000..a406cdf
--- /dev/null
+++ b/osu.Android.props
@@ -0,0 +1,57 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>8.0</LangVersion>
+    <OutputPath>bin\$(Configuration)</OutputPath>
+    <WarningLevel>4</WarningLevel>
+    <SchemaVersion>2.0</SchemaVersion>
+    <BundleAssemblies>false</BundleAssemblies>
+    <AotAssemblies>false</AotAssemblies>
+    <OutputType>Library</OutputType>
+    <FileAlignment>512</FileAlignment>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
+    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
+    <MandroidI18n>cjk,mideast,other,rare,west</MandroidI18n>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>False</Optimize>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AndroidManagedSymbols>false</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
+    <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <AndroidManagedSymbols>false</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="Java.Interop" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.508.1" />
+  </ItemGroup>
+</Project>
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 247b7ff..ad39a36 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -32,10 +32,6 @@
       <Project>{48f4582b-7687-4621-9cbe-5c24197cb536}</Project>
       <Name>osu.Game.Rulesets.Karaoke</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
-      <Project>{2a66dd92-adb1-4994-89e2-c94e04acda0d}</Project>
-      <Name>osu.Game</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\lazer.png" />
diff --git a/osu.Game.Rulesets.Karaoke.Tests.Android/osu.Game.Rulesets.Karaoke.Tests.Android.csproj b/osu.Game.Rulesets.Karaoke.Tests.Android/osu.Game.Rulesets.Karaoke.Tests.Android.csproj
index b1e07a6..f8189df 100644
--- a/osu.Game.Rulesets.Karaoke.Tests.Android/osu.Game.Rulesets.Karaoke.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Karaoke.Tests.Android/osu.Game.Rulesets.Karaoke.Tests.Android.csproj
@@ -30,10 +30,6 @@
       <Project>{48f4582b-7687-4621-9cbe-5c24197cb536}</Project>
       <Name>osu.Game.Rulesets.Karaoke</Name>
     </ProjectReference>
-    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
-      <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
-      <Name>osu.Game</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file

From e92b27dcd539be3cca6fb6c21e8fc7d6647768bd Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 11 May 2020 20:55:54 +0800
Subject: [PATCH 2/2] downgrade android package and remove duplicated using.

---
 osu.Android.props | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index a406cdf..83d3f5b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,6 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.427.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.508.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.408.1" />
   </ItemGroup>
 </Project>