diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index 69f0d271c91f..f2da16726104 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/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)" />
diff --git a/tests/dotnet/BundleStructure/BundleResourceJ.txt b/tests/dotnet/BundleStructure/BundleResourceJ.txt
new file mode 100644
index 000000000000..7eb01fc1b740
--- /dev/null
+++ b/tests/dotnet/BundleStructure/BundleResourceJ.txt
@@ -0,0 +1 @@
+BundleResourceJ
diff --git a/tests/dotnet/BundleStructure/ContentJ.txt b/tests/dotnet/BundleStructure/ContentJ.txt
new file mode 100644
index 000000000000..77e00d8e75d4
--- /dev/null
+++ b/tests/dotnet/BundleStructure/ContentJ.txt
@@ -0,0 +1 @@
+ContentJ
diff --git a/tests/dotnet/BundleStructure/shared.csproj b/tests/dotnet/BundleStructure/shared.csproj
index 6fd02566537e..2f8ad66ed705 100644
--- a/tests/dotnet/BundleStructure/shared.csproj
+++ b/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)" />
diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs
index 035e665fd8d6..13b5f6ca256a 100644
--- a/tests/dotnet/UnitTests/BundleStructureTest.cs
+++ b/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"));