Merge branch 'dotnet:main' into main

Author: Redbone8686

.editorconfig

@@ -215,6 +215,7 @@ visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public
 # Code files
 [*.{cs,vb}]
 
+dotnet_diagnostic.CA2022.severity = error		# Avoid inexact read with 'System.IO.FileStream.Read(byte[], int, int)'
 dotnet_diagnostic.CA2153.severity = error		# Do Not Catch Corrupted State Exceptions
 dotnet_diagnostic.CA2301.severity = error		# Do not call BinaryFormatter.Deserialize without first setting BinaryFormatter.Binder
 dotnet_diagnostic.CA2302.severity = error		# Ensure BinaryFormatter.Binder is set before calling BinaryFormatter.Deserialize

.external

@@ -1 +1 @@
-xamarin/monodroid:main@e68da1e817cb5ce1b31195c3745cc1fe5c12a53c
+DevDiv/android-platform-support:main@52dd010acff1fa00d172609c231b7ee7b56b94a3

.gitignore

@@ -21,6 +21,7 @@ apk-sizes-*.txt
 *.binlog
 *.ProjectImports.zip
 *~
+external/android-platform-support/
 external/monodroid/
 external/mono/
 tests/api-compatibility/reference/*/*.dll

.vscode/settings.json

@@ -3,5 +3,5 @@
         "bin/Test*/**/net472/*.dll",
     ],
     "cmake.configureOnOpen": false,
-    "dotnetCoreExplorer.searchpatterns": "bin/Test{Debug,Release}/**/net6.0/{Xamarin.Android.Build.Tests,MSBuildDeviceIntegration}.dll",
+    "dotnetCoreExplorer.searchpatterns": "bin/Test{Debug}/**/net?.0/{Xamarin.Android.Build.Tests,MSBuildDeviceIntegration,Microsoft.Android.Sdk.Analysis.Tests}.dll",
 }

.vscode/tasks.json

@@ -97,6 +97,20 @@
                 "$msCompile"
             ]
         },
