Skip to content

Commit dfb6062

Browse files
DamianEdwardsDamianEdwards
committed
Merge branch 'damianedwards/dev-cert-additional-sans' of https://github.com/dotnet/aspnetcore into damianedwards/dev-cert-additional-sans
2 parents e239657 + cfbc3c8 commit dfb6062

21 files changed

+60
-60
lines changed

‎src/ProjectTemplates/Web.ProjectTemplates/BlazorWebCSharp.csproj.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>${DefaultNetCoreTargetFramework}</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<UserSecretsId Condition="'$(IndividualLocalAuth)' == 'True'">aspnet-BlazorWebCSharp_1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
7+
<UserSecretsId Condition="'$(IndividualLocalAuth)' == 'True'">aspnet-BlazorWebCSharp__1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
88
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
99
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">BlazorWebCSharp._1</RootNamespace>
1010
<AssemblyName Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">`$(AssemblyName.Replace(' ', '_'))</AssemblyName>

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.Client/Program.Main.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
22

3-
namespace BlazorWebCSharp_1.Client;
3+
namespace BlazorWebCSharp._1.Client;
44

55
class Program
66
{

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp.sln‎ renamed to ‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1.sln‎

File renamed without changes.

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using Microsoft.AspNetCore.Identity;
77
using Microsoft.AspNetCore.Mvc;
88
using Microsoft.Extensions.Primitives;
9-
using BlazorWebCSharp_1.Components.Account.Pages;
10-
using BlazorWebCSharp_1.Components.Account.Pages.Manage;
11-
using BlazorWebCSharp_1.Data;
9+
using BlazorWebCSharp._1.Components.Account.Pages;
10+
using BlazorWebCSharp._1.Components.Account.Pages.Manage;
11+
using BlazorWebCSharp._1.Data;
1212

1313
namespace Microsoft.AspNetCore.Routing;
1414

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityNoOpEmailSender.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Microsoft.AspNetCore.Identity;
22
using Microsoft.AspNetCore.Identity.UI.Services;
3-
using BlazorWebCSharp_1.Data;
3+
using BlazorWebCSharp._1.Data;
44

5-
namespace BlazorWebCSharp_1.Components.Account;
5+
namespace BlazorWebCSharp._1.Components.Account;
66

77
// Remove the "else if (EmailSender is IdentityNoOpEmailSender)" block from RegisterConfirmation.razor after updating with a real implementation.
88
internal sealed class IdentityNoOpEmailSender : IEmailSender<ApplicationUser>
@@ -11,10 +11,10 @@ internal sealed class IdentityNoOpEmailSender : IEmailSender<ApplicationUser>
1111

1212
public Task SendConfirmationLinkAsync(ApplicationUser user, string email, string confirmationLink) =>
1313
emailSender.SendEmailAsync(email, "Confirm your email", $"Please confirm your account by <a href='{confirmationLink}'>clicking here</a>.");
14-
14+
1515
public Task SendPasswordResetLinkAsync(ApplicationUser user, string email, string resetLink) =>
1616
emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password by <a href='{resetLink}'>clicking here</a>.");
17-
17+
1818
public Task SendPasswordResetCodeAsync(ApplicationUser user, string email, string resetCode) =>
1919
emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password using the following code: {resetCode}");
2020
}

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRedirectManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Microsoft.AspNetCore.Components;
22
using Microsoft.AspNetCore.Identity;
3-
using BlazorWebCSharp_1.Data;
3+
using BlazorWebCSharp._1.Data;
44

5-
namespace BlazorWebCSharp_1.Components.Account;
5+
namespace BlazorWebCSharp._1.Components.Account;
66

77
internal sealed class IdentityRedirectManager(NavigationManager navigationManager)
88
{

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/IdentityRevalidatingAuthenticationStateProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using Microsoft.AspNetCore.Components.Server;
44
using Microsoft.AspNetCore.Identity;
55
using Microsoft.Extensions.Options;
6-
using BlazorWebCSharp_1.Data;
6+
using BlazorWebCSharp._1.Data;
77

8-
namespace BlazorWebCSharp_1.Components.Account;
8+
namespace BlazorWebCSharp._1.Components.Account;
99

1010
// This is a server-side AuthenticationStateProvider that revalidates the security stamp for the connected user
1111
// every 30 minutes an interactive circuit is connected.

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyInputModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace BlazorWebCSharp_1.Components.Account;
1+
namespace BlazorWebCSharp._1.Components.Account;
22

33
public class PasskeyInputModel
44
{

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/PasskeyOperation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace BlazorWebCSharp_1.Components.Account;
1+
namespace BlazorWebCSharp._1.Components.Account;
22

33
public enum PasskeyOperation
44
{

‎src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Shared/ManageLayout.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@inherits LayoutComponentBase
22
@*#if (UseWebAssembly && InteractiveAtRoot)
3-
@layout BlazorWebCSharp_1.Client.Layout.MainLayout
3+
@layout BlazorWebCSharp._1.Client.Layout.MainLayout
44
##else
5-
@layout BlazorWebCSharp_1.Components.Layout.MainLayout
5+
@layout BlazorWebCSharp._1.Components.Layout.MainLayout
66
##endif*@
77

88
<h1>Manage your account</h1>

0 commit comments

Comments
 (0)