Skip to content

[Mono.Android] Bind API-36.1 Beta 2 #10497

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

Merged
jonathanpeppers merged 1 commit into from
Sep 18, 2025
Merged

[Mono.Android] Bind API-36.1 Beta 2 #10497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -30,7 +30,7 @@
<AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v16.0</AndroidLatestStableFrameworkVersion>
<!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">36.1</AndroidLatestUnstableApiLevel>
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">CANARY</AndroidLatestUnstablePlatformId>
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">36.1</AndroidLatestUnstablePlatformId>
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v16.1</AndroidLatestUnstableFrameworkVersion>
<!-- The default API level used for $(TargetPlatformVersion) -->
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidDefaultTargetDotnetApiLevel>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/workflow/HowToAddNewApiLevel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Then update the following files:
[`/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs):

```csharp
new AndroidPlatform (apiName: "CANARY", apiLevel: 36, platformID: "CANARY", include: "v16.0", framework: "v16.1"),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "CANARY", include: "v16.0", framework: "v16.1", stable: false),

```

Expand All @@ -125,7 +125,7 @@ Then update the following files:
[`/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`](../../build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs):

```csharp
new AndroidPlatformComponent ("platform-36.0-CANARY_r03", apiLevel: "CANARY", pkgRevision: "3", isLatestStable: false),
new AndroidPlatformComponent ("platform-36.0-CANARY_r03", apiLevel: "CANARY", pkgRevision: "3", isLatestStable: false, isPreview: true),
```

*Note*: the first argument is *base filename* of the package to download; `xaprepare` will automatically append `.zip`.
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 @@ -25,9 +25,9 @@
<File Path="api-34.xml.in" Level="34" />
<File Path="api-35.xml.in" Level="35" />
<File Path="api-36.xml.in" Level="36" />
<File Path="api-CANARY.xml.in" Level="36.1" />
<File Path="api-36.1.xml.in" Level="36.1" />
</Inputs>
<Outputs>
<File Path="api-CANARY.xml" LastLevel="36.1" />
<File Path="api-36.1.xml" LastLevel="36.1" />
</Outputs>
</Configuration>
7 changes: 5 additions & 2 deletions build-tools/create-android-api/create-android-api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@
<_JavaSourceUtilsJar>$(MicrosoftAndroidSdkOutDir)\java-source-utils.jar</_JavaSourceUtilsJar>
<_SourceStubZip>$(AndroidSdkDirectory)\platforms\android-$(ParamApiLevel)\android-stubs-src.jar</_SourceStubZip>
<_ParamOutputTextFile>$(MSBuildThisFileDirectory)..\..\src\Mono.Android\Profiles\api-$(ParamApiLevel).params.txt</_ParamOutputTextFile>
<_ParamOutputJavadoc>$(TEMP)\api-$(ParamApiLevel).javadoc.xml</_ParamOutputJavadoc>
<_TmpDir Condition=" '$(TMPDIR)' != '' ">$(TMPDIR)</_TmpDir>
<_TmpDir Condition=" '$(_TmpDir)' == '' ">$(TEMP)</_TmpDir>
<_ParamOutputJavadoc>$(_TmpDir)\api-$(ParamApiLevel).javadoc.xml</_ParamOutputJavadoc>
</PropertyGroup>

<ItemGroup>
Expand All @@ -149,7 +151,8 @@

<Exec
Command="&quot;$(JavaPath)&quot; -jar &quot;$(_JavaSourceUtilsJar)&quot; @(_JsuArg->'&quot;%(Identity)&quot;', ' ')" />


<Delete Files="$(_ParamOutputJavadoc)" />
</Target>

<!-- Generates 'JNIEnv.g.cs' file. We do this here because it should only run once, not per-TF. -->
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 @@ -47,7 +47,7 @@ class BuildAndroidPlatforms
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: "CANARY", include: "v16.1", framework: "v16.1", stable: false),
new AndroidPlatform (apiName: "CANARY", apiLevel: new Version (36, 1), platformID: "36.1", include: "v16.1", framework: "v16.1", 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 @@ -74,7 +74,7 @@ public AndroidToolchain ()
new AndroidPlatformComponent ("platform-34-ext7_r02", apiLevel: "34", pkgRevision: "2"),
new AndroidPlatformComponent ("platform-35_r02", apiLevel: "35", pkgRevision: "2"),
new AndroidPlatformComponent ("platform-36_r02", apiLevel: "36", pkgRevision: "2", isLatestStable: true),
new AndroidPlatformComponent ("platform-36.0-CANARY_r03", apiLevel: "CANARY", pkgRevision: "3", isLatestStable: false, isPreview: true),
new AndroidPlatformComponent ("platform-36.1_r01", apiLevel: "36.1", pkgRevision: "1", isLatestStable: false, isPreview: true),

new AndroidToolchainComponent ("source-36_r01",
destDir: Path.Combine ("sources", "android-36"),
Expand Down
25 changes: 0 additions & 25 deletions src/Mono.Android/Java.Lang/Thread.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,6 @@ public Thread (Action runHandler, string threadName) : this (new RunnableImpleme
public Thread (ThreadGroup group, Action runHandler, string threadName) : this (group, new RunnableImplementor (runHandler), threadName) {}

public Thread (ThreadGroup group, Action runHandler, string threadName, long stackSize) : this (group, new RunnableImplementor (runHandler), threadName, stackSize) {}

#if ANDROID_36_1
partial interface IBuilder {
partial class IOfPlatformInvoker {
IBuilder? IBuilder.InheritInheritableThreadLocals (bool value) =>
InheritInheritableThreadLocals (value);
IBuilder? IBuilder.Name (string? name) =>
Name (name);
IBuilder? IBuilder.Name (string? name, long v) =>
Name (name, v);
IBuilder? IBuilder.UncaughtExceptionHandler (IUncaughtExceptionHandler? u) =>
UncaughtExceptionHandler (u);
}
partial class IOfVirtualInvoker {
IBuilder? IBuilder.InheritInheritableThreadLocals (bool value) =>
InheritInheritableThreadLocals (value);
IBuilder? IBuilder.Name (string? name) =>
Name (name);
IBuilder? IBuilder.Name (string? name, long v) =>
Name (name, v);
IBuilder? IBuilder.UncaughtExceptionHandler (IUncaughtExceptionHandler? u) =>
UncaughtExceptionHandler (u);
}
}
#endif // ANDROID_36_1
}
}

1 change: 0 additions & 1 deletion src/Mono.Android/Mono.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<PropertyGroup>
<IsUnstableVersion Condition=" '$(AndroidApiLevel)' &gt; '$(AndroidLatestStableApiLevel)' ">true</IsUnstableVersion>
<DefineConstants Condition=" '$(IsUnstableVersion)' == 'True' ">$(DefineConstants);ANDROID_UNSTABLE</DefineConstants>
<DefineConstants Condition=" '$(IsUnstableVersion)' == 'True' ">$(DefineConstants);ANDROID_36_1</DefineConstants>
<OutputPath>$(_MonoAndroidNETDefaultOutDir)</OutputPath>

<!-- Allow PublicApiAnalyzers to be turned off -->
Expand Down
Loading
Loading