Skip to content

Fix API 37 platform directory name: android-37 to android-37.0 #11072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jonathanpeppers wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix API 37 platform directory name: android-37 to android-37.0 #11072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6448c95
Fix API 37 platform directory name: android-37 → android-37.0
jonathanpeppers Apr 2, 2026
fbe0813
Bump external/xamarin-android-tools to include android-{major}.0 fall…
jonathanpeppers Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
-->
<!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">37</AndroidLatestUnstableApiLevel>
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">37</AndroidLatestUnstablePlatformId>
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">37.0</AndroidLatestUnstablePlatformId>
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v17.0</AndroidLatestUnstableFrameworkVersion>
<!-- The default API level used for $(TargetPlatformVersion) -->
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidDefaultTargetDotnetApiLevel>
Expand Down
4 changes: 2 additions & 2 deletions build-tools/api-merge/merge-configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
<File Path="api-35.xml.in" Level="35" />
<File Path="api-36.xml.in" Level="36" />
<File Path="api-36.1.xml.in" Level="36.1" />
<File Path="api-37.xml.in" Level="37" />
<File Path="api-37.0.xml.in" Level="37" />
</Inputs>
<Outputs>
<File Path="api-37.xml" LastLevel="37" />
<File Path="api-37.0.xml" LastLevel="37" />
</Outputs>
</Configuration>
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ variables:
- name: IsRelOrTargetingRel
value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
- name: DefaultTestSdkPlatforms # Comma-separated SDK Platform(s) to install on test agents (no spaces)
value: 35,36,36.1,37
value: 35,36,36.1,37.0
- name: DefaultJavaSdkMajorVersion
value: 17
- name: LatestJavaSdkMajorVersion
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class BuildAndroidPlatforms
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", include: "v17.0", framework: "v17.0", stable: false),
new AndroidPlatform (apiName: "CinnamonBun", apiLevel: new Version (37, 0), platformID: "37.0", include: "v17.0", framework: "v17.0", stable: false),
};

}
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public AndroidToolchain ()
new AndroidPlatformComponent ("platform-35_r02", apiLevel: "35", pkgRevision: "2"),
new AndroidPlatformComponent ("platform-36_r02", apiLevel: "36", pkgRevision: "2"),
new AndroidPlatformComponent ("platform-36.1_r01", apiLevel: "36.1", pkgRevision: "1", isLatestStable: true),
new AndroidPlatformComponent ("platform-37.0_r01", apiLevel: "37", pkgRevision: "1", isLatestStable: false, isPreview: true),
new AndroidPlatformComponent ("platform-37.0_r01", apiLevel: "37.0", pkgRevision: "1", isLatestStable: false, isPreview: true),

new AndroidToolchainComponent ("source-36_r01",
destDir: Path.Combine ("sources", "android-36"),
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Open in desktop
Submodule xamarin-android-tools updated 2 files
+12 −1 src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
+38 −0 tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs
0 src/Mono.Android/Profiles/api-37.params.txt → ...Mono.Android/Profiles/api-37.0.params.txt
View file
Open in desktop
File renamed without changes.
0 src/Mono.Android/Profiles/api-37.xml → src/Mono.Android/Profiles/api-37.0.xml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Mono.Android/metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2068,7 +2068,7 @@
<attr api-since="36.1" path="/api/package[contains(@merge.SourceFile,'api-CANARY.xml.in')]/interface" name="no-alternatives">true</attr>
<attr api-since="36.1" path="/api/package[contains(@merge.SourceFile,'api-36.1.xml.in')]/interface" name="no-alternatives">true</attr>
<attr api-since="37" path="/api/package[contains(@merge.SourceFile,'api-CinnamonBun.xml.in')]/interface" name="no-alternatives">true</attr>
<attr api-since="37" path="/api/package[contains(@merge.SourceFile,'api-37.xml.in')]/interface" name="no-alternatives">true</attr>
<attr api-since="37" path="/api/package[contains(@merge.SourceFile,'api-37.0.xml.in')]/interface" name="no-alternatives">true</attr>

<!-- Set ApiSince based on merge sourcefile. -->
<attr api-since="22" path="/api//*[contains(@merge.SourceFile,'api-22.xml.in')]" name="api-since">22</attr>
Expand Down Expand Up @@ -2096,7 +2096,7 @@
<attr api-since="36.1" path="/api//*[contains(@merge.SourceFile,'api-CANARY.xml.in')]" name="api-since">36.1</attr>
<attr api-since="36.1" path="/api//*[contains(@merge.SourceFile,'api-36.1.xml.in')]" name="api-since">36.1</attr>
<attr api-since="37" path="/api//*[contains(@merge.SourceFile,'api-CinnamonBun.xml.in')]" name="api-since">37</attr>
<attr api-since="37" path="/api//*[contains(@merge.SourceFile,'api-37.xml.in')]" name="api-since">37</attr>
<attr api-since="37" path="/api//*[contains(@merge.SourceFile,'api-37.0.xml.in')]" name="api-since">37</attr>

<!-- Erase some 'api-since' attributes (This has to be done after they are set above) -->

Expand Down