+        {
+            "label": "Build Microsoft.Android.Sdk.Analysis Tests",
+            "type": "shell",
+            "windows": { "command": "dotnet-local.cmd build src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj -c ${input:configuration}", },
+            "linux": { "command": "./dotnet-local.sh build src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj -c ${input:configuration}",},
+            "osx": { "command": "./dotnet-local.sh build src/Microsoft.Android.Sdk.Analysis/Tests/Microsoft.Android.Sdk.Analysis.Tests.csproj -c ${input:configuration}",},
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$msCompile"
+            ]
+        },
         {
           "label": "build-emulator-checkboottimes",
           "type": "shell",

Configuration.props

@@ -43,7 +43,6 @@
     <DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
     <Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
     <LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
-    <AndroidNetPreviousVersion Condition=" '$(AndroidNetPreviousVersion)' == '' ">34.0.113</AndroidNetPreviousVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(HostOS)' == '' ">
     <HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>
@@ -64,12 +63,13 @@
     <_MonoAndroidNETOutputRoot>$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\</_MonoAndroidNETOutputRoot>
     <_MonoAndroidNETDefaultOutDir>$(_MonoAndroidNETOutputRoot)$(AndroidApiLevel)\</_MonoAndroidNETDefaultOutDir>
     <MicrosoftAndroidRefPackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Ref.$(AndroidApiLevel)\$(AndroidPackVersion)\ref\$(DotNetTargetFramework)\</MicrosoftAndroidRefPackDir>
-    <MicrosoftAndroidArmPackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.$(AndroidApiLevel).android-arm\$(AndroidPackVersion)\runtimes\android-arm\</MicrosoftAndroidArmPackDir>
-    <MicrosoftAndroidArm64PackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.$(AndroidApiLevel).android-arm64\$(AndroidPackVersion)\runtimes\android-arm64\</MicrosoftAndroidArm64PackDir>
-    <MicrosoftAndroidx86PackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.$(AndroidApiLevel).android-x86\$(AndroidPackVersion)\runtimes\android-x86\</MicrosoftAndroidx86PackDir>
-    <MicrosoftAndroidx64PackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.$(AndroidApiLevel).android-x64\$(AndroidPackVersion)\runtimes\android-x64\</MicrosoftAndroidx64PackDir>
+    <MicrosoftAndroidArmPackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.Mono.$(AndroidApiLevel).android-arm\$(AndroidPackVersion)\runtimes\android-arm\</MicrosoftAndroidArmPackDir>
+    <MicrosoftAndroidArm64PackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.Mono.$(AndroidApiLevel).android-arm64\$(AndroidPackVersion)\runtimes\android-arm64\</MicrosoftAndroidArm64PackDir>
+    <MicrosoftAndroidx86PackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.Mono.$(AndroidApiLevel).android-x86\$(AndroidPackVersion)\runtimes\android-x86\</MicrosoftAndroidx86PackDir>
+    <MicrosoftAndroidx64PackDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.Mono.$(AndroidApiLevel).android-x64\$(AndroidPackVersion)\runtimes\android-x64\</MicrosoftAndroidx64PackDir>
     <MicrosoftAndroidSdkPackDir>$(BuildOutputDirectory)lib\packs\$(MicrosoftAndroidSdkPackName)\$(AndroidPackVersion)\</MicrosoftAndroidSdkPackDir>
     <MicrosoftAndroidSdkOutDir>$(MicrosoftAndroidSdkPackDir)\tools\</MicrosoftAndroidSdkOutDir>
+    <MicrosoftAndroidSdkAnalysisOutDir>$(BuildOutputDirectory)lib\packs\Microsoft.Android.Ref.$(AndroidApiLevel)\$(AndroidPackVersion)\analyzers\dotnet\cs\</MicrosoftAndroidSdkAnalysisOutDir>
     <MakeConcurrency Condition=" '$(MakeConcurrency)' == '' And '$(HostCpuCount)' != '' ">-j$(HostCpuCount)</MakeConcurrency>
     <ManagedRuntime Condition=" '$(ManagedRuntime)' == '' And '$(OS)' != 'Windows_NT' ">mono</ManagedRuntime>
     <ManagedRuntimeArgs Condition=" '$(ManagedRuntimeArgs)' == '' And '$(ManagedRuntime)' == 'mono' ">--debug=casts</ManagedRuntimeArgs>
@@ -81,7 +81,7 @@
     <AndroidSdkDirectory Condition=" '$(AndroidSdkDirectory)' == '' ">$(AndroidToolchainDirectory)\sdk</AndroidSdkDirectory>
     <AndroidNdkDirectory Condition=" '$(AndroidNdkDirectory)' == '' And Exists($(ANDROID_NDK_LATEST_HOME)) ">$(ANDROID_NDK_LATEST_HOME)</AndroidNdkDirectory>
     <AndroidNdkDirectory Condition=" '$(AndroidNdkDirectory)' == '' ">$(AndroidToolchainDirectory)\ndk</AndroidNdkDirectory>
-    <AndroidCmakeVersion Condition=" '$(AndroidCmakeVersion)' == '' ">3.22.1</AndroidCmakeVersion>
+    <AndroidCmakeVersion Condition=" '$(AndroidCmakeVersion)' == '' ">3.30.3</AndroidCmakeVersion>
     <AndroidCmakeUrlPrefix Condition=" '$(HostOS)' == 'Windows' And '$(AndroidCmakeUrlPrefix)' == '' "></AndroidCmakeUrlPrefix>
     <AndroidCmakeUrlPrefix Condition=" '$(HostOS)' == 'Darwin' And '$(AndroidCmakeUrlPrefix)' == '' "></AndroidCmakeUrlPrefix>
     <AndroidCmakeUrlPrefix Condition=" '$(HostOS)' == 'Linux' And '$(AndroidCmakeUrlPrefix)' == '' "></AndroidCmakeUrlPrefix>
@@ -135,8 +135,8 @@
     <TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)</TestsFlavor>
   </PropertyGroup>
   <PropertyGroup>
-    <JavacSourceVersion>1.8</JavacSourceVersion>
-    <JavacTargetVersion>1.8</JavacTargetVersion>
+    <JavacSourceVersion>17</JavacSourceVersion>
+    <JavacTargetVersion>17</JavacTargetVersion>
   </PropertyGroup>
   <PropertyGroup>
     <AndroidNdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidNdkDirectory)'))</AndroidNdkFullPath>
@@ -159,8 +159,8 @@
     <AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
     <AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
     <AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
