[msbuild] Fix Content/BundleResource with PublishFolderType not bundled in multi-RID builds. Fixes #25053. (#25065)

In multi-RID (universal) builds, the outer build saves all Content and BundleResource
items to processed-items files, and inner builds remove them. However, items with
PublishFolderType are not actually processed by CollectBundleResources (it skips
them) — they're handled via ResolvedFileToPublish instead. By incorrectly saving
them as processed, the inner builds remove them before they can be added to ResolvedFileToPublish,
so they never end up in the app bundle.

Fix by filtering out items with PublishFolderType when writing the processed-items
files.

Fixes #25053.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: rolfbjarne

msbuild/Xamarin.Shared/Xamarin.Shared.targets

@@ -466,9 +466,16 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<Output TaskParameter="BundleResourcesWithLogicalNames" ItemName="_BundleResourceWithLogicalName" />
 		</CollectBundleResources>
 
-		<!-- Write out the list of assets we've processed, so that an inner build in a multi-rid build can skip processing them -->
-		<WriteItemsToFile Items="@(BundleResource)" Condition="'$(_SaveProcessedItems)' == 'true'" ItemName="BundleResource" File="$(_ProcessedBundleResourcesPath)" Overwrite="true" IncludeMetadata="false" />
-		<WriteItemsToFile Items="@(Content)" Condition="'$(_SaveProcessedItems)' == 'true'" ItemName="Content" File="$(_ProcessedContentPath)" Overwrite="true" IncludeMetadata="false" />
+		<!-- Write out the list of assets we've processed, so that an inner build in a multi-rid build can skip processing them.
+		     Items with a PublishFolderType are not actually processed by CollectBundleResources (they go to ResolvedFileToPublish instead),
+		     so don't include them in the list of processed items - inner builds need to see them to add them to ResolvedFileToPublish.
+		     Ref: https://github.com/dotnet/macios/issues/25053 -->
+		<ItemGroup Condition="'$(_SaveProcessedItems)' == 'true'">
+			<_BundleResourceToSave Include="@(BundleResource)" Condition="'%(BundleResource.PublishFolderType)' == ''" />
+			<_ContentToSave Include="@(Content)" Condition="'%(Content.PublishFolderType)' == ''" />
+		</ItemGroup>
+		<WriteItemsToFile Items="@(_BundleResourceToSave)" Condition="'$(_SaveProcessedItems)' == 'true'" ItemName="BundleResource" File="$(_ProcessedBundleResourcesPath)" Overwrite="true" IncludeMetadata="false" />
+		<WriteItemsToFile Items="@(_ContentToSave)" Condition="'$(_SaveProcessedItems)' == 'true'" ItemName="Content" File="$(_ProcessedContentPath)" Overwrite="true" IncludeMetadata="false" />
 		<ItemGroup>
 			<FileWrites Include="$(_ProcessedBundleResourcesPath)" />
 			<FileWrites Include="$(_ProcessedContentPath)" />

tests/dotnet/BundleStructure/BundleResourceJ.txt

@@ -0,0 +1 @@
+BundleResourceJ

tests/dotnet/BundleStructure/ContentJ.txt

@@ -0,0 +1 @@
+ContentJ

tests/dotnet/BundleStructure/shared.csproj

@@ -218,6 +218,10 @@
 		<Content Include="../ContentH.txt">
 			<PublishFolderType>None</PublishFolderType>
 		</Content>
+		<!-- Content with PublishFolderType=Resource: bundled (https://github.com/dotnet/macios/issues/25053) -->
+		<Content Include="../ContentJ.txt">
+			<PublishFolderType>Resource</PublishFolderType>
+		</Content>
 
 		<!-- EmbeddedResource items -->
 
@@ -288,6 +292,10 @@
 		<BundleResource Include="../BundleResourceH.txt">
 			<PublishFolderType>None</PublishFolderType>
 		</BundleResource>
+		<!-- BundleResource with PublishFolderType=Resource: bundled (https://github.com/dotnet/macios/issues/25053) -->
+		<BundleResource Include="../BundleResourceJ.txt">
+			<PublishFolderType>Resource</PublishFolderType>
+		</BundleResource>
 
 		<None Remove="@(Content)" />
 		<None Remove="@(EmbeddedResource)" />

tests/dotnet/UnitTests/BundleStructureTest.cs

@@ -257,6 +257,7 @@ internal static void CheckAppBundleContents (ApplePlatform platform, IEnumerable
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "ContentD.txt"));
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "ContentE.txt"));
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "ContentI.txt"));
+			expectedFiles.Add (Path.Combine (resourcesDirectory, "ContentJ.txt"));
 
 			// expectedFiles.Add (Path.Combine (resourcesDirectory, "EmbeddedResourceA.txt"));
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "EmbeddedResourceB.txt"));
@@ -270,6 +271,7 @@ internal static void CheckAppBundleContents (ApplePlatform platform, IEnumerable
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "BundleResourceD.txt"));
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "BundleResourceE.txt"));
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "BundleResourceI.txt"));
+			expectedFiles.Add (Path.Combine (resourcesDirectory, "BundleResourceJ.txt"));
 
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "AutoIncluded.txt"));
 			expectedFiles.Add (Path.Combine (resourcesDirectory, "SubDirectory"));