[Mono.Android] Add target to build additional API levels

Commit e4a75a8 removed some make magic that ensured Mono.Android.dll
would be built multiple times for additional supported API levels.

A couple of MSBuild tasks used to build multiple versions of
Mono.Android.dll have been moved out of the `PackDotNet` target used by
the Windows build and into the Mono.Android build to fix this.

(cherry picked from commit c1d3e8e)

Author: pjcollins

build-tools/scripts/BuildEverything.mk

@@ -13,5 +13,4 @@ endif
 
 leeroy:
 	$(call DOTNET_BINLOG,leeroy) $(SOLUTION) $(_MSBUILD_ARGS)
-	$(call DOTNET_BINLOG,preview-monoandroid) src/Mono.Android/Mono.Android.csproj -p:BuildLatestPreview=true
 	$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj

build-tools/scripts/DotNet.targets

@@ -30,17 +30,6 @@
   </Target>
 
   <Target Name="PackDotNet">
-    <!-- Build extra versions of Mono.Android.dll if necessary -->
-    <MSBuild
-         Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' != '$(AndroidLatestStableApiLevel)' "
-         Projects="$(_Root)src\Mono.Android\Mono.Android.csproj"
-         Properties="TargetFramework=$(DotNetTargetFramework);AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel);AndroidPlatformId=$(AndroidDefaultTargetDotnetApiLevel);DisableApiCompatibilityCheck=true"
-    />
-    <MSBuild
-         Condition=" '$(AndroidLatestUnstableApiLevel)' != '$(AndroidLatestStableApiLevel)' "
-         Projects="$(_Root)src\Mono.Android\Mono.Android.csproj"
-         Properties="TargetFramework=$(DotNetTargetFramework);AndroidApiLevel=$(AndroidLatestUnstableApiLevel);AndroidPlatformId=$(AndroidLatestUnstablePlatformId);DisableApiCompatibilityCheck=true"
-    />
     <MSBuild Projects="$(_Root)build-tools\create-packs\Microsoft.Android.Sdk.proj" Targets="CreateAllPacks" />
     <MSBuild Projects="$(_Root)build-tools\create-packs\Microsoft.Android.Sdk.proj" Targets="ExtractWorkloadPacks" />
     <!-- Clean up old, previously restored packages -->

src/Mono.Android/Mono.Android.csproj

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
 
-  <PropertyGroup Condition=" '$(BuildLatestPreview)' == 'true' ">
-    <AndroidApiLevel>36</AndroidApiLevel>
-    <AndroidPlatformId>Baklava</AndroidPlatformId>
-    <AndroidFrameworkVersion>v15.0.99</AndroidFrameworkVersion>
-  </PropertyGroup>
-
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <Import Project="..\..\Configuration.props" />
   <Import Project="$(XamarinAndroidSourcePath)\build-tools\trim-analyzers\trim-analyzers.props" />
@@ -406,6 +400,7 @@
   <PropertyGroup Condition=" '$(AndroidApiLevel)' &gt;= '$(AndroidDefaultTargetDotnetApiLevel)' ">
     <BuildDependsOn>
       $(BuildDependsOn);
+      _BuildAdditionalApiLevels;
       _ExportMsxDoc;
       _CopyToPackDirs;
     </BuildDependsOn>

src/Mono.Android/Mono.Android.targets

@@ -235,6 +235,19 @@
     </ItemGroup>
   </Target>
 
+  <!-- Build Mono.Android.dll for additional API levels if necessary -->
+  <Target Name="_BuildAdditionalApiLevels">
+    <MSBuild
+         Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' != '$(AndroidLatestStableApiLevel)' "
+         Projects="$(XamarinAndroidSourcePath)src\Mono.Android\Mono.Android.csproj"
+         Properties="AndroidApiLevel=$(AndroidDefaultTargetDotnetApiLevel);AndroidPlatformId=$(AndroidDefaultTargetDotnetApiLevel)"
+    />
+    <MSBuild
+         Condition=" '$(AndroidLatestUnstableApiLevel)' != '$(AndroidLatestStableApiLevel)' "
+         Projects="$(XamarinAndroidSourcePath)src\Mono.Android\Mono.Android.csproj"
+         Properties="AndroidApiLevel=$(AndroidLatestUnstableApiLevel);AndroidPlatformId=$(AndroidLatestUnstablePlatformId)"
+    />
+  </Target>
 
   <PropertyGroup>
     <!-- Override these properties to generate docs against a specific API level -->