Get 'Prepare' to run 'PrepareJavaInterop'

Author: dellis1972

build-tools/scripts/PrepareWindows.targets

@@ -24,5 +24,6 @@
     />
     <Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
     <MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
+    <CallTarget Targets="PrepareJavaInterop" />
   </Target>
 </Project>

build.cmd

@@ -9,7 +9,6 @@ IF ERRORLEVEL 1 CALL :DEFAULT_CASE
 
 :Prepare_CASE
     dotnet msbuild Xamarin.Android.sln -t:Prepare -nr:false
-    dotnet msbuild Xamarin.Android.sln -t:PrepareJavaInterop -nr:false
     GOTO END_CASE
 :PrepareExternal_CASE
     dotnet build Xamarin.Android.sln -t:PrepareExternal -nr:false
@@ -22,7 +21,6 @@ IF ERRORLEVEL 1 CALL :DEFAULT_CASE
     GOTO END_CASE
 :DEFAULT_CASE
     dotnet msbuild Xamarin.Android.sln -t:Prepare -nr:false
-    dotnet msbuild Xamarin.Android.sln -t:PrepareJavaInterop -nr:false
     dotnet-local.cmd build Xamarin.Android.sln -nr:false
     dotnet-local.cmd build Xamarin.Android.sln -t:PackDotNet -nr:false
     GOTO END_CASE