Flush.

dotnet · Jan 24, 2024 · 29098c7 · 29098c7
1 parent f3e42e5
commit 29098c7
Show file tree

Hide file tree

Showing 16 changed files with 674 additions and 602 deletions.
diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
@@ -104,14 +104,14 @@
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)HtmlAgilityPack.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)HtmlAgilityPack.pdb" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Irony.dll" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Java.Interop.Tools.Maven.dll" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Java.Interop.Tools.Maven.pdb" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)java-interop.jar" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)java-source-utils.jar" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)LayoutBinding.cs" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libZipSharp.dll" />
     <_MSBuildFiles Include="@(_LocalizationLanguages->'$(MicrosoftAndroidSdkOutDir)%(Identity)\libZipSharp.resources.dll')" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libZipSharp.pdb" />
-    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)MavenNet.dll" />
-    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)MavenNet.pdb" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Unix.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Unix.pdb" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Microsoft.Android.Build.BaseTasks.dll" />
@@ -138,6 +138,7 @@
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Application.targets" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Bindings.ClassParse.targets" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Bindings.Core.targets" />
+    <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Bindings.JavaDependencyVerification.targets" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Bindings.Maven.targets" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Build.Tasks.dll" />
     <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Build.Tasks.pdb" />

diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/MavenNet.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/MavenNet.cs
diff --git a/external/Java.Interop b/external/Java.Interop
diff --git a/...Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.JavaDependencyVerification.targets b/...Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.JavaDependencyVerification.targets
@@ -13,10 +13,10 @@ that Java binding dependencies are satisfied.
   <UsingTask TaskName="Xamarin.Android.Tasks.GetMicrosoftNuGetPackagesMap" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
   <UsingTask TaskName="Xamarin.Android.Tasks.JavaDependencyVerification" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 
-  <Target Name="VerifyJavaDependencies"
+  <Target Name="_VerifyJavaDependencies"
       Condition=" '@(AndroidLibrary->Count())' != '0' "
       BeforeTargets="_CategorizeAndroidLibraries"
-      DependsOnTargets="MavenRestore">
+      DependsOnTargets="_MavenRestore">
 
     <!-- Find the microsoft-package.json file for NuGet package hints. -->
     <GetMicrosoftNuGetPackagesMap MavenCacheDirectory="$(MavenCacheDirectory)">

diff --git a/...amarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Maven.targets b/...amarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Maven.targets
@@ -19,19 +19,21 @@ This file contains MSBuild targets used to enable @(AndroidMavenLibrary) support
     <MavenCacheDirectory>$([MSBuild]::EnsureTrailingSlash('$(MavenCacheDirectory)'))</MavenCacheDirectory>
   </PropertyGroup>
 
-  <Target Name="MavenRestore"
+  <Target Name="_MavenRestore"
       Condition=" '@(AndroidMavenLibrary->Count())' != '0' "
       BeforeTargets="_CategorizeAndroidLibraries"
       DependsOnTargets="ResolvePackageAssets">
 
     <!-- Download artifacts and POMs from Maven to a local cache. -->
     <MavenDownload MavenCacheDirectory="$(MavenCacheDirectory)" AndroidMavenLibraries="@(AndroidMavenLibrary)">
       <Output TaskParameter="ResolvedAndroidMavenLibraries" ItemName="_ResolvedAndroidMavenLibraries" />
+      <Output TaskParameter="AndroidAdditionalJavaManifest" ItemName="_AndroidAdditionalJavaManifest" />
     </MavenDownload>
 
     <!-- Add @(AndroidMavenLibrary)'s to @(AndroidLibrary)'s. -->
     <ItemGroup>
       <AndroidLibrary Include="@(_ResolvedAndroidMavenLibraries)" />
+      <AndroidAdditionalJavaManifest Include="@(_AndroidAdditionalJavaManifest)" />
     </ItemGroup>
 
   </Target>