-    <CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">11.0</CommandLineToolsFolder>
-    <CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">10406996_latest</CommandLineToolsVersion>
+    <CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">12.0</CommandLineToolsFolder>
+    <CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">11076708_latest</CommandLineToolsVersion>
     <CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
     <!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
     <EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>

Directory.Build.props

@@ -6,7 +6,7 @@
     <DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
     <DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
     <!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
-    <DotNetStableTargetFramework>net8.0</DotNetStableTargetFramework>
+    <DotNetStableTargetFramework>net9.0</DotNetStableTargetFramework>
     <TargetFrameworkNETStandard>netstandard2.0</TargetFrameworkNETStandard>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <BuildOutputDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BuildOutputDirectory>
@@ -35,10 +35,10 @@
          * Major/Minor match Android stable API level, such as 30.0 for API 30.
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
-    <AndroidPackVersion>35.0.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>rc.1</AndroidPackVersionSuffix>
+    <AndroidPackVersion>35.99.0</AndroidPackVersion>
+    <AndroidPackVersionSuffix>preview.1</AndroidPackVersionSuffix>
+    <!-- Final value set by GetXAVersionInfo target -->
     <IsStableBuild>false</IsStableBuild>
-    <IsStableBuild Condition=" '$(AndroidPackVersionSuffix)' == 'rtm' ">true</IsStableBuild>
   </PropertyGroup>
 
   <!-- Common <PackageReference/> versions -->

Documentation/docs-mobile/TOC.yml

@@ -1,6 +1,6 @@
 - name: .NET for Android
   items:
-  - name: Getting Started
+  - name: Get started
     items:
     - name: Installation
       items:
@@ -10,7 +10,7 @@
           href: getting-started/installation/net-android.md
         - name: Install dependencies
           href: getting-started/installation/dependencies.md
-  - name: Building apps
+  - name: Build apps
     items:
     - name: Build process
       href: building-apps/build-process.md
@@ -20,18 +20,50 @@
       href: building-apps/build-properties.md
     - name: Build items
       href: building-apps/build-items.md
-  - name: Features
+  - name: Fundamentals
     items:
     - name: Layout code behind
       href: features/layout-code-behind/index.md
-    - name: Maven
+  - name: Bind Java libraries
+    items:
+    - name: Overview
+      href: binding-libs/binding-java-libs/index.md
+    - name: Bind a Java library
+      href: binding-libs/binding-java-libs/binding-java-library.md
+    - name: Bind a Java library from Maven
+      href: binding-libs/binding-java-libs/binding-java-maven-library.md
+    - name: Migrate a Xamarin.Android bindings project
+      href: /dotnet/maui/migration/android-binding-projects?toc=/dotnet/android/toc.json&bc=/dotnet/breadcrumb/android/toc.json
+    - name: Customize bindings
+      items:
+      - name: Overview
+        href: binding-libs/customizing-bindings/index.md
+      - name: Customize namespaces
+        href: binding-libs/customizing-bindings/namespace-customization.md
+      - name: Java bindings metadata
+        href: binding-libs/customizing-bindings/java-bindings-metadata.md
+      - name: Create enumerations
+        href: binding-libs/customizing-bindings/creating-enums.md
+    - name: MSBuild reference
+      items:
+      - name: MSBuild bindings project properties
+        href: binding-libs/msbuild-reference/build-properties.md
+      - name: MSBuild bindings project items
+        href: binding-libs/msbuild-reference/build-items.md
+    - name: Advanced concepts
       items:
-      - name: "@(AndroidMavenLibrary) build item"
-        href: features/maven/android-maven-library.md
-      - name: Resolving Java ependencies
-        href: features/maven/resolving-java-dependencies.md
+      - name: AndroidMavenLibrary reference
+        href: binding-libs/advanced-concepts/android-maven-library.md
       - name: Java dependency verification
-        href: features/maven/java-dependency-verification.md
+        href: binding-libs/advanced-concepts/java-dependency-verification.md
+      - name: Resolve Java dependencies
+        href: binding-libs/advanced-concepts/resolving-java-dependencies.md
+      - name: Distribute bindings libraries
+        href: binding-libs/advanced-concepts/distributing.md
+      - name: Native library interop
+        href: binding-libs/advanced-concepts/native-library-interop.md
+    - name: Troubleshoot bindings
+      href: binding-libs/customizing-bindings/troubleshooting-bindings.md
   - name: Message reference
     items:
     - name: Overview
