forked from OrchardCMS/OrchardCore
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'formatting' into multi-text-free-input
- Loading branch information
Showing
5 changed files
with
28 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 9 additions & 9 deletions
18
src/OrchardCore/OrchardCore.Users.Core/Extensions/ExternalLoginInfoExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"); | ||
} |
13 changes: 6 additions & 7 deletions
13
test/OrchardCore.Tests.Modules/Errors.OrchardCoreModules.TwoPlus/Root.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
13 changes: 6 additions & 7 deletions
13
test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.ThemeAndModule/Root.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
13 changes: 6 additions & 7 deletions
13
test/OrchardCore.Tests.Themes/Errors.OrchardCoreThemes.TwoPlus/Root.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |