From 81106952a1983a4609dcdf40a758b6acf9c190a8 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 8 Jun 2026 09:17:36 -0500
Subject: [PATCH 1/2] [build] Check in Mono.Android.Apis.projitems, remove
 generator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`Mono.Android.Apis.projitems` was previously generated at prepare time by
`GeneratedMonoAndroidProjitemsFile` (in xaprepare) from the
`BuildAndroidPlatforms.AllPlatforms` list. Both had exactly one consumer
(each other), so check in the projitems as a source file and drop the
generator plumbing.

Changes:

  * Add `src/Mono.Android/Mono.Android.Apis.projitems` — content matches
    the generator's output byte-for-byte; only the header comment now
    points at `Documentation/workflow/HowToAddNewApiLevel.md` instead of
    declaring "GENERATED FILE".
  * Repoint the 4 importers (`Mono.Android.targets` x2,
    `create-installers.targets`, `create-android-api.csproj`,
    `Xamarin.Android.Build.Tasks.targets`) at the new path and drop the
    `Condition="Exists(...)"` guards — the file is always present now.
  * Delete `GeneratedMonoAndroidProjitemsFile.cs` and `AndroidPlatform.cs`
    (whole files — `AndroidPlatform` class and `AndroidPlatformExtensions`
    both become unused).
  * Drop the `new GeneratedMonoAndroidProjitemsFile()` registration in
    `Step_GenerateFiles.cs`.
  * Remove `BuildAndroidPlatforms.AllPlatforms` and the now-unused
    `using System.Collections.Generic;`. Keep the NDK constants
    (`AndroidNdkVersion`, `AndroidNdkPkgRevision`, `NdkMinimumAPI`,
    `NdkMinimumAPILegacy32`) — they still have consumers.
  * Update `Documentation/workflow/HowToAddNewApiLevel.md` with the
    XML-based instructions for adding a new API level.
  * Narrow the `build-tools/xaprepare/README.md` blurb for
    `BuildAndroidPlatforms.cs` to NDK metadata.
  * Fix stale doc comment in `GenerateSupportedPlatforms.cs` pointing
    at the old generated path.

Continues the xaprepare cleanup started in PRs #11568 and #11580.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Documentation/workflow/HowToAddNewApiLevel.md |  23 +-
 .../GenerateSupportedPlatforms.cs             |   2 +-
 .../create-android-api.csproj                 |   2 +-
 .../installers/create-installers.targets      |   2 +-
 build-tools/xaprepare/README.md               |   5 +-
 .../xaprepare/Application/AndroidPlatform.cs  |  53 ----
 .../GeneratedMonoAndroidProjitemsFile.cs      |  59 -----
 .../ConfigAndData/BuildAndroidPlatforms.cs    |  43 ---
 .../xaprepare/Steps/Step_GenerateFiles.cs     |   4 +-
 src/Mono.Android/Mono.Android.Apis.projitems  | 244 ++++++++++++++++++
 src/Mono.Android/Mono.Android.targets         |   4 +-
 .../Xamarin.Android.Build.Tasks.targets       |   2 +-
 12 files changed, 269 insertions(+), 174 deletions(-)
 delete mode 100644 build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs
 delete mode 100644 build-tools/xaprepare/xaprepare/Application/GeneratedMonoAndroidProjitemsFile.cs
 create mode 100644 src/Mono.Android/Mono.Android.Apis.projitems

diff --git a/Documentation/workflow/HowToAddNewApiLevel.md b/Documentation/workflow/HowToAddNewApiLevel.md
index 72764ffba8f..6fa3f84c321 100644
--- a/Documentation/workflow/HowToAddNewApiLevel.md
+++ b/Documentation/workflow/HowToAddNewApiLevel.md
@@ -111,17 +111,26 @@ For the new API level, you need:
 
 Then update the following files:
 
