From cc37b8245b1c813369ba5ba25775d4b15cc4c128 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 15 Sep 2024 22:46:20 +0900
Subject: [PATCH] Merge SDL3-CS.Android into main project

---
 SDL3-CS.Android.slnf                          |   1 -
 SDL3-CS.Android/SDL3-CS.Android.csproj        |  25 ------------------
 .../SDL3-CS.Tests.Android.csproj              |   1 -
 SDL3-CS.sln                                   |   6 -----
 .../Additions/AboutAdditions.txt              |   0
 .../Jars/SDL3AndroidBridge.jar                | Bin
 SDL3-CS/SDL3-CS.csproj                        |   4 ++-
 .../Transforms/EnumFields.xml                 |   0
 .../Transforms/EnumMethods.xml                |   0
 .../Transforms/Metadata.xml                   |   0
 10 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 SDL3-CS.Android/SDL3-CS.Android.csproj
 rename {SDL3-CS.Android => SDL3-CS}/Additions/AboutAdditions.txt (100%)
 rename {SDL3-CS.Android => SDL3-CS}/Jars/SDL3AndroidBridge.jar (100%)
 rename {SDL3-CS.Android => SDL3-CS}/Transforms/EnumFields.xml (100%)
 rename {SDL3-CS.Android => SDL3-CS}/Transforms/EnumMethods.xml (100%)
 rename {SDL3-CS.Android => SDL3-CS}/Transforms/Metadata.xml (100%)

diff --git a/SDL3-CS.Android.slnf b/SDL3-CS.Android.slnf
index 061ae2f..f8eda9c 100644
--- a/SDL3-CS.Android.slnf
+++ b/SDL3-CS.Android.slnf
@@ -4,7 +4,6 @@
     "projects": [
       "SDL3-CS\\SDL3-CS.csproj",
       "SDL3-CS.SourceGeneration\\SDL3-CS.SourceGeneration.csproj",
-      "SDL3-CS.Android\\SDL3-CS.Android.csproj",
       "SDL3-CS.Tests\\SDL3-CS.Tests.csproj",
       "SDL3-CS.Tests.Android\\SDL3-CS.Tests.Android.csproj"
     ]
diff --git a/SDL3-CS.Android/SDL3-CS.Android.csproj b/SDL3-CS.Android/SDL3-CS.Android.csproj
deleted file mode 100644
index ec12aaa..0000000
--- a/SDL3-CS.Android/SDL3-CS.Android.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <RootNamespace>SDL.Android</RootNamespace>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <PropertyGroup Label="NuGet">
-    <Authors>ppy Pty Ltd</Authors>
-    <Company>ppy Pty Ltd</Company>
-    <Copyright>Copyright (c) 2024 ppy Pty Ltd</Copyright>
-    <Product>ppy.SDL3-CS.Android</Product>
-    <PackageId>ppy.SDL3-CS.Android</PackageId>
-    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/ppy/SDL3-CS</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/ppy/SDL3-CS</RepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedJar Include="Jars\SDL3AndroidBridge.jar" />
-  </ItemGroup>
-</Project>
diff --git a/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj b/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj
index e84e625..e639325 100644
--- a/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj
+++ b/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\SDL3-CS.Tests\SDL3-CS.Tests.csproj"/>
-    <ProjectReference Include="..\SDL3-CS.Android\SDL3-CS.Android.csproj"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SDL3-CS.sln b/SDL3-CS.sln
index a7f2209..2933781 100644
--- a/SDL3-CS.sln
+++ b/SDL3-CS.sln
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.SourceGeneration",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.Tests", "SDL3-CS.Tests\SDL3-CS.Tests.csproj", "{CF980481-8227-4BED-970E-6433C83F64CB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Android", "SDL3-CS.Android\SDL3-CS.Android.csproj", "{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Tests.Android", "SDL3-CS.Tests.Android\SDL3-CS.Tests.Android.csproj", "{E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Tests.iOS", "SDL3-CS.Tests.iOS\SDL3-CS.Tests.iOS.csproj", "{CCDD11EE-D552-4925-8B68-351AC9317589}"
@@ -45,10 +43,6 @@ Global
 		{CF980481-8227-4BED-970E-6433C83F64CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CF980481-8227-4BED-970E-6433C83F64CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF980481-8227-4BED-970E-6433C83F64CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/SDL3-CS.Android/Additions/AboutAdditions.txt b/SDL3-CS/Additions/AboutAdditions.txt
similarity index 100%
rename from SDL3-CS.Android/Additions/AboutAdditions.txt
rename to SDL3-CS/Additions/AboutAdditions.txt
diff --git a/SDL3-CS.Android/Jars/SDL3AndroidBridge.jar b/SDL3-CS/Jars/SDL3AndroidBridge.jar
similarity index 100%
rename from SDL3-CS.Android/Jars/SDL3AndroidBridge.jar
rename to SDL3-CS/Jars/SDL3AndroidBridge.jar
diff --git a/SDL3-CS/SDL3-CS.csproj b/SDL3-CS/SDL3-CS.csproj
index dd15bdd..b3ef941 100644
--- a/SDL3-CS/SDL3-CS.csproj
+++ b/SDL3-CS/SDL3-CS.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SDL</RootNamespace>
+    <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);SYSLIB1054;CA1401</NoWarn>
@@ -93,6 +94,7 @@
       <PackagePath>runtimes/android-x86/native</PackagePath>
       <Pack>true</Pack>
     </None>
+    <EmbeddedJar Include="Jars\SDL3AndroidBridge.jar" />
   </ItemGroup>
 
 </Project>
diff --git a/SDL3-CS.Android/Transforms/EnumFields.xml b/SDL3-CS/Transforms/EnumFields.xml
similarity index 100%
rename from SDL3-CS.Android/Transforms/EnumFields.xml
rename to SDL3-CS/Transforms/EnumFields.xml
diff --git a/SDL3-CS.Android/Transforms/EnumMethods.xml b/SDL3-CS/Transforms/EnumMethods.xml
similarity index 100%
rename from SDL3-CS.Android/Transforms/EnumMethods.xml
rename to SDL3-CS/Transforms/EnumMethods.xml
diff --git a/SDL3-CS.Android/Transforms/Metadata.xml b/SDL3-CS/Transforms/Metadata.xml
similarity index 100%
rename from SDL3-CS.Android/Transforms/Metadata.xml
rename to SDL3-CS/Transforms/Metadata.xml