merge conflict

src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/UserPickerFieldSettingsDriver.cs

@@ -27,11 +27,11 @@ public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefiniti
             model.Multiple = settings.Multiple;
             var roles = await _roleService.GetRolesAsync();
             var roleEntries = roles.Where(role => role.Type != RoleType.System)
-            .Select(role => new RoleEntry
-            {
-                Role = role.RoleName,
-                IsSelected = settings.DisplayedRoles.Contains(role.RoleName, StringComparer.OrdinalIgnoreCase),
-            }).ToArray();
+                .Select(role => new RoleEntry
+                {
+                    Role = role.RoleName,
+                    IsSelected = settings.DisplayedRoles.Contains(role.RoleName, StringComparer.OrdinalIgnoreCase),
+                }).ToArray();
 
             model.Roles = roleEntries;
             model.DisplayAllUsers = settings.DisplayAllUsers || !roleEntries.Where(x => x.IsSelected).Any();

src/docs/releases/2.1.0.md

@@ -63,7 +63,7 @@ In the Roles feature, there were previously `AssignRoles` and `AssignRole_{RoleN
 !!! warning
     Please review all your recipes and replace occurrences of `AssignRoles` with `AssignRoleToUsers`, and `AssignRole_{RoleName}` with `AssignRoleToUsers_{RoleName}`.
 
-#### Roles Now Include Types
+#### Roles Now Include Types, Deprecating Site Owner Permission
 
 A new `Type` property has been added to the `IRole` interface, and partially surfaced on the role editor UI, which allows defining a role's behavior:
 
@@ -73,6 +73,7 @@ A new `Type` property has been added to the `IRole` interface, and partially sur
 
 Furthermore, the `SiteOwner` permission has been deprecated and will be removed in future releases. To prevent any breaking changes, we've introduced a fast-track migration that automatically assigns the `Owner` role type to any role with the `SiteOwner` permission.
 
+Instead of authorizing against the `SiteOwner` permission, the Recipes feature now uses its own  Manage Recipes permission (which is automatically available for the Administrator role).
 !!! warning
     Please set the `Owner` type on roles instead of using the `SiteOwner` permission. The latter will be removed in a future version. Don't authorize against the `SiteOwner` permission in code.
 

test/OrchardCore.Tests/Security/PermissionHandlerTests.cs

@@ -1,4 +1,3 @@
-using OrchardCore.Roles.Core;
 using OrchardCore.Security;
 using OrchardCore.Security.AuthorizationHandlers;
 using OrchardCore.Security.Permissions;