Skip to content

Make Entitlements in Templates for MacCatalyst more consistent between debug and release configs. #17833

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

Merged
PureWeen merged 5 commits into from
Oct 12, 2023
Merged

Make Entitlements in Templates for MacCatalyst more consistent between debug and release configs. #17833

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c19dc6
Updated integration test to check for app-sandbox and network.client …
dustin-wojciechowski Oct 4, 2023
49e1e2d
Added app-sandbox and network.client entitlements to both debug and r…
dustin-wojciechowski Oct 4, 2023
633af8d
Removed unnecessary space
dustin-wojciechowski Oct 4, 2023
eadca80
Merged debug and release entitlement plists, edition conditionals in …
dustin-wojciechowski Oct 9, 2023
15629a4
Removed unnecessary items from csproj
dustin-wojciechowski Oct 11, 2023
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
9 changes: 2 additions & 7 deletions src/Templates/src/templates/maui-blazor/MauiApp.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,7 @@

<!-- Build Properties must be defined within these property groups to ensure successful publishing
to the Mac App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
<UseHardenedRuntime>true</UseHardenedRuntime>
<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
Comment thread
dustin-wojciechowski marked this conversation as resolved.
Outdated
</Project>
10 changes: 0 additions & 10 deletions src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Entitlements.Debug.plist
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions ...ms/MacCatalyst/Entitlements.Release.plist → .../Platforms/MacCatalyst/Entitlements.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
<plist version="1.0">
<!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
<dict>
<!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
<key>com.apple.security.app-sandbox</key>
<true/>
<!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
<key>com.apple.security.network.client</key>
<true/>
<!-- Enable this value to use browser developer tools while debugging. -->
<!-- See https://aka.ms/blazor-hybrid-developer-tools -->
<key>com.apple.security.get-task-allow</key>
<true/>
</dict>
</plist>

9 changes: 2 additions & 7 deletions src/Templates/src/templates/maui-mobile/MauiApp.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,7 @@

<!-- Build Properties must be defined within these property groups to ensure successful publishing
to the Mac App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
<UseHardenedRuntime>true</UseHardenedRuntime>
<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst'))">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
Comment thread
dustin-wojciechowski marked this conversation as resolved.
Outdated
</Project>
11 changes: 0 additions & 11 deletions src/Templates/src/templates/maui-mobile/Platforms/MacCatalyst/Entitlements.Debug.plist
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions ...ms/MacCatalyst/Entitlements.Release.plist → .../Platforms/MacCatalyst/Entitlements.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
<plist version="1.0">
<!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
<dict>
<!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
<key>com.apple.security.app-sandbox</key>
<true/>
<!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
<key>com.apple.security.network.client</key>
<true/>
<!-- Enable this value to use browser developer tools while debugging. -->
<!-- See https://aka.ms/blazor-hybrid-developer-tools -->
<!-- <key>com.apple.security.get-task-allow</key> -->
<!-- <true/> -->
</dict>
</plist>

2 changes: 1 addition & 1 deletion src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public void CheckEntitlementsForMauiBlazorOnMacCatalyst(string id, string config

List<string> expectedEntitlements = config == "Release" ?
new() { "com.apple.security.app-sandbox", "com.apple.security.network.client" } :
new() { "com.apple.security.get-task-allow" };
new() { "com.apple.security.app-sandbox", "com.apple.security.network.client", "com.apple.security.get-task-allow" };
List<string> foundEntitlements = Codesign.SearchForExpectedEntitlements(entitlementsPath, appLocation, expectedEntitlements);

CollectionAssert.AreEqual(expectedEntitlements, foundEntitlements, "Entitlements missing from executable.");
Expand Down