Move ApiCompat ref to Mono.Android.csproj

Author: pjcollins

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj

@@ -8,8 +8,6 @@
     <RootNamespace>Xamarin.Android.Tools.BootstrapTasks</RootNamespace>
     <AssemblyName>Xamarin.Android.Tools.BootstrapTasks</AssemblyName>
     <LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
-    <!-- Do not run Microsoft.DotNet.ApiCompat targets by default during build. -->
-    <RunApiCompat>false</RunApiCompat>
   </PropertyGroup>
   <Import Project="..\..\Configuration.props" />
   <Import Project="..\..\build-tools\scripts\MSBuildReferences.projitems" />
@@ -64,7 +62,6 @@
     <Compile Include="Xamarin.Android.Tools.BootstrapTasks\JdkInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19606.1" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19606.1" />
   </ItemGroup>
   <ItemGroup>

src/Mono.Android/Mono.Android.csproj

@@ -82,6 +82,9 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19606.1" IncludeAssets="none" GeneratePathProperty="true" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs">
       <Link>JavaNativeTypeManager.cs</Link>

src/Mono.Android/Mono.Android.targets

@@ -173,7 +173,7 @@
       Inputs="$(TargetPath);@(ApiCompatibilityFiles)"
       Outputs="$(IntermediateOutputPath)CheckApiCompatibility.stamp">
     <!-- $(PkgMicrosoft_DotNet_ApiCompat) is set by the GeneratePathProperty attribute in the
-          PackageReference declared in Xamarin.Android.Tools.BootstrapTasks.csproj -->
+          PackageReference declared in Mono.Android.csproj -->
     <CheckApiCompatibility
         ApiCompatPath="$(PkgMicrosoft_DotNet_ApiCompat)/tools/net472/"
         ApiLevel="$(AndroidFrameworkVersion)"