Move ApiCompat ref back to BootstrapTasks proj

Author: pjcollins

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

@@ -62,6 +62,7 @@
     <Compile Include="Xamarin.Android.Tools.BootstrapTasks\JdkInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19606.1" IncludeAssets="none" />
     <PackageReference Include="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19606.1" />
   </ItemGroup>
   <ItemGroup>

src/Mono.Android/Mono.Android.csproj

@@ -82,9 +82,6 @@
       <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

@@ -172,10 +172,8 @@
       Name="AfterBuild"
       Inputs="$(TargetPath);@(ApiCompatibilityFiles)"
       Outputs="$(IntermediateOutputPath)CheckApiCompatibility.stamp">
-    <!-- $(PkgMicrosoft_DotNet_ApiCompat) is set by the GeneratePathProperty attribute in the
-          PackageReference declared in Mono.Android.csproj -->
     <CheckApiCompatibility
-        ApiCompatPath="$(PkgMicrosoft_DotNet_ApiCompat)/tools/net472/"
+        ApiCompatPath="$([System.Environment]::GetFolderPath(SpecialFolder.UserProfile))\.nuget\packages\microsoft.dotnet.apicompat\5.0.0-beta.19606.1\tools\net472\"
         ApiLevel="$(AndroidFrameworkVersion)"
         LastStableApiLevel="$(AndroidLatestStableFrameworkVersion)"
         TargetImplementationPath="$(OutputPath)"