Skip to content

Commit 9884d06

Browse files
committed
Improvements to AppClips verification target
1 parent af7ebf6 commit 9884d06

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.appclips.targets

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,28 @@
8080
<!-- Include the found AppClips in the MAUI app -->
8181
<MauiAsset Include="@(_AppClipsFiles)" LogicalName="AppClips/%(_AppClipsFiles.TargetPath)" />
8282
</ItemGroup>
83-
8483
</Target>
8584

8685

8786
<Target Name="VerifyAppClips" Condition="'@(AppClips)' != ''">
8887
<ItemGroup>
89-
<_AppClipsMobileProvisioning Condition="'%(AppClips.SkipValidation)' != 'true'" Include="%(AppClips.ArchivePath)/**/AppClips/**/embedded.mobileprovision" />
88+
<AppClipsTarget Condition="'%(AppClips.SkipValidation)' != 'true'" Include="$(AppBundleDir)" />
89+
<AppClipsTarget Condition="'%(AppClips.SkipValidation)' != 'true' AND '@(AppClipsTarget)' == ''" Include="%(AppClips.ArchivePath)" />
90+
<_AppClipsMobileProvisioning Condition="'@(AppClipsTarget)' != ''" Include="%(AppClipsTarget.FullPath)/**/AppClips/**/embedded.mobileprovision" />
9091
</ItemGroup>
9192

9293
<Exec
9394
Condition="'@(_AppClipsMobileProvisioning)' != ''"
94-
Command="security cms -D -i '@(_AppClipsMobileProvisioning)' | sed -n '/&lt;key&gt;com.apple.developer.parent-application-identifiers&lt;\/key&gt;/,/&lt;\/array&gt;/p' | grep -q '$(ApplicationId)&lt;'"
95-
IgnoreExitCode="true">
95+
Command="xcrun security cms -D -i '%(_AppClipsMobileProvisioning.FullPath)' | xcrun plutil -extract 'Entitlements.com\.apple\.developer\.parent-application-identifiers' xml1 -o - - | grep -q '$(ApplicationId)&lt;'"
96+
IgnoreExitCode="true"
97+
StandardOutputImportance="Low">
9698
<Output TaskParameter="ExitCode" PropertyName="ExitCode" />
9799
</Exec>
98100

99-
<Error Condition="'$(ExitCode)' != '' AND '$(ExitCode)' != '0'" Code="1013" Text="AppClips application identifier does not mathc this 'ApplicationId': $(ApplicationId)" />
101+
<Error
102+
Condition="'$(ExitCode)' != '' AND '$(ExitCode)' != '0'"
103+
Code="1013"
104+
Text="AppClips 'com.apple.developer.parent-application-identifiers' does not match this 'ApplicationId': $(ApplicationId)" />
100105
</Target>
101106

102107

0 commit comments

Comments
 (0)