-  - Add new `AndroidPlatform` value to
-    [`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):
-
-    ```csharp
-    new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0",   framework: "v16.1", stable: false),
+  - Add a new `<AndroidApiInfo>` entry to
+    [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems):
 
+    ```xml
+    <AndroidApiInfo Include="v16.1">
+      <Name>CANARY</Name>
+      <Level>36</Level>
+      <VersionCodeFull>36.1</VersionCodeFull>
+      <Id>36.1</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
     ```
 
-    TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
+    `Include` is the binding framework version (e.g. `v16.1`).  `Level` is the
+    integer API level (`Major` of `VersionCodeFull`).  `Id` is the platform ID
+    used to locate `android-$(Id)` directories under the Android SDK.  `Stable`
+    should be `True` for shipping platforms and `False` for unsupported preview
+    API levels.
 
-    What are `include` and `framework` used for?
+    TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?
 
   - Add new level to
     [`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):
diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateSupportedPlatforms.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateSupportedPlatforms.cs
index 80947479a24..72ec0abe662 100644
--- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateSupportedPlatforms.cs
+++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/GenerateSupportedPlatforms.cs
@@ -17,7 +17,7 @@ namespace Xamarin.Android.Tools.BootstrapTasks
 	public class GenerateSupportedPlatforms : Task
 	{
 		/// <summary>
-		/// @(AndroidApiInfo) from .\bin\Build$(Configuration)\Mono.Android.Apis.projitems
+		/// @(AndroidApiInfo) from src\Mono.Android\Mono.Android.Apis.projitems
 		/// </summary>
 		[Required]
 		public ITaskItem [] AndroidApiInfo { get; set; } = [];
diff --git a/build-tools/create-android-api/create-android-api.csproj b/build-tools/create-android-api/create-android-api.csproj
index abdc341b18d..de85695be10 100644
--- a/build-tools/create-android-api/create-android-api.csproj
+++ b/build-tools/create-android-api/create-android-api.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <Import Project="..\..\Configuration.props" />
-  <Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
+  <Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
index 44504f25ef4..79ad2b47289 100644
--- a/build-tools/installers/create-installers.targets
+++ b/build-tools/installers/create-installers.targets
@@ -3,7 +3,7 @@
   <Import Project="..\scripts\XAVersionInfo.targets" />
   <Import Project="..\scripts\LocalizationLanguages.projitems" />
   <Import Project="..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\ProfileAssemblies.projitems')" />
-  <Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')" />
+  <Import Project="..\..\src\Mono.Android\Mono.Android.Apis.projitems" />
   <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" TaskFactory="TaskHostFactory" Runtime="NET" />
   <PropertyGroup>
     <FrameworkSrcDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\</FrameworkSrcDir>
diff --git a/build-tools/xaprepare/README.md b/build-tools/xaprepare/README.md
index c34a67425bc..1e792f7ab88 100644
--- a/build-tools/xaprepare/README.md
+++ b/build-tools/xaprepare/README.md
@@ -101,9 +101,8 @@ The files mentioned above are found in the [ConfigAndData](xaprepare/ConfigAndDa
    helper methods used throughout the preparation utility code. **Be very careful** when modifying the names there as it may
    break the build!
  - [BuildAndroidPlatforms.cs](xaprepare/ConfigAndData/BuildAndroidPlatforms.cs)
-   Modified whenever a new Android platform is added, this file names all of the Android API levels along with platform/API
-   identifiers and .NET for Android framework names corresponding to specific API levels. The file also contains specification
-   of minimum NDK API levels used for all the Android device targets.
+   Contains the NDK release/revision constants and the minimum NDK API levels used for all the Android device targets.
+   The Android API level list itself lives in [`/src/Mono.Android/Mono.Android.Apis.projitems`](../../src/Mono.Android/Mono.Android.Apis.projitems).
  - [CommonLicenses.cs](xaprepare/ConfigAndData/CommonLicenses.cs)
    A file with constants containing paths to licenses commonly used by software .NET for Android uses. The licenses are used
    when generating Third Party Notices.
diff --git a/build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs b/build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs
deleted file mode 100644
index 6d395c53c16..00000000000
--- a/build-tools/xaprepare/xaprepare/Application/AndroidPlatform.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Xamarin.Android.Prepare
-{
-	class AndroidPlatform
-	{
-		public string? ApiName   { get; }
-		public Version ApiLevel  { get; }
-		public string PlatformID { get; }
-		public string Framework  { get; }
-		public bool Stable       { get; }
-		public bool Supported    { get; }
-		public string? Include   { get; }
-
-		public AndroidPlatform (uint apiLevel, string platformID, string? framework = null, bool stable = true, string? apiName = null, string? include = null)
-			: this (new Version (checked ((int) apiLevel), 0), platformID, framework, stable, apiName, include)
-		{
-
-		}
-
-		public AndroidPlatform (Version apiLevel, string platformID, string? framework = null, bool stable = true, string? apiName = null, string? include = null)
-		{
-			if (String.IsNullOrEmpty (platformID))
-				throw new ArgumentException ("must not be null or empty", nameof (platformID));
-
-			ApiName = apiName;
-			ApiLevel = apiLevel;
-			PlatformID = platformID;
-			Framework = framework ?? String.Empty;
-			Stable = stable;
-			Supported = !String.IsNullOrEmpty (framework);
-			Include = include;
-		}
-	}
-
-	static class AndroidPlatformExtensions
-	{
-		public static void Add (this List<AndroidPlatform> list, uint apiLevel, string platformID, string framework, bool stable, string? apiName = null, string? include = null)
-		{
-			Add (list, new Version (checked ((int) apiLevel), 0), platformID, framework, stable, apiName, include);
-		}
-
-		public static void Add (this List<AndroidPlatform> list, Version apiLevel, string platformID, string framework, bool stable, string? apiName = null, string? include = null)
-		{
-			if (list.Any (p => p.ApiLevel == apiLevel))
-				throw new InvalidOperationException ($"Duplicate Android platform, API level {apiLevel}");
-
-			list.Add (new AndroidPlatform (apiLevel, platformID, framework, stable, apiName, include));
-		}
-	}
-}
diff --git a/build-tools/xaprepare/xaprepare/Application/GeneratedMonoAndroidProjitemsFile.cs b/build-tools/xaprepare/xaprepare/Application/GeneratedMonoAndroidProjitemsFile.cs
deleted file mode 100644
index 31ea06a420c..00000000000
--- a/build-tools/xaprepare/xaprepare/Application/GeneratedMonoAndroidProjitemsFile.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Xamarin.Android.Prepare
-{
-	class GeneratedMonoAndroidProjitemsFile : GeneratedFile
-	{
-		const string FileTop = @"<?xml version=""1.0"" encoding=""utf-8""?>
-<!-- This is a GENERATED FILE -->
-<!-- See build-tools/xaprepare/xaprepare/Application/GeneratedMonoAndroidProjitemsFile.cs -->
-<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
-";
-
-		const string OutputFileName = "Mono.Android.Apis.projitems";
-
-		const string FileBottom = @"</Project>";
-
-		public GeneratedMonoAndroidProjitemsFile ()
-			: base (Path.Combine (Configurables.Paths.BuildBinDir, OutputFileName))
-		{}
-
-		public override void Generate (Context context)
-		{
-			using (var fs = File.Open (OutputPath, FileMode.Create)) {
-				using (var sw = new StreamWriter (fs)) {
-					GenerateFile (sw);
-				}
-			}
-		}
-
-		void GenerateFile (StreamWriter sw)
-		{
-			sw.Write (FileTop);
-
-			sw.WriteLine ("  <ItemGroup>");
-			BuildAndroidPlatforms.AllPlatforms.ForEach (androidPlatform => WriteGroupApiInfo (sw, androidPlatform));
-			sw.WriteLine ("  </ItemGroup>");
-
-			sw.Write (FileBottom);
-		}
-
-		void WriteGroupApiInfo (StreamWriter sw, AndroidPlatform androidPlatform)
-		{
-			if (string.IsNullOrWhiteSpace (androidPlatform.ApiName)) {
-				return;
-			}
-
-			sw.WriteLine ($"    <AndroidApiInfo Include=\"{androidPlatform.Include}\">");
-			sw.WriteLine ($"      <Name>{androidPlatform.ApiName}</Name>");
-			sw.WriteLine ($"      <Level>{androidPlatform.ApiLevel.Major}</Level>");
-			sw.WriteLine ($"      <VersionCodeFull>{androidPlatform.ApiLevel}</VersionCodeFull>");
-			sw.WriteLine ($"      <Id>{androidPlatform.PlatformID}</Id>");
-			sw.WriteLine ($"      <Stable>{androidPlatform.Stable}</Stable>");
-			sw.WriteLine ($"    </AndroidApiInfo>");
-		}
-	}
-}
\ No newline at end of file
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
index d2dd2054524..7ead038f419 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace Xamarin.Android.Prepare
 {
@@ -10,47 +9,5 @@ class BuildAndroidPlatforms
 
 		public static string NdkMinimumAPI => Context.Instance.Properties.GetRequiredValue (KnownProperties.AndroidMinimumDotNetApiLevel);
 		public static string NdkMinimumAPILegacy32 => NdkMinimumAPI;
-
-		public static readonly List<AndroidPlatform> AllPlatforms = new List<AndroidPlatform> {
-			new AndroidPlatform (apiName: "",                       apiLevel: 1,  platformID: "1"),
-			new AndroidPlatform (apiName: "",                       apiLevel: 2,  platformID: "2"),
-			new AndroidPlatform (apiName: "",                       apiLevel: 3,  platformID: "3"),
-			new AndroidPlatform (apiName: "Donut",                  apiLevel: 4,  platformID: "4",   include: "v1.6"),
-			new AndroidPlatform (apiName: "Eclair",                 apiLevel: 5,  platformID: "5",   include: "v2.0"),
-			new AndroidPlatform (apiName: "Eclair",                 apiLevel: 6,  platformID: "6",   include: "v2.0.1"),
-			new AndroidPlatform (apiName: "Eclair",                 apiLevel: 7,  platformID: "7",   include: "v2.1"),
-			new AndroidPlatform (apiName: "Froyo",                  apiLevel: 8,  platformID: "8",   include: "v2.2"),
-			new AndroidPlatform (apiName: "",                       apiLevel: 9,  platformID: "9"),
-			new AndroidPlatform (apiName: "Gingerbread",            apiLevel: 10, platformID: "10",  include: "v2.3"),
-			new AndroidPlatform (apiName: "Honeycomb",              apiLevel: 11, platformID: "11",  include: "v3.0"),
-			new AndroidPlatform (apiName: "Honeycomb",              apiLevel: 12, platformID: "12",  include: "v3.1"),
-			new AndroidPlatform (apiName: "Honeycomb",              apiLevel: 13, platformID: "13",  include: "v3.2"),
-			new AndroidPlatform (apiName: "Ice Cream Sandwich",     apiLevel: 14, platformID: "14",  include: "v4.0"),
-			new AndroidPlatform (apiName: "Ice Cream Sandwich",     apiLevel: 15, platformID: "15",  include: "v4.0.3"),
-			new AndroidPlatform (apiName: "Jelly Bean",             apiLevel: 16, platformID: "16",  include: "v4.1"),
-			new AndroidPlatform (apiName: "Jelly Bean",             apiLevel: 17, platformID: "17",  include: "v4.2"),
-			new AndroidPlatform (apiName: "Jelly Bean",             apiLevel: 18, platformID: "18",  include: "v4.3"),
-			new AndroidPlatform (apiName: "Kit Kat",                apiLevel: 19, platformID: "19",  include: "v4.4"),
-			new AndroidPlatform (apiName: "Kit Kat + Wear support", apiLevel: 20, platformID: "20",  include: "v4.4.87"),
-			new AndroidPlatform (apiName: "Lollipop",               apiLevel: 21, platformID: "21",  include: "v5.0"),
-			new AndroidPlatform (apiName: "Lollipop",               apiLevel: 22, platformID: "22",  include: "v5.1"),
-			new AndroidPlatform (apiName: "Marshmallow",            apiLevel: 23, platformID: "23",  include: "v6.0"),
-			new AndroidPlatform (apiName: "Nougat",                 apiLevel: 24, platformID: "24",  include: "v7.0"),
-			new AndroidPlatform (apiName: "Nougat",                 apiLevel: 25, platformID: "25",  include: "v7.1"),
-			new AndroidPlatform (apiName: "Oreo",                   apiLevel: 26, platformID: "26",  include: "v8.0"),
-			new AndroidPlatform (apiName: "Oreo",                   apiLevel: 27, platformID: "27",  include: "v8.1"),
-			new AndroidPlatform (apiName: "Pie",                    apiLevel: 28, platformID: "28",  include: "v9.0"),
-			new AndroidPlatform (apiName: "Q",                      apiLevel: 29, platformID: "29",  include: "v10.0"),
-			new AndroidPlatform (apiName: "R",                      apiLevel: 30, platformID: "30",  include: "v11.0"),
-			new AndroidPlatform (apiName: "S",                      apiLevel: 31, platformID: "31",  include: "v12.0"),
-			new AndroidPlatform (apiName: "Sv2",                    apiLevel: 32, platformID: "32",  include: "v12.1"),
-			new AndroidPlatform (apiName: "Tiramisu",               apiLevel: 33, platformID: "33",  include: "v13.0",   framework: "v13.0"),
-			new AndroidPlatform (apiName: "UpsideDownCake",         apiLevel: 34, platformID: "34",  include: "v14.0",   framework: "v14.0"),
-			new AndroidPlatform (apiName: "VanillaIceCream",        apiLevel: 35, platformID: "35",  include: "v15.0",   framework: "v15.0"),
-			new AndroidPlatform (apiName: "Baklava",                apiLevel: 36, platformID: "36",  include: "v16.0",   framework: "v16.0"),
-			new AndroidPlatform (apiName: "CANARY",                 apiLevel: new Version (36, 1),   platformID: "36.1", include: "v16.1",   framework: "v16.1", stable: true),
-			new AndroidPlatform (apiName: "CinnamonBun",            apiLevel: new Version (37, 0),   platformID: "37.0", include: "v17.0",   framework: "v17.0", stable: true),
-		};
-
 	}
 }
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
index 255c181ee75..d3671362bc3 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
@@ -76,9 +76,7 @@ protected override async Task<bool> Execute (Context context)
 			if (onlyRequired)
 				return null;
 
-			var steps = new List <GeneratedFile> {
-				new GeneratedMonoAndroidProjitemsFile (),
-			};
+			var steps = new List <GeneratedFile> ();
 
 			AddOSSpecificSteps (context, steps);
 
diff --git a/src/Mono.Android/Mono.Android.Apis.projitems b/src/Mono.Android/Mono.Android.Apis.projitems
new file mode 100644
index 00000000000..140c84d053d
--- /dev/null
+++ b/src/Mono.Android/Mono.Android.Apis.projitems
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See Documentation/workflow/HowToAddNewApiLevel.md for instructions on adding new API levels. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <AndroidApiInfo Include="v1.6">
+      <Name>Donut</Name>
+      <Level>4</Level>
+      <VersionCodeFull>4.0</VersionCodeFull>
+      <Id>4</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v2.0">
+      <Name>Eclair</Name>
+      <Level>5</Level>
+      <VersionCodeFull>5.0</VersionCodeFull>
+      <Id>5</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v2.0.1">
+      <Name>Eclair</Name>
+      <Level>6</Level>
+      <VersionCodeFull>6.0</VersionCodeFull>
+      <Id>6</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v2.1">
+      <Name>Eclair</Name>
+      <Level>7</Level>
+      <VersionCodeFull>7.0</VersionCodeFull>
+      <Id>7</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v2.2">
+      <Name>Froyo</Name>
+      <Level>8</Level>
+      <VersionCodeFull>8.0</VersionCodeFull>
+      <Id>8</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v2.3">
+      <Name>Gingerbread</Name>
+      <Level>10</Level>
+      <VersionCodeFull>10.0</VersionCodeFull>
+      <Id>10</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v3.0">
+      <Name>Honeycomb</Name>
+      <Level>11</Level>
+      <VersionCodeFull>11.0</VersionCodeFull>
+      <Id>11</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v3.1">
+      <Name>Honeycomb</Name>
+      <Level>12</Level>
+      <VersionCodeFull>12.0</VersionCodeFull>
+      <Id>12</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v3.2">
+      <Name>Honeycomb</Name>
+      <Level>13</Level>
+      <VersionCodeFull>13.0</VersionCodeFull>
+      <Id>13</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v4.0">
+      <Name>Ice Cream Sandwich</Name>
+      <Level>14</Level>
+      <VersionCodeFull>14.0</VersionCodeFull>
+      <Id>14</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v4.0.3">
+      <Name>Ice Cream Sandwich</Name>
+      <Level>15</Level>
+      <VersionCodeFull>15.0</VersionCodeFull>
+      <Id>15</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v4.1">
+      <Name>Jelly Bean</Name>
+      <Level>16</Level>
+      <VersionCodeFull>16.0</VersionCodeFull>
+      <Id>16</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v4.2">
+      <Name>Jelly Bean</Name>
+      <Level>17</Level>
+      <VersionCodeFull>17.0</VersionCodeFull>
+      <Id>17</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v4.3">
+      <Name>Jelly Bean</Name>
+      <Level>18</Level>
+      <VersionCodeFull>18.0</VersionCodeFull>
+      <Id>18</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v4.4">
+      <Name>Kit Kat</Name>
+      <Level>19</Level>
+      <VersionCodeFull>19.0</VersionCodeFull>
+      <Id>19</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v4.4.87">
+      <Name>Kit Kat + Wear support</Name>
+      <Level>20</Level>
+      <VersionCodeFull>20.0</VersionCodeFull>
+      <Id>20</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v5.0">
+      <Name>Lollipop</Name>
+      <Level>21</Level>
+      <VersionCodeFull>21.0</VersionCodeFull>
+      <Id>21</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v5.1">
+      <Name>Lollipop</Name>
+      <Level>22</Level>
+      <VersionCodeFull>22.0</VersionCodeFull>
+      <Id>22</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v6.0">
+      <Name>Marshmallow</Name>
+      <Level>23</Level>
+      <VersionCodeFull>23.0</VersionCodeFull>
+      <Id>23</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v7.0">
+      <Name>Nougat</Name>
+      <Level>24</Level>
+      <VersionCodeFull>24.0</VersionCodeFull>
+      <Id>24</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v7.1">
+      <Name>Nougat</Name>
+      <Level>25</Level>
+      <VersionCodeFull>25.0</VersionCodeFull>
+      <Id>25</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v8.0">
+      <Name>Oreo</Name>
+      <Level>26</Level>
+      <VersionCodeFull>26.0</VersionCodeFull>
+      <Id>26</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v8.1">
+      <Name>Oreo</Name>
+      <Level>27</Level>
+      <VersionCodeFull>27.0</VersionCodeFull>
+      <Id>27</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v9.0">
+      <Name>Pie</Name>
+      <Level>28</Level>
+      <VersionCodeFull>28.0</VersionCodeFull>
+      <Id>28</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v10.0">
+      <Name>Q</Name>
+      <Level>29</Level>
+      <VersionCodeFull>29.0</VersionCodeFull>
+      <Id>29</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v11.0">
+      <Name>R</Name>
+      <Level>30</Level>
+      <VersionCodeFull>30.0</VersionCodeFull>
+      <Id>30</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v12.0">
+      <Name>S</Name>
+      <Level>31</Level>
+      <VersionCodeFull>31.0</VersionCodeFull>
+      <Id>31</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v12.1">
+      <Name>Sv2</Name>
+      <Level>32</Level>
+      <VersionCodeFull>32.0</VersionCodeFull>
+      <Id>32</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v13.0">
+      <Name>Tiramisu</Name>
+      <Level>33</Level>
+      <VersionCodeFull>33.0</VersionCodeFull>
+      <Id>33</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v14.0">
+      <Name>UpsideDownCake</Name>
+      <Level>34</Level>
+      <VersionCodeFull>34.0</VersionCodeFull>
+      <Id>34</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v15.0">
+      <Name>VanillaIceCream</Name>
+      <Level>35</Level>
+      <VersionCodeFull>35.0</VersionCodeFull>
+      <Id>35</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v16.0">
+      <Name>Baklava</Name>
+      <Level>36</Level>
+      <VersionCodeFull>36.0</VersionCodeFull>
+      <Id>36</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v16.1">
+      <Name>CANARY</Name>
+      <Level>36</Level>
+      <VersionCodeFull>36.1</VersionCodeFull>
+      <Id>36.1</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+    <AndroidApiInfo Include="v17.0">
+      <Name>CinnamonBun</Name>
+      <Level>37</Level>
+      <VersionCodeFull>37.0</VersionCodeFull>
+      <Id>37.0</Id>
+      <Stable>True</Stable>
+    </AndroidApiInfo>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index 6f2fab65325..5839eb08327 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -4,7 +4,7 @@
   <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.Git" TaskFactory="TaskHostFactory" Runtime="NET" />
   <UsingTask AssemblyFile="$(BootstrapTasksAssembly)" TaskName="Xamarin.Android.Tools.BootstrapTasks.CheckApiCompatibility" TaskFactory="TaskHostFactory" Runtime="NET" />
   <Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" />
-  <Import Project="..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems" Condition="Exists('..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems')"/>
+  <Import Project="Mono.Android.Apis.projitems" />
   <ItemGroup>
     <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" />
   </ItemGroup>
@@ -169,7 +169,7 @@
   <!-- Generates 'AndroidApiInfo.xml' file -->
   <Target Name="_GenerateAndroidApiInfo"
       BeforeTargets="GetTargetFrameworkProperties;GetReferenceAssemblyPaths;ResolveReferences"
-      Inputs="$(MSBuildProjectFullPath);..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems"
+      Inputs="$(MSBuildProjectFullPath);Mono.Android.Apis.projitems"
       Outputs="$(OutputPath)AndroidApiInfo.xml">
    <MakeDir Directories="$(OutputPath)" />
    <ItemGroup>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
index 2b15917423a..b2547a30810 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
@@ -163,7 +163,7 @@
     </ReplaceFileContents>
   </Target>
   <Target Name="_GenerateSupportedPlatforms"
-      Inputs="$(BootstrapTasksAssembly);$(MSBuildThisFile);..\..\bin\Build$(Configuration)\Mono.Android.Apis.projitems"
+      Inputs="$(BootstrapTasksAssembly);$(MSBuildThisFile);..\..\src\Mono.Android\Mono.Android.Apis.projitems"
       Outputs="Microsoft.Android.Sdk\targets\Microsoft.Android.Sdk.SupportedPlatforms.targets">
     <GenerateSupportedPlatforms
         AndroidApiInfo="@(AndroidApiInfo)"

From e4ce72d287ce5b801ed8ea0bf31a8c4c8b6523fa Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 8 Jun 2026 09:28:41 -0500
Subject: [PATCH 2/2] [docs] Fix Stable=True/False contradiction in
 HowToAddNewApiLevel

The added prose said Stable should be False for preview API levels, but the
example (CANARY) sets <Stable>True</Stable>, and every entry in
Mono.Android.Apis.projitems is True. Rewrite the prose to match the data and
briefly explain what setting Stable=False would actually do (excludes entry
from default stable framework selection).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 Documentation/workflow/HowToAddNewApiLevel.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/workflow/HowToAddNewApiLevel.md b/Documentation/workflow/HowToAddNewApiLevel.md
index 6fa3f84c321..679120aed2c 100644
--- a/Documentation/workflow/HowToAddNewApiLevel.md
+++ b/Documentation/workflow/HowToAddNewApiLevel.md
@@ -127,8 +127,10 @@ Then update the following files:
     `Include` is the binding framework version (e.g. `v16.1`).  `Level` is the
     integer API level (`Major` of `VersionCodeFull`).  `Id` is the platform ID
     used to locate `android-$(Id)` directories under the Android SDK.  `Stable`
-    should be `True` for shipping platforms and `False` for unsupported preview
-    API levels.
+    should be `True`; every entry currently in the projitems uses `True`,
+    including preview codenames like CANARY.  (Setting it to `False` would
+    exclude the entry from being picked as the default stable framework
+    version by some build-time selection logic.)
 
     TODO: what should be done for the "mid-year" updates, as is the case for API-CANARY?