Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rolfbjarne wants to merge 2 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61c4183
[msbuild] Fix Content/BundleResource with PublishFolderType not bundl…
rolfbjarne Apr 1, 2026
bbafc15
Merge branch 'main' into dev/rolf/issue-25053-content-universal-apps
rolfbjarne Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions msbuild/Xamarin.Shared/Xamarin.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
1 change: 1 addition & 0 deletions tests/dotnet/BundleStructure/BundleResourceJ.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BundleResourceJ
1 change: 1 addition & 0 deletions tests/dotnet/BundleStructure/ContentJ.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ContentJ
8 changes: 8 additions & 0 deletions tests/dotnet/BundleStructure/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->

Expand Down Expand Up @@ -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)" />
Expand Down
2 changes: 2 additions & 0 deletions tests/dotnet/UnitTests/BundleStructureTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand All @@ -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"));
Expand Down
Loading