Skip to content

Commit

Permalink
Merge tag 'formatting' into multi-text-free-input
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastienros committed Aug 14, 2024
2 parents c7b86bc + 05730cf commit 71133f7
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 31 deletions.
2 changes: 1 addition & 1 deletion OrchardCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Email.Smtp", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Rules.Core", "src\OrchardCore\OrchardCore.Rules.Core\OrchardCore.Rules.Core.csproj", "{4BAA08A2-878C-4B96-86BF-5B3DB2B6C2C7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Queries.Core", "src\OrchardCore\OrchardCore.Queries.Core\OrchardCore.Queries.Core.csproj", "{61B358F2-702C-40AA-9DF7-7121248FE6DE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Queries.Core", "src\OrchardCore\OrchardCore.Queries.Core\OrchardCore.Queries.Core.csproj", "{61B358F2-702C-40AA-9DF7-7121248FE6DE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Security.Claims;

namespace Microsoft.AspNetCore.Identity;

public static class ExternalLoginInfoExtensions
{
public static string GetEmail(this ExternalLoginInfo info)
=> info.Principal.FindFirstValue(ClaimTypes.Email) ?? info.Principal.FindFirstValue("email");
}
using System.Security.Claims;

namespace Microsoft.AspNetCore.Identity;

public static class ExternalLoginInfoExtensions
{
public static string GetEmail(this ExternalLoginInfo info)
=> info.Principal.FindFirstValue(ClaimTypes.Email) ?? info.Principal.FindFirstValue("email");
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// This project intentional left out of the build configuration, it SHOULD error, that is expected
namespace Errors.OrchardCoreModules.TwoPlus
namespace Errors.OrchardCoreModules.TwoPlus;

/// <summary>
/// Hooks provided for purposes of identifying the class and assembly context.
/// </summary>
internal sealed class Root
{
/// <summary>
/// Hooks provided for purposes of identifying the class and assembly context.
/// </summary>
internal sealed class Root
{
}
}
// TODO: MWP: would be better if perhaps we could verify a BUILD cycle from code
// TODO: MWP: but this would also require a bit of xUnit scaffold to support
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// This project intentional left out of the build configuration, it SHOULD error, that is expected
namespace Errors.OrchardCoreThemes.ThemeAndModule
namespace Errors.OrchardCoreThemes.ThemeAndModule;

/// <summary>
/// Hooks provided for purposes of identifying the class and assembly context.
/// </summary>
internal sealed class Root
{
/// <summary>
/// Hooks provided for purposes of identifying the class and assembly context.
/// </summary>
internal sealed class Root
{
}
}
// TODO: MWP: would be better if perhaps we could verify a BUILD cycle from code
// TODO: MWP: but this would also require a bit of xUnit scaffold to support
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// This project intentional left out of the build configuration, it SHOULD error, that is expected
namespace Errors.OrchardCoreThemes.TwoPlus
namespace Errors.OrchardCoreThemes.TwoPlus;

/// <summary>
/// Hooks provided for purposes of identifying the class and assembly context.
/// </summary>
internal sealed class Root
{
/// <summary>
/// Hooks provided for purposes of identifying the class and assembly context.
/// </summary>
internal sealed class Root
{
}
}
// TODO: MWP: would be better if perhaps we could verify a BUILD cycle from code
// TODO: MWP: but this would also require a bit of xUnit scaffold to support

0 comments on commit 71133f7

Please sign in to comment.