@@ -184,6 +216,10 @@
         href: messages/xa0139.md
       - name: XA0140
         href: messages/xa0140.md
+      - name: XA0141
+        href: messages/xa0141.md
+      - name: XA0142
+        href: messages/xa0142.md
     - name: "XA1xxx: Project related"
       items:
       - name: "XA1xxx: Project related"
@@ -236,6 +272,8 @@
         href: messages/xa1036.md
       - name: XA1037
         href: messages/xa1037.md
+      - name: XA1038
+        href: messages/xa1038.md
     - name: "XA2xxx: Linker"
       items:
       - name: "XA2xxx: Linker"
@@ -290,6 +328,8 @@
         href: messages/xa4247.md
       - name: XA4248
         href: messages/xa4248.md
+      - name: XA4249
+        href: messages/xa4249.md
       - name: XA4301
         href: messages/xa4301.md
       - name: XA4302
@@ -316,6 +356,8 @@
         href: messages/xa4313.md
       - name: XA4314
         href: messages/xa4314.md
+      - name: XA4315
+        href: messages/xa4315.md
     - name: "XA5xxx: GCC and toolchain"
       items:
       - name: "XA5xxx: GCC and toolchain"

…/features/maven/android-maven-library.md …vanced-concepts/android-maven-library.mdDocumentation/docs-mobile/features/maven/android-maven-library.md renamed to Documentation/docs-mobile/binding-libs/advanced-concepts/android-maven-library.md Documentation/docs-mobile/features/maven/android-maven-library.md renamed to Documentation/docs-mobile/binding-libs/advanced-concepts/android-maven-library.md

@@ -1,13 +1,13 @@
 ---
 title: AndroidMavenLibrary Build Action .NET for Android
 description: AndroidMavenLibrary Build Action .NET for Android
-ms.date: 04/11/2024
+ms.author: jopobst
+ms.date: 05/11/2024
 ---
 # AndroidMavenLibrary
 
-Note: This feature is only available in .NET 9+.
-
-## Description
+> [!NOTE]
+> This feature is only available in .NET 9+.
 
 `<AndroidMavenLibrary>` allows a Maven artifact to be specified which will automatically be downloaded and added to a .NET for Android binding project. This can be useful to simplify maintenance of .NET for Android bindings for artifacts hosted in Maven.
 
@@ -24,7 +24,7 @@ Note: This feature is only available in .NET 9+.
 
 This will do several things at build time:
 - Download the Java [artifact](https://central.sonatype.com/artifact/com.squareup.okhttp3/okhttp/4.9.3) with group id `com.squareup.okhttp3`, artifact id `okhttp`, and version `4.9.3` from [Maven Central](https://central.sonatype.com/) to a local cache (if not already cached).
-- Add the cached package to the .NET for Android bindings build as an [`<AndroidLibrary>`](../../building-apps/build-items.md#androidlibrary).
+- Add the cached package to the .NET for Android bindings build as an [`<AndroidLibrary>`](../msbuild-reference/build-items.md#androidlibrary).
 - Download the Java artifact's POM file (and any needed parent/imported POM files) to enable [Java Dependency Verification](java-dependency-verification.md). To opt out of this feature, add `VerifyDependencies="false"` to the `<AndroidMavenLibrary>` item.
 
 Note that only the requested Java artifact is added to the .NET for Android bindings build. Any artifact dependencies are not added. If the requested artifact has dependencies, they must be fulfilled individually.
@@ -53,7 +53,7 @@ Supported values are `Central` (default), `Google`, or a URL to another Maven re
 </ItemGroup>
 ```
 
-Additionally, any attributes applied to the `<AndroidMavenLibrary>` element will be copied to the `<AndroidLibrary>` it creates internally.  Thus, [attributes](https://github.com/xamarin/xamarin-android/blob/main/Documentation/guides/OneDotNetEmbeddedResources.md#msbuild-item-groups) like `Bind` and `Pack` can be used to control the binding process. (Both default to `true`.)
+Additionally, any attributes applied to the `<AndroidMavenLibrary>` element will be copied to the `<AndroidLibrary>` it creates internally.  Thus, [attributes](../msbuild-reference/build-items.md#androidlibrary) like `Bind` and `Pack` can be used to control the binding process. (Both default to `true`.)
 
 ```xml
 <ItemGroup>