rework

dotnet · Feb 13, 2024 · 07d7e5a · 07d7e5a
1 parent 45d9db5
commit 07d7e5a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets b/...Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets
@@ -137,7 +137,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
         Nullable="$(Nullable)"
         UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)"
         NamespaceTransforms="@(AndroidNamespaceReplacement)"
-        GeneratedFileListFile="$(GeneratedOutputPath)src\$(AssemblyName).FileList.txt"
+        GeneratedFileListFile="$(GeneratedOutputPath)src\$(AssemblyName).projitems"
     >
       <Output TaskParameter="GeneratedFiles" ItemName="_GeneratedBindingFiles" />
     </BindingsGenerator>

diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
+using System.Xml.XPath;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.Android.Build.Tasks;
@@ -141,10 +142,12 @@ public override bool RunTask ()
 			var result = base.RunTask ();
 			List<ITaskItem> files = new List<ITaskItem> ();
 			if (result && GeneratedFileListFile != null && File.Exists (GeneratedFileListFile)) {
-				var lines = File.ReadAllLines (GeneratedFileListFile);
-				foreach (var line in lines) {
-					if (File.Exists (line)) {
-						files.Add (new TaskItem (line));
+				var doc = XDocument.Load (GeneratedFileListFile);
+				var compileItems = doc.XPathSelectElements ("//Project/ItemGroup/Compile");
+				foreach (var item in compileItems) {
+					var file = item.Attribute ("Include");
+					if (file != null && File.Exists (file.Value)) {
+						files.Add (new TaskItem (file.Value));
 					}
 				}
 			}