Skip to content

Commit 07d7e5a

Browse files
committed
rework
1 parent 45d9db5 commit 07d7e5a

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.Core.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ It is shared between "legacy" binding projects and .NET 5 projects.
137137
Nullable="$(Nullable)"
138138
UseJavaLegacyResolver="$(_AndroidUseJavaLegacyResolver)"
139139
NamespaceTransforms="@(AndroidNamespaceReplacement)"
140-
GeneratedFileListFile="$(GeneratedOutputPath)src\$(AssemblyName).FileList.txt"
140+
GeneratedFileListFile="$(GeneratedOutputPath)src\$(AssemblyName).projitems"
141141
>
142142
<Output TaskParameter="GeneratedFiles" ItemName="_GeneratedBindingFiles" />
143143
</BindingsGenerator>

src/Xamarin.Android.Build.Tasks/Tasks/Generator.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Linq;
77
using System.Xml;
88
using System.Xml.Linq;
9+
using System.Xml.XPath;
910
using Microsoft.Build.Framework;
1011
using Microsoft.Build.Utilities;
1112
using Microsoft.Android.Build.Tasks;
@@ -141,10 +142,12 @@ public override bool RunTask ()
141142
var result = base.RunTask ();
142143
List<ITaskItem> files = new List<ITaskItem> ();
143144
if (result && GeneratedFileListFile != null && File.Exists (GeneratedFileListFile)) {
144-
var lines = File.ReadAllLines (GeneratedFileListFile);
145-
foreach (var line in lines) {
146-
if (File.Exists (line)) {
147-
files.Add (new TaskItem (line));
145+
var doc = XDocument.Load (GeneratedFileListFile);
146+
var compileItems = doc.XPathSelectElements ("//Project/ItemGroup/Compile");
147+
foreach (var item in compileItems) {
148+
var file = item.Attribute ("Include");
149+
if (file != null && File.Exists (file.Value)) {
150+
files.Add (new TaskItem (file.Value));
148151
}
149152
}
150153
}

0 commit comments

Comments
 (0)