Skip to content

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

Merged
PureWeen merged 5 commits intonet8.0from
dev/maccatalyst-template-fixes
Oct 12, 2023
Merged

Make Entitlements in Templates for MacCatalyst more consistent between debug and release configs.#17833
PureWeen merged 5 commits intonet8.0from
dev/maccatalyst-template-fixes

Conversation

@dustin-wojciechowski
Copy link
Contributor

@dustin-wojciechowski dustin-wojciechowski commented Oct 4, 2023

Description of Change

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

See teams conversation for more context (MSFT only)

@dustin-wojciechowski dustin-wojciechowski added area-blazor Blazor Hybrid / Desktop, BlazorWebView area-templates Project templates, Item Templates for Blazor and MAUI Blazor ❤️ MAUI Issues in MAUI functionality that affect Blazor, but are not bugs in Blazor itself labels Oct 4, 2023
@dustin-wojciechowski dustin-wojciechowski marked this pull request as ready for review October 5, 2023 04:39
@dustin-wojciechowski dustin-wojciechowski requested review from a team as code owners October 5, 2023 04:39
@dustin-wojciechowski dustin-wojciechowski mentioned this pull request Oct 5, 2023
Closed
@samhouts samhouts added this to the .NET 8 GA milestone Oct 5, 2023
Eilon
Eilon reviewed Oct 5, 2023
View reviewed changes
Copy link
Contributor

@Eilon Eilon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This definitely aligns with what I was looking for in our discussion. Can you confirm that you tested locally on a Mac in debug/release and native/hybrid to make sure there's nothing unexpected about using Sandbox in debug?

@dustin-wojciechowski
Copy link
Contributor Author

dustin-wojciechowski commented Oct 7, 2023 •
edited
Loading

This definitely aligns with what I was looking for in our discussion. Can you confirm that you tested locally on a Mac in debug/release and native/hybrid to make sure there's nothing unexpected about using Sandbox in debug?

Yes, I tested locally with two new maui-mobile and maui-blazor projects in debug and release configurations and there were no issues running the samples.

jsuarezruiz
jsuarezruiz previously approved these changes Oct 9, 2023
View reviewed changes
mattleibow
mattleibow reviewed Oct 9, 2023
View reviewed changes
Copy link
Member

@mattleibow mattleibow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to remove all the conditions in the templates and make all the items in the plist? For the dev tools, we can just comment it out and a user can uncomment if they want it. I would like to reduce the things in the csproj file.

PureWeen
PureWeen requested changes Oct 9, 2023
View reviewed changes
Copy link
Member

@PureWeen PureWeen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently this PR is targeting main (SR1) with a GA milestone.
Can you please update the Milestone to SR1 or update the targeted branch to net8.0.

@dustin-wojciechowski dustin-wojciechowski changed the base branch from main to net8.0 October 9, 2023 17:30
@dustin-wojciechowski dustin-wojciechowski changed the base branch from net8.0 to main October 9, 2023 17:35
@dustin-wojciechowski dustin-wojciechowski force-pushed the dev/maccatalyst-template-fixes branch from 4892271 to cac477b Compare October 9, 2023 17:36
@dustin-wojciechowski dustin-wojciechowski changed the base branch from main to net8.0 October 9, 2023 17:47
@dustin-wojciechowski
Updated integration test to check for app-sandbox and network.client …
9c19dc6 
…entitlements in debug config as well for maui-blazor.
@dustin-wojciechowski
Added app-sandbox and network.client entitlements to both debug and r…
49e1e2d 
…elease entitlement plists for maui-blazor and maui-mobile templates for MacCatalyst. get-task-allow is commented out for debug for maui-mobile but is not for maui-blazor.
@dustin-wojciechowski
Removed unnecessary space
633af8d
@dustin-wojciechowski
Merged debug and release entitlement plists, edition conditionals in …
eadca80 
…csproj
@dustin-wojciechowski dustin-wojciechowski force-pushed the dev/maccatalyst-template-fixes branch from cac477b to eadca80 Compare October 9, 2023 18:42
@dustin-wojciechowski
Copy link
Contributor Author

dustin-wojciechowski commented Oct 9, 2023

Currently this PR is targeting main (SR1) with a GA milestone. Can you please update the Milestone to SR1 or update the targeted branch to net8.0.

Changed targeted branch to net8.0.

mattleibow
mattleibow requested changes Oct 11, 2023
View reviewed changes
Copy link
Member

@mattleibow mattleibow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is almost ready, just need to remove the item in the csproj as it is already added.

@PureWeen PureWeen enabled auto-merge (squash) October 12, 2023 18:07
@PureWeen
Copy link
Member

PureWeen commented Oct 12, 2023

/backport to release/8.0.1xx-rc2.1

@github-actions
Copy link
Contributor

github-actions bot commented Oct 12, 2023

Started backporting to release/8.0.1xx-rc2.1: https://github.com/dotnet/maui/actions/runs/6499507056

@github-actions github-actions bot mentioned this pull request Oct 12, 2023
Merged
@rachelkang rachelkang removed their request for review October 12, 2023 18:36
Eilon
Eilon approved these changes Oct 12, 2023
View reviewed changes
Copy link
Contributor

@Eilon Eilon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much cleaner!!

@PureWeen PureWeen merged commit 8ad0c07 into net8.0 Oct 12, 2023
@PureWeen PureWeen deleted the dev/maccatalyst-template-fixes branch October 12, 2023 19:34
@PureWeen PureWeen added backport/suggested The PR author or issue review has suggested that the change should be backported. backport/approved After some discussion or review, this PR or change was approved to be backported. labels Oct 18, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Dec 6, 2023
@samhouts samhouts added the fixed-in-8.0.0-rc.2.9511 Look for this fix in 8.0.0-rc.2.9511 label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@mattleibow mattleibow mattleibow approved these changes

@PureWeen PureWeen PureWeen approved these changes

+2 more reviewers

@Eilon Eilon Eilon approved these changes

@jsuarezruiz jsuarezruiz jsuarezruiz left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-blazor Blazor Hybrid / Desktop, BlazorWebView area-templates Project templates, Item Templates for Blazor and MAUI backport/approved After some discussion or review, this PR or change was approved to be backported. backport/suggested The PR author or issue review has suggested that the change should be backported. Blazor ❤️ MAUI Issues in MAUI functionality that affect Blazor, but are not bugs in Blazor itself fixed-in-8.0.0-rc.2.9511 Look for this fix in 8.0.0-rc.2.9511

Projects

None yet

Milestone

.NET 8 GA

Development

Successfully merging this pull request may close these issues.

6 participants

@dustin-wojciechowski @PureWeen @Eilon @mattleibow @jsuarezruiz @samhouts