Skip to content

Commit eb6ea0b

Browse files
[Microsoft.Android.Sdk] fix %(AndroidSkip*) item metadata (#4959)
The `CheckMetadataSkipItemsAreProcessedCorrectly` test was failing under a `dotnet` context due to item metadata missing, such as: <AndroidSkipAddToPackage>True</AndroidSkipAddToPackage> <AndroidSkipJavaStubGeneration>True</AndroidSkipJavaStubGeneration> <AndroidSkipResourceExtraction>True</AndroidSkipResourceExtraction> These metadata support AndroidX.Migration, and they are completely missing from the item groups generated in `Microsoft.Android.Sdk.AssemblyResolution.targets`. After the `<ProcessAssemblies/>` MSBuild task is called, we should call `<AppendCustomMetadataToItemGroup/>` to populate the missing metadata. The `CheckMetadataSkipItemsAreProcessedCorrectly` test now passes.
1 parent 16478b7 commit eb6ea0b

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,20 @@ _ResolveAssemblies MSBuild target.
6060
IntermediateAssemblyDirectory="$(MonoAndroidIntermediateAssemblyDir)"
6161
UseSharedRuntime="$(AndroidUseSharedRuntime)"
6262
LinkMode="$(AndroidLinkMode)">
63-
<Output TaskParameter="OutputAssemblies" ItemName="ResolvedAssemblies" />
63+
<Output TaskParameter="OutputAssemblies" ItemName="_ProcessedAssemblies" />
6464
<Output TaskParameter="ResolvedSymbols" ItemName="ResolvedSymbols" />
65-
<Output TaskParameter="ShrunkAssemblies" ItemName="_ShrunkAssemblies" />
65+
<Output TaskParameter="ShrunkAssemblies" ItemName="_ProcessedShrunkAssemblies" />
6666
</ProcessAssemblies>
67+
<AppendCustomMetadataToItemGroup
68+
Inputs="@(_ProcessedAssemblies)"
69+
MetaDataItems="@(AndroidCustomMetaDataForReferences)">
70+
<Output TaskParameter="Output" ItemName="ResolvedAssemblies" />
71+
</AppendCustomMetadataToItemGroup>
72+
<AppendCustomMetadataToItemGroup
73+
Inputs="@(_ProcessedShrunkAssemblies)"
74+
MetaDataItems="@(AndroidCustomMetaDataForReferences)">
75+
<Output TaskParameter="Output" ItemName="_ShrunkAssemblies" />
76+
</AppendCustomMetadataToItemGroup>
6777
<ItemGroup>
6878
<ResolvedFrameworkAssemblies
6979
Include="@(ResolvedAssemblies)"

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ public void ExplicitPackageNamingPolicy ()
212212
}
213213

214214
[Test]
215+
[Category ("dotnet")]
215216
public void CheckMetadataSkipItemsAreProcessedCorrectly ()
216217
{
217218
var packages = new List<Package> () {

0 commit comments

Comments
 (0)