Skip to content
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

Bump the all-dependencies group with 16 updates #16474

Merged
merged 6 commits into from
Jul 22, 2024
Merged

Bump the all-dependencies group with 16 updates #16474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1f607e
Bump the all-dependencies group with 16 updates
dependabot[bot] Jul 22, 2024
d597a16
Update Directory.Packages.props
MikeAlhayek Jul 22, 2024
502049c
Fix Parlot issue
MikeAlhayek Jul 22, 2024
0aaacda
Merge branch 'main' into dependabot/nuget/all-dependencies-6838f7a1a9
MikeAlhayek Jul 22, 2024
fc5930b
Don't update Microsoft.IdentityModel.Protocols.OpenIdConnect or YesSq…
MikeAlhayek Jul 22, 2024
e43b7b4
simplify count check
MikeAlhayek Jul 22, 2024
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
20 changes: 10 additions & 10 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

<ItemGroup>
<PackageVersion Include="AngleSharp" Version="1.1.2" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.310.2" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.310.7" />
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
<PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
<PackageVersion Include="Azure.Search.Documents" Version="11.5.1" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
<PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.21.0" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
<PackageVersion Include="Castle.Core" Version="5.1.1" />
<PackageVersion Include="DocumentFormat.OpenXml" Version="3.0.2" />
Expand All @@ -38,18 +38,18 @@
<PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
<PackageVersion Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
<PackageVersion Include="Lucene.Net.Spatial" Version="4.8.0-beta00016" />
<PackageVersion Include="MailKit" Version="4.7.0" />
<PackageVersion Include="MailKit" Version="4.7.1.1" />
<PackageVersion Include="Markdig" Version="0.37.0" />
<PackageVersion Include="MessagePack" Version="2.2.60" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.4" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
<PackageVersion Include="Microsoft.Identity.Web" Version="2.20.0" />
<PackageVersion Include="Microsoft.Identity.Web" Version="3.0.0" />

<!--
Important: the version of the Microsoft.IdentityModel.Protocols.OpenIdConnect package MUST
match the IdentityModel version transitively referenced by OpenIddict to ensure we don't
accidentally end up referencing inconsistent versions (which is not supported by IM).

See https://github.com/OrchardCMS/OrchardCore/pull/16057 for more information.
-->

Expand All @@ -61,7 +61,7 @@
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="ncrontab" Version="3.3.3" />
<PackageVersion Include="NEST" Version="7.17.5" />
<PackageVersion Include="NJsonSchema" Version="11.0.1" />
<PackageVersion Include="NJsonSchema" Version="11.0.2" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.11" />
<PackageVersion Include="NodaTime" Version="3.1.11" />
<PackageVersion Include="OpenIddict.Core" Version="5.7.0" />
Expand All @@ -81,9 +81,9 @@
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
<PackageVersion Include="xunit" Version="2.8.1" />
<PackageVersion Include="xunit.analyzers" Version="1.14.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.analyzers" Version="1.15.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="YesSql" Version="5.0.0" />
<PackageVersion Include="YesSql.Abstractions" Version="5.0.0" />
<PackageVersion Include="YesSql.Core" Version="5.0.0" />
Expand Down
14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using OrchardCore.ContentManagement;
using OrchardCore.DisplayManagement;
using OrchardCore.DisplayManagement.ModelBinding;
Expand All @@ -29,6 +28,7 @@
using OrchardCore.Users.Models;
using OrchardCore.Users.Services;
using OrchardCore.Users.ViewModels;
using YesSql.Services;
using SignInResult = Microsoft.AspNetCore.Identity.SignInResult;

namespace OrchardCore.Users.Controllers
Expand Down Expand Up @@ -810,13 +810,13 @@ public static async Task<bool> UpdateUserPropertiesAsync(UserManager<IUser> user
userNeedUpdate = !JsonNode.DeepEquals(currentProperties, user.Properties);
}

var currentClaims = user.UserClaims.
Where(x => !x.ClaimType.IsNullOrEmpty()).
DistinctBy(x => new { x.ClaimType, x.ClaimValue }).
ToList();
var currentClaims = user.UserClaims
.Where(x => !string.IsNullOrEmpty(x.ClaimType))
.DistinctBy(x => new { x.ClaimType, x.ClaimValue })
.ToList();

var claimsChanged = false;
if (context.ClaimsToRemove != null)
if (context.ClaimsToRemove?.Count > 0)
{
var claimsToRemove = context.ClaimsToRemove.ToHashSet();
foreach (var item in claimsToRemove)
Expand All @@ -830,7 +830,7 @@ public static async Task<bool> UpdateUserPropertiesAsync(UserManager<IUser> user
}
}

if (context.ClaimsToUpdate != null)
if (context.ClaimsToUpdate?.Count > 0)
{
foreach (var item in context.ClaimsToUpdate)
{
Expand Down