Merge branch 'main' into dev/grendel/bundle-and-blobs

* main: (22 commits)
  Bump to dotnet/android-tools@1c09dcc (#9026)
  Bump to dotnet/java-interop@ccafbe6 (#9025)
  [Mono.Android-Tests] Fix repo URL in redirect tests (#9035)
  [ci] Update checkout path for nightly build (#9028)
  [ci] Fix android source path for MAUI test job (#9030)
  Link Code of Conduct (#9034)
  [ci] Update sdk-insertions trigger to manual only (#9029)
  Update java-interop and android-tools submodule mentions (#9023)
  LEGO: Merge pull request 9022
  [Xamarin.Android.Build.Tasks] fastdev works with aab files (#8990)
  Use new binutils URL (#9019)
  Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 9686669 (#9011)
  LEGO: Merge pull request 9015
  [api-merge] Update "constant" values to mirror latest API levels (#9004)
  [Mono.Android] Fix wrong value for `ApplicationExitInfoReason.Other` (#9003)
  [Mono.Android] Fix omitted Gl* constants. (#9009)
  [manifest-attribute-codegen] Generate custom attribute declarations (#8781)
  [tests] Reduce default build output verbosity (#9002)
  [templates] Update Wear OS en template string (#9005)
  [build] Do not provision JDK 8 (#8999)
  ...

Author: grendello

.external

@@ -1 +1 @@
-xamarin/monodroid:main@93ab95e18077d56d9d55ce7b4069a534e2dea35e
+xamarin/monodroid:main@c6aae9e5a154cfbf2c3a94e046fa2c747c3b82e2

.github/ISSUE_TEMPLATE/01-building-an-application.yml

@@ -10,20 +10,21 @@ body:
   - type: dropdown
     id: android-type
     attributes:
-      label: Android application type
-      description: In what type(s) of Android application(s) do you see this issue?
+      label: Android framework version
+      description: In what target framework(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
-      - .NET Android (net7.0-android, net8.0-android, etc.)
+      - net8.0-android
+      - net9.0-android
+      - Other
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
+      placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -54,7 +55,7 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any (short!) relevant log output.  Longer logs can be attached as .txt files.  This is likely a [diagnostic MSBuild log](https://docs.microsoft.com/en-us/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or attach a [MSBuild binlog](https://docs.microsoft.com/en-us/visualstudio/msbuild/obtaining-build-logs-with-msbuild?view=vs-2022#save-a-binary-log).
+      description: Please copy and paste any (short!) relevant log output.  Longer logs can be attached as .txt files.  This is likely a [diagnostic MSBuild log](https://learn.microsoft.com/previous-versions/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or attach a [MSBuild binlog](https://aka.ms/binlog).
       render: shell
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/02-running-an-application.yml

@@ -10,20 +10,21 @@ body:
   - type: dropdown
     id: android-type
     attributes:
-      label: Android application type
-      description: In what type(s) of Android application(s) do you see this issue?
+      label: Android framework version
+      description: In what target framework(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
-      - .NET Android (net7.0-android, net8.0-android, etc.)
+      - net8.0-android
+      - net9.0-android
+      - Other
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
+      placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/03-mono-android-api.yml

@@ -8,27 +8,28 @@ body:
       value: |
         Issues with missing Android API or the API not working as documented are tracked here.
 
-        If you are not sure how to use an API or how to accomplish your task, better support is available from our community of application writers, available in several forms:
+        If you are not sure how to use an API or how to accomplish your task, better support is available from the community of application writers, available in several forms:
 
-        [Microsoft Q&A](https://docs.microsoft.com/en-us/answers/topics/dotnet-android.html)
+        [Microsoft Q&A](https://learn.microsoft.com/answers/products/97/dotnet/)
         [Stack Overflow](https://stackoverflow.com)
   - type: dropdown
     id: android-type
     attributes:
-      label: Android application type
-      description: In what type(s) of Android application(s) do you see this issue?
+      label: Android framework version
+      description: In what target framework(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
-      - .NET Android (net7.0-android, net8.0-android, etc.)
+      - net8.0-android
+      - net9.0-android
+      - Other
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
+      placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml

@@ -6,26 +6,27 @@ body:
   - type: markdown
     attributes:
       value: |
-        Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/xamarin/java.interop/wiki/Troubleshooting-Android-Bindings-Issues).
+        Documentation for how to troubleshoot issues with binding projects, as well as common issues and how to solve them, is available [here](https://github.com/dotnet/java-interop/wiki/Troubleshooting-Android-Bindings-Issues).
 
         If you get stuck troubleshooting an issue, please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker.
   - type: dropdown
     id: android-type
     attributes:
-      label: Android application type
-      description: In what type(s) of Android application(s) do you see this issue?
+      label: Android framework version
+      description: In what target framework(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
-      - .NET Android (net7.0-android, net8.0-android, etc.)
+      - net8.0-android
+      - net9.0-android
+      - Other
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
+      placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -56,7 +57,7 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any (short!) relevant log output.  Longer logs can be attached as .txt files. This is likely a [diagnostic MSBuild log](https://docs.microsoft.com/en-us/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output).  Please capture a log where you "Rebuild" the project, as some diagnostic info is only available on clean builds.
+      description: Please copy and paste any (short!) relevant log output.  Longer logs can be attached as .txt files. This is likely a [diagnostic MSBuild log](https://learn.microsoft.com/previous-versions/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output).  Please capture a log where you "Rebuild" the project, as some diagnostic info is only available on clean builds.
       render: shell
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/05-other.yml

@@ -10,20 +10,21 @@ body:
   - type: dropdown
     id: android-type
     attributes:
-      label: Android application type
-      description: In what type(s) of Android application(s) do you see this issue?
+      label: Android framework version
+      description: In what target framework(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - Classic Xamarin.Android (MonoAndroid13.0, etc.)
-      - .NET Android (net7.0-android, net8.0-android, etc.)
+      - net8.0-android
+      - net9.0-android
+      - Other
     validations:
       required: true
   - type: input
     id: platform-versions
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.8.0, VSMac 17.6.7, .NET 8.0.100, etc.
+      placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
     validations:
       required: true
   - type: textarea
@@ -54,7 +55,7 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any (short!) relevant log output.  Longer logs can be attached as .txt files.  This could be a [diagnostic MSBuild log](https://docs.microsoft.com/en-us/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or a [MSBuild binlog](https://docs.microsoft.com/en-us/visualstudio/msbuild/obtaining-build-logs-with-msbuild?view=vs-2022#save-a-binary-log).
+      description: Please copy and paste any (short!) relevant log output.  Longer logs can be attached as .txt files.  This could be a [diagnostic MSBuild log](https://learn.microsoft.com/previous-versions/xamarin/android/troubleshooting/troubleshooting#diagnostic-msbuild-output) or a [MSBuild binlog](https://aka.ms/binlog).
       render: shell
   - type: markdown
     attributes:

.github/workflows/sdk-insertion-bump.yml

@@ -1,11 +1,12 @@
 name: Notify release branch change
 
 on:
+  workflow_dispatch:
   # trigger for main and release branches.
-  push:
-    branches:
-      - main
-      - 'release/**'
+  #push:
+  #  branches:
+  #    - main
+  #    - 'release/**'
 
 jobs:
   pingRemote:
@@ -30,6 +31,6 @@ jobs:
           token: ${{ secrets.SERVICEACCOUNT_PAT }}
           event-type: 'sdk_insertion' 
           repository: 'xamarin/sdk-insertions'
-          client-payload: '{"repository": "xamarin/xamarin-android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": ${{ steps.commit_title.outputs.COMMIT_TITLE }} }'
+          client-payload: '{"repository": "dotnet/android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": ${{ steps.commit_title.outputs.COMMIT_TITLE }} }'
 
 

.gitmodules

@@ -12,7 +12,7 @@
     branch = main
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
-    url = https://github.com/xamarin/java.interop.git
+    url = https://github.com/dotnet/java-interop
     branch = main
 [submodule "external/libunwind"]
     path = external/libunwind
@@ -28,7 +28,7 @@
     branch = master
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
-    url = https://github.com/xamarin/xamarin-android-tools
+    url = https://github.com/dotnet/android-tools
     branch = main
 [submodule "external/xxHash"]
     path = external/xxHash

CODE-OF-CONDUCT.md

@@ -0,0 +1,6 @@
+# Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant
+to clarify expected behavior in our community.
+
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

Configuration.props

@@ -137,9 +137,6 @@
   <PropertyGroup>
     <JavacSourceVersion>1.8</JavacSourceVersion>
     <JavacTargetVersion>1.8</JavacTargetVersion>
-    <Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' and Exists($(JAVA_HOME_8_X64)) ">$(JAVA_HOME_8_X64)</Java8SdkDirectory>
-    <Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' and Exists('$(JavaSdkDirectory)\..\jdk-1.8') ">$([System.IO.Path]::GetFullPath ('$(JavaSdkDirectory)\..\jdk-1.8'))</Java8SdkDirectory>
-    <Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' ">$(JavaSdkDirectory)</Java8SdkDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <AndroidNdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidNdkDirectory)'))</AndroidNdkFullPath>

Documentation/release-notes/5945.md

@@ -1,6 +1,6 @@
 #### Bindings projects
 
-- [GitHub Issue #835](https://github.com/xamarin/java.interop/issues/835):
+- [GitHub Issue #835](https://github.com/dotnet/java-interop/issues/835):
   Don't throw an `IndexOutOfRangeException` if a Java type ends with `.` or `$`.
 
 - [GitHub Issue #5821](https://github.com/xamarin/xamarin-android/issues/5921)

Documentation/release-notes/README.md

@@ -37,7 +37,7 @@ items.
 Changes for One .NET should have neither label for now because they are not yet
 user-facing.
 
-PRs that bump Java.Interop, xamarin-android-tools, or monodroid generally don't
+PRs that bump Java.Interop, android-tools, or monodroid generally don't
 need to be labeled, but Mono bumps that include changes that could affect
 Android users should be labeled.
 
@@ -123,7 +123,7 @@ Examples:
 ```markdown
 ### Build and deployment performance
 
-- [Java.Interop GitHub PR 596](https://github.com/xamarin/java.interop/pull/596):
+- [Java.Interop GitHub PR 596](https://github.com/dotnet/java-interop/pull/596):
   Use `File.Exists()` instead of `DirectoryGetFile()` in a few places.  This
   reduced the time for the `LinkAssembliesNoShrink` task from about 710
   milliseconds to about 430 milliseconds for a small test Xamarin.Forms app on
@@ -191,19 +191,19 @@ Example showing multiple release notes sections for a Java.Interop bump:
 ```markdown
 ### Build and deployment performance
 
-- [Java.Interop GitHub PR 440](https://github.com/xamarin/java.interop/pull/440),
-  [Java.Interop GitHub PR 441](https://github.com/xamarin/java.interop/pull/441),
-  [Java.Interop GitHub PR 442](https://github.com/xamarin/java.interop/pull/442),
-  [Java.Interop GitHub PR 448](https://github.com/xamarin/java.interop/pull/448),
-  [Java.Interop GitHub PR 449](https://github.com/xamarin/java.interop/pull/449),
-  [Java.Interop GitHub PR 452](https://github.com/xamarin/java.interop/pull/452):
+- [Java.Interop GitHub PR 440](https://github.com/dotnet/java-interop/pull/440),
+  [Java.Interop GitHub PR 441](https://github.com/dotnet/java-interop/pull/441),
+  [Java.Interop GitHub PR 442](https://github.com/dotnet/java-interop/pull/442),
+  [Java.Interop GitHub PR 448](https://github.com/dotnet/java-interop/pull/448),
+  [Java.Interop GitHub PR 449](https://github.com/dotnet/java-interop/pull/449),
+  [Java.Interop GitHub PR 452](https://github.com/dotnet/java-interop/pull/452):
   Optimize several of the build steps for bindings projects.  For a large
   binding like _Mono.Android.dll_ itself, this reduced the total build time in a
   test environment by about 50 seconds.
 
 #### Bindings projects
 
-- [Java.Interop GitHub PR 458](https://github.com/xamarin/java.interop/pull/458):
+- [Java.Interop GitHub PR 458](https://github.com/dotnet/java-interop/pull/458):
   Bindings projects did not yet automatically generate event handlers for Java
   listener interfaces where the _add_ or _set_ method of the interface took two
   arguments instead of just one.
@@ -381,8 +381,7 @@ added to `Documentation/release-notes/images/`.
 
    (For versions before 11.2, the milestone had a slightly different format.)
 
-   Complete this step for xamarin-android, Java.Interop, and
-   xamarin-android-tools.
+   Complete this step for xamarin-android, Java.Interop, and android-tools.
 
    See also the [_How to make bulk changes on pull requests and issues_][bulk-change]
    section for tips on how to complete this step.

Documentation/workflow/HowToAddNewApiLevel.md

@@ -58,6 +58,11 @@ This will create a `api-XX.xml` file in `/src/Mono.Android/Profiles/` that needs
 - Add required metadata fixes in `/src/Mono.Android/metadata` until `Mono.Android.csproj` builds
   - Check that new package/namespaces are properly cased
 
+### New AndroidManifest.xml Elements
+
+- See `build-tools/manifest-attribute-codegen/README.md` for instructions on surfacing any new
+  elements or attributes added to `AndroidManifest.xml`.
+
 ### ApiCompat
 
 There may be ApiCompat issues that need to be examined.  Either fix the assembly with metadata or allow

Localize/loc/cs/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Projekt pro vytvoření aplikace .NET Android Wear]]></Val>
+            <Val><![CDATA[Projekt vytvoření aplikace pro Wear OS pomocí .NET pro Android]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

Localize/loc/de/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ein Projekt zum Erstellen einer .NET für Android Wear-Anwendung]]></Val>
+            <Val><![CDATA[Ein Projekt zum Erstellen einer Wear OS-App mit .NET für Android]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

Localize/loc/es/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proyecto para crear una aplicación .NET para Android Wear]]></Val>
+            <Val><![CDATA[Un proyecto para crear una aplicación Wear OS con .NET para Android]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

Localize/loc/fr/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Projet de création d’une application .NET pour Android Wear]]></Val>
+            <Val><![CDATA[Projet de création d’une application Wear OS à l’aide de .NET pour Android]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

Localize/loc/it/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Progetto per la creazione di un'applicazione per Android Wear .NET]]></Val>
+            <Val><![CDATA[Progetto per la creazione di un'app Wear OS con .NET per Android]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

Localize/loc/ja/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[.NET for Android Wear アプリケーションを作成するためのプロジェクト]]></Val>
+            <Val><![CDATA[Android 用 .NET を使用して Wear OS アプリを作成するためのプロジェクト]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

Localize/loc/ko/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Android용 .NET Wear 애플리케이션을 만들기 위한 프로젝트]]></Val>
+            <Val><![CDATA[Android용 .NET을 사용하여 Wear OS 앱을 만드는 프로젝트입니다.]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>

Localize/loc/pl/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl

@@ -22,7 +22,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Projekt służący do tworzenia aplikacji platformy .NET dla systemu Android Wear]]></Val>
+            <Val><![CDATA[Projekt tworzenia aplikacji Wear OS przy użyciu platformy .NET dla systemu Android]]></Val>
           </Tgt>
           <Prev Cat="Text">
             <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>