Merge branch 'main' into blazor-hang

* main:
  [Xamarin.Android.Build.Tasks] introduce Eol.targets for .NET 6 (dotnet#8047)
  [Xamarin.Android.Build.Tasks] Add $(_BindingsToolsLocation) to allow overriding binding tool binaries. (dotnet#8069)
  [tests] new test for provisioning JDKs (dotnet#8059)
  Localized file check-in by OneLocBuild Task (dotnet#8065)
  [AndroidDependenciesTests] Use platform-tools 34.0.3 (dotnet#8062)
  Bump to xamarin/Java.Interop/main@93c50fe (dotnet#8060)
  [Xamarin.Android.Build.Tasks] Update XA5300 text (dotnet#8057)

Author: grendello

.external

@@ -1,2 +1,2 @@
-xamarin/monodroid:main@5aed7eddb3c02148297606da2b9e3ede6141f8f4
+xamarin/monodroid:main@dbc9c67e7bd45744e5174dd7e94e5b642418bef9
 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

Documentation/guides/messages/xa5300.md

@@ -15,6 +15,12 @@ be located during the build.
 This can be fixed on the command-line by overriding either the
 `$(AndroidSdkDirectory)` or `$(JavaSdkDirectory)` MSBuild properties:
 
+```sh
+dotnet build -p:AndroidSdkDirectory=path/to/android/sdk -p:JavaSdkDirectory=path/to/jdk
+```
+
+Instructions to manually install the Android SDK or Java SDK are at: <https://aka.ms/dotnet-android-install-sdk>
+
 This can also be fixed [within Visual Studio options][vs-sdk].
 
 Consider submitting a [bug][bug] if you are getting this failure under

external/Java.Interop

@@ -18,6 +18,11 @@ This file is only used by binding projects.
       Inputs="@(EmbeddedJar);@(EmbeddedReferenceJar);@(InputJar);@(ReferenceJar);@(_AndroidMSBuildAllProjects)"
       Outputs="$(ApiOutputFile)">
 
+    <PropertyGroup>
+      <!-- Allow $(_BindingsToolsLocation) to override where to find class-parse/generator -->
+      <_BindingsToolsLocation Condition=" '$(_BindingsToolsLocation)' == '' ">$(MonoAndroidToolsDirectory)</_BindingsToolsLocation>
+    </PropertyGroup>
+
     <ItemGroup>
       <_AndroidDocumentationPath Include="@(_JavaSourceJavadocXml)" />
       <_AndroidDocumentationPath Include="@(JavaDocIndex->'%(RootDir)\%(Directory)')" />
@@ -32,7 +37,7 @@ This file is only used by binding projects.
         SourceJars="@(EmbeddedJar);@(InputJar)"
         DocumentationPaths="@(_AndroidDocumentationPath)"
         NetCoreRoot="$(NetCoreRoot)"
-        ToolPath="$(MonoAndroidToolsDirectory)"
+        ToolPath="$(_BindingsToolsLocation)"
         ToolExe="$(ClassParseToolExe)"
     />
     <BindingsGenerator
@@ -44,7 +49,7 @@ This file is only used by binding projects.
         ReferencedManagedLibraries="@(ReferencePath);@(ReferenceDependencyPaths)"
         MonoAndroidFrameworkDirectories="$(_XATargetFrameworkDirectories)"
         NetCoreRoot="$(NetCoreRoot)"
-        ToolPath="$(MonoAndroidToolsDirectory)"
+        ToolPath="$(_BindingsToolsLocation)"
         ToolExe="$(BindingsGeneratorToolExe)"
         Nullable="$(Nullable)"
         UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)"

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets

@@ -55,6 +55,11 @@ It is shared between "legacy" binding projects and .NET 5 projects.
       Inputs="$(ApiOutputFile);@(TransformFile);@(ReferencePath);@(ReferenceDependencyPaths);@(_AndroidMSBuildAllProjects)"
       Outputs="$(_GeneratorStampFile)">
 
+    <PropertyGroup>
+      <!-- Allow $(_BindingsToolsLocation) to override where to find class-parse/generator -->
+      <_BindingsToolsLocation Condition=" '$(_BindingsToolsLocation)' == '' ">$(MonoAndroidToolsDirectory)</_BindingsToolsLocation>
+    </PropertyGroup>
+    
     <!-- Delete previous generated files if they still exist -->
     <RemoveDirFixed Directories="$(GeneratedOutputPath)" Condition="Exists ('$(GeneratedOutputPath)')" />
 
@@ -87,7 +92,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
         MonoAndroidFrameworkDirectories="$(_XATargetFrameworkDirectories)"
         TypeMappingReportFile="$(GeneratedOutputPath)type-mapping.txt"
         NetCoreRoot="$(NetCoreRoot)"
-        ToolPath="$(MonoAndroidToolsDirectory)"
+        ToolPath="$(_BindingsToolsLocation)"
         ToolExe="$(BindingsGeneratorToolExe)"
         LangVersion="$(LangVersion)"
         EnableBindingStaticAndDefaultInterfaceMethods="$(AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods)"

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets

@@ -0,0 +1,44 @@
+<!--
+***********************************************************************************************
+Eol.targets
+
+Imported only by .NET 6 EOL projects, contains settings to force the error:
+
+error NETSDK1202: The workload 'android' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/maui-support-policy for more information about the support policy.
+
+Things to note:
+
+* $(WarningsAsErrors) includes NETSDK1202
+* Force $(TargetPlatformVersion) to just be 21.0, to make it past early error messages
+* _ClearMissingWorkloads prevents undesired extra error messages
+
+***********************************************************************************************
+-->
+<Project InitialTargets="_ClearMissingWorkloads">
+  <PropertyGroup>
+    <!-- Force NETSDK1202 to be an error -->
+    <WarningsAsErrors>$(WarningsAsErrors);NETSDK1202</WarningsAsErrors>
+    <!--
+      Along with @(SdkSupportedTargetPlatformVersion), prevents the error:
+      Microsoft.NET.TargetFrameworkInference.targets(229,5):
+      error NETSDK1140: 31.0 is not a valid TargetPlatformVersion for android. Valid versions include:
+    -->
+    <TargetPlatformSupported>true</TargetPlatformSupported>
+    <TargetPlatformVersion>21.0</TargetPlatformVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <SdkSupportedTargetPlatformVersion Include="21.0" />
+    <EolWorkload Include="android" Url="https://aka.ms/maui-support-policy" />
+  </ItemGroup>
+  <Target Name="_ClearMissingWorkloads">
+    <!--
+      Prevents the error:
+      Microsoft.NET.Sdk.ImportWorkloads.targets(38,5): error NETSDK1147:
+      To build this project, the following workloads must be installed: wasm-tools-net6
+      To install these workloads, run the following command: dotnet workload restore
+    -->
+    <ItemGroup>
+      <MissingWorkloadPack Remove="@(MissingWorkloadPack)" />
+    </ItemGroup>
+  </Target>
+</Project>

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/Eol.targets

@@ -4,7 +4,7 @@
         Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) " />
     <Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net7"
         Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) " />
-    <Import Project="Sdk.targets" Sdk="Microsoft.Android.Sdk.net6"
+    <Import Project="Eol.targets" Sdk="Microsoft.Android.Sdk.net8"
         Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " />
   </ImportGroup>
 
@@ -16,7 +16,7 @@
     />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
+  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '7.0')) ">
     <SdkSupportedTargetPlatformIdentifier Include="android" DisplayName="Android" />
   </ItemGroup>
 </Project>

src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets

@@ -881,11 +881,13 @@ In this message, the term "handheld app" means "app for handheld devices."
 {3} - The Android SDK installer program name</comment>
   </data>
   <data name="XA5300_Android_SDK" xml:space="preserve">
-    <value>Nepovedlo se najít adresář sady Android SDK. Zkontrolujte, jestli Správce sady Android SDK v sadě Visual Studio zobrazuje platnou instalaci. Pokud chcete použít vlastní cestu sady SDK pro sestavení z příkazového řádku, nastavte vlastnost AndroidSdkDirectory nástroje MSBuild na danou vlastní cestu.</value>
+    <value>The Android SDK directory could not be found. Install the Android SDK by following the instructions at: https://aka.ms/dotnet-android-install-sdk
+To use a custom SDK path for a command line build, set the 'AndroidSdkDirectory' MSBuild property to the custom path.</value>
     <comment>The following terms should not be translated: AndroidSdkDirectory</comment>
   </data>
   <data name="XA5300_Java_SDK" xml:space="preserve">
-    <value>Nepovedlo se najít adresář sady Java SDK. Zajistěte, aby byl v možnostech sady Visual Studio v části Android nakonfigurovaný platný adresář sady Java SDK. Pokud chcete použít vlastní cestu sady SDK pro sestavení z příkazového řádku, nastavte vlastnost JavaSdkDirectory nástroje MSBuild na danou vlastní cestu.</value>
+    <value>The Java SDK directory could not be found. Install the Java SDK by following the instructions at: https://aka.ms/dotnet-android-install-sdk
+To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MSBuild property to the custom path.</value>
     <comment>The following terms should not be translated: JavaSdkDirectory</comment>
   </data>
   <data name="XA5301" xml:space="preserve">

src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx

@@ -881,11 +881,13 @@ In this message, the term "handheld app" means "app for handheld devices."
 {3} - The Android SDK installer program name</comment>
   </data>
   <data name="XA5300_Android_SDK" xml:space="preserve">
-    <value>Das Android SDK-Verzeichnis wurde nicht gefunden. Überprüfen Sie, ob der Android SDK-Manager in Visual Studio eine gültige Installation anzeigt. Legen Sie die MSBuild-Eigenschaft "AndroidSdkDirectory" auf den benutzerdefinierten Pfad fest, um einen benutzerdefinierten SDK-Pfad für einen Befehlszeilenbuild zu verwenden.</value>
+    <value>The Android SDK directory could not be found. Install the Android SDK by following the instructions at: https://aka.ms/dotnet-android-install-sdk
+To use a custom SDK path for a command line build, set the 'AndroidSdkDirectory' MSBuild property to the custom path.</value>
     <comment>The following terms should not be translated: AndroidSdkDirectory</comment>
   </data>
   <data name="XA5300_Java_SDK" xml:space="preserve">
-    <value>Das Java SDK-Verzeichnis wurde nicht gefunden. Überprüfen Sie, ob im Abschnitt "Android" der Visual Studio-Optionen ein gültiges Java SDK-Verzeichnis konfiguriert ist. Legen Sie die MSBuild-Eigenschaft "JavaSdkDirectory" auf den benutzerdefinierten Pfad fest, um einen benutzerdefinierten SDK-Pfad für einen Befehlszeilenbuild zu verwenden.</value>
+    <value>The Java SDK directory could not be found. Install the Java SDK by following the instructions at: https://aka.ms/dotnet-android-install-sdk
+To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MSBuild property to the custom path.</value>
     <comment>The following terms should not be translated: JavaSdkDirectory</comment>
   </data>
   <data name="XA5301" xml:space="preserve">

src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx

@@ -881,11 +881,13 @@ In this message, the term "handheld app" means "app for handheld devices."
 {3} - The Android SDK installer program name</comment>
   </data>
   <data name="XA5300_Android_SDK" xml:space="preserve">
-    <value>No se encontró el directorio de Android SDK. Compruebe que el Administrador de Android SDK en Visual Studio muestre una instalación válida. Para usar una ruta de acceso de SDK personalizada para una compilación de línea de comandos, establezca la propiedad "AndroidSdkDirectory" de MSBuild en la ruta de acceso personalizada.</value>
+    <value>The Android SDK directory could not be found. Install the Android SDK by following the instructions at: https://aka.ms/dotnet-android-install-sdk
+To use a custom SDK path for a command line build, set the 'AndroidSdkDirectory' MSBuild property to the custom path.</value>
     <comment>The following terms should not be translated: AndroidSdkDirectory</comment>
   </data>
   <data name="XA5300_Java_SDK" xml:space="preserve">
-    <value>No se encontró el directorio del SDK de Java. Asegúrese de que la sección de Android de las opciones de Visual Studio tenga configurado un directorio válido del SDK de Java. Para usar una ruta de acceso del SDK personalizada para una compilación de línea de comandos, establezca la propiedad "JavaSdkDirectory" de MSBuild en la ruta de acceso personalizada.</value>
+    <value>The Java SDK directory could not be found. Install the Java SDK by following the instructions at: https://aka.ms/dotnet-android-install-sdk
+To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MSBuild property to the custom path.</value>
     <comment>The following terms should not be translated: JavaSdkDirectory</comment>
   </data>
   <data name="XA5301" xml:space="preserve">