Skip to content

Commit f1cccf3

Browse files
Copilotrolfbjarne
andcommitted
Add AppBundleResourcePrefix property and update property precedence
Co-authored-by: rolfbjarne <249268+rolfbjarne@users.noreply.github.com>
1 parent 910098e commit f1cccf3

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

dotnet/targets/Microsoft.Sdk.DefaultItems.template.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<IsDefaultItem>true</IsDefaultItem>
6060
</SceneKitAsset>
6161

62-
<!-- Include everything in the project's Resources folder (as represented by the _ResourcePrefix property, which is set from the IPhoneResourcePrefix/XamMacResourcePrefix properties),
62+
<!-- Include everything in the project's Resources folder (as represented by the _ResourcePrefix property, which is set from the AppBundleResourcePrefix or legacy IPhoneResourcePrefix/XamMacResourcePrefix properties),
6363
except for files that are already in any of the other resource type item groups -->
6464
<BundleResource Include="$(_ResourcePrefix)\**\*" Exclude="
6565
$(DefaultItemExcludes);

msbuild/Xamarin.Shared/Xamarin.Shared.props

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,20 @@ Copyright (C) 2020 Microsoft. All rights reserved.
9999
<!-- Sometimes we've used different variable names for the same thing for Xamarin.iOS and Xamarin.Mac projects. Here we try to unify those variables -->
100100
<PropertyGroup>
101101
<!-- ResourcePrefix -->
102+
<!-- AppBundleResourcePrefix is the unified property for all platforms (.NET) -->
103+
<AppBundleResourcePrefix Condition="'$(AppBundleResourcePrefix)' == ''">Resources</AppBundleResourcePrefix>
104+
<!-- Legacy properties for compatibility -->
105+
<MonoMacResourcePrefix Condition="'$(_PlatformName)' == 'macOS' And '$(MonoMacResourcePrefix)' == '' And '$(AppBundleResourcePrefix)' != ''">$(AppBundleResourcePrefix)</MonoMacResourcePrefix>
102106
<MonoMacResourcePrefix Condition="'$(_PlatformName)' == 'macOS' And '$(MonoMacResourcePrefix)' == ''">Resources</MonoMacResourcePrefix>
107+
<XamMacResourcePrefix Condition="'$(_PlatformName)' == 'macOS' And '$(XamMacResourcePrefix)' == '' And '$(AppBundleResourcePrefix)' != ''">$(AppBundleResourcePrefix)</XamMacResourcePrefix>
103108
<XamMacResourcePrefix Condition="'$(_PlatformName)' == 'macOS' And '$(XamMacResourcePrefix)' == ''">$(MonoMacResourcePrefix)</XamMacResourcePrefix>
104109
<XamMacResourcePrefix Condition="'$(_PlatformName)' == 'macOS' And '$(XamMacResourcePrefix)' == ''">Resources</XamMacResourcePrefix>
110+
<IPhoneResourcePrefix Condition="'$(_PlatformName)' != 'macOS' And '$(IPhoneResourcePrefix)' == '' And '$(AppBundleResourcePrefix)' != ''">$(AppBundleResourcePrefix)</IPhoneResourcePrefix>
105111
<IPhoneResourcePrefix Condition="'$(_PlatformName)' != 'macOS' And '$(IPhoneResourcePrefix)' == ''">Resources</IPhoneResourcePrefix>
106-
<_ResourcePrefix Condition="'$(_PlatformName)' == 'macOS'">$(XamMacResourcePrefix)</_ResourcePrefix>
107-
<_ResourcePrefix Condition="'$(_PlatformName)' != 'macOS'">$(IPhoneResourcePrefix)</_ResourcePrefix>
112+
<!-- Use AppBundleResourcePrefix if provided, otherwise fall back to platform-specific properties -->
113+
<_ResourcePrefix Condition="'$(AppBundleResourcePrefix)' != ''">$(AppBundleResourcePrefix)</_ResourcePrefix>
114+
<_ResourcePrefix Condition="'$(AppBundleResourcePrefix)' == '' And '$(_PlatformName)' == 'macOS'">$(XamMacResourcePrefix)</_ResourcePrefix>
115+
<_ResourcePrefix Condition="'$(AppBundleResourcePrefix)' == '' And '$(_PlatformName)' != 'macOS'">$(IPhoneResourcePrefix)</_ResourcePrefix>
108116

109117
<!-- SdkVersion -->
110118
<_SdkVersion Condition="'$(_PlatformName)' == 'macOS'">$(MacOSXSdkVersion)</_SdkVersion>

0 commit comments

Comments
